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 /sfx2/qa | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sfx2/qa')
| -rw-r--r-- | sfx2/qa/cppunit/test_controlleritem.cxx | 4 | ||||
| -rw-r--r-- | sfx2/qa/cppunit/test_metadatable.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/qa/cppunit/test_controlleritem.cxx b/sfx2/qa/cppunit/test_controlleritem.cxx index fe9637f399b5..095a71bf5014 100644 --- a/sfx2/qa/cppunit/test_controlleritem.cxx +++ b/sfx2/qa/cppunit/test_controlleritem.cxx @@ -22,8 +22,8 @@ class ControllerItemTest : public ::CppUnit::TestFixture { public: - virtual void setUp() SAL_OVERRIDE {} - virtual void tearDown() SAL_OVERRIDE {} + virtual void setUp() override {} + virtual void tearDown() override {} void test(); diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index fc57dea7cef3..2034642d64bc 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -44,8 +44,8 @@ class MetadatableTest : public ::CppUnit::TestFixture { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void test(); @@ -79,12 +79,12 @@ public: bool m_bInClipboard; bool m_bInUndo; bool m_bInContent; - virtual bool IsInClipboard() const SAL_OVERRIDE { return m_bInClipboard; } - virtual bool IsInUndo() const SAL_OVERRIDE { return m_bInUndo; } - virtual bool IsInContent() const SAL_OVERRIDE { return m_bInContent; } - virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE { return m_rRegistry; } + virtual bool IsInClipboard() const override { return m_bInClipboard; } + virtual bool IsInUndo() const override { return m_bInUndo; } + virtual bool IsInContent() const override { return m_bInContent; } + virtual ::sfx2::IXmlIdRegistry& GetRegistry() override { return m_rRegistry; } virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE { return 0; } + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override { return 0; } }; static bool operator==(beans::StringPair p1, beans::StringPair p2) |