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 /lotuswordpro/source/filter/lwpdrawobj.hxx | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'lotuswordpro/source/filter/lwpdrawobj.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpdrawobj.hxx | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx index 33e8eea701c1..443f9ba6aa3d 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.hxx +++ b/lotuswordpro/source/filter/lwpdrawobj.hxx @@ -152,13 +152,13 @@ public: virtual ~LwpDrawGroup() {} protected: - virtual void Read() SAL_OVERRIDE {} - virtual OUString RegisterStyle() SAL_OVERRIDE + virtual void Read() override {} + virtual OUString RegisterStyle() override { return OUString(); } - virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE { return NULL; } - virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE { return NULL; } + virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override { return NULL; } + virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override { return NULL; } }; /** @@ -175,10 +175,10 @@ public: virtual ~LwpDrawLine() {} protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -196,10 +196,10 @@ public: virtual ~LwpDrawPolyLine(); protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -217,10 +217,10 @@ public: virtual ~LwpDrawPolygon(); protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -237,10 +237,10 @@ public: virtual ~LwpDrawRectangle(){} protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; private: XFFrame* CreateRoundedRect(const OUString& rStyleName); @@ -260,10 +260,10 @@ public: virtual ~LwpDrawEllipse(){} protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -281,10 +281,10 @@ public: virtual ~LwpDrawArc() {} protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -304,10 +304,10 @@ public: static void SetFontStyle(rtl::Reference<XFFont> const & pFont, SdwTextBoxRecord* pRec); protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -329,10 +329,10 @@ public: virtual ~LwpDrawTextArt(); protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; /** @@ -346,13 +346,13 @@ public: virtual ~LwpDrawMetafile() {} protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE + virtual void Read() override; + virtual OUString RegisterStyle() override { return OUString(); } - virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE {return NULL;} - virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE {return NULL;} + virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override {return NULL;} + virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override {return NULL;} }; /** @@ -369,10 +369,10 @@ public: virtual ~LwpDrawBitmap(); protected: - virtual void Read() SAL_OVERRIDE; - virtual OUString RegisterStyle() SAL_OVERRIDE; - virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE; - virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE; + virtual void Read() override; + virtual OUString RegisterStyle() override; + virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override; + virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override; }; #endif |