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 /sd/qa/unit | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sd/qa/unit')
| -rw-r--r-- | sd/qa/unit/filters-test.cxx | 6 | ||||
| -rw-r--r-- | sd/qa/unit/sdmodeltestbase.hxx | 4 | ||||
| -rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 4 | ||||
| -rw-r--r-- | sd/qa/unit/uimpress.cxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx index 0115d5986c2e..c704d9ec94b8 100644 --- a/sd/qa/unit/filters-test.cxx +++ b/sd/qa/unit/filters-test.cxx @@ -43,10 +43,10 @@ public: virtual bool load( const OUString &rFilter, const OUString &rURL, const OUString &rUserData, SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID, - unsigned int nFilterVersion) SAL_OVERRIDE; + unsigned int nFilterVersion) override; - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; // Ensure CVEs remain unbroken void testCVEs(); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index 037ba3ea5950..416b4261b91b 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -86,7 +86,7 @@ public: SdModelTestBase() {} - virtual void setUp() SAL_OVERRIDE + virtual void setUp() override { test::BootstrapFixture::setUp(); @@ -96,7 +96,7 @@ public: CPPUNIT_ASSERT_MESSAGE("no impress component!", mxDrawComponent.is()); } - virtual void tearDown() SAL_OVERRIDE + virtual void tearDown() override { uno::Reference<lang::XComponent>(mxDrawComponent, uno::UNO_QUERY_THROW)->dispose(); test::BootstrapFixture::tearDown(); diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index da6d4be2966f..2065dd8271c6 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -38,8 +38,8 @@ class SdTiledRenderingTest : public test::BootstrapFixture, public unotest::Macr { public: SdTiledRenderingTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; #if !defined(WNT) && !defined(MACOSX) void testRegisterCallback(); diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx index f1704a6d5699..37ab096b81c2 100644 --- a/sd/qa/unit/uimpress.cxx +++ b/sd/qa/unit/uimpress.cxx @@ -32,8 +32,8 @@ public: Test(); virtual ~Test(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testAddPage(); void testCustomShow(); |