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 /filter/qa | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'filter/qa')
-rw-r--r-- | filter/qa/cppunit/filters-dxf-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-eps-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-met-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-pcd-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-pcx-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-pict-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-ppm-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-psd-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-ras-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-tga-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/filters-tiff-test.cxx | 2 | ||||
-rw-r--r-- | filter/qa/cppunit/xslt-test.cxx | 10 |
12 files changed, 16 insertions, 16 deletions
diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx index 11e510334542..03836311dafd 100644 --- a/filter/qa/cppunit/filters-dxf-test.cxx +++ b/filter/qa/cppunit/filters-dxf-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx index 79e81f52196e..271f24fc2f98 100644 --- a/filter/qa/cppunit/filters-eps-test.cxx +++ b/filter/qa/cppunit/filters-eps-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx index 7607463f7245..63619c106634 100644 --- a/filter/qa/cppunit/filters-met-test.cxx +++ b/filter/qa/cppunit/filters-met-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx index 4ce202ef74b5..3f66c24d46fd 100644 --- a/filter/qa/cppunit/filters-pcd-test.cxx +++ b/filter/qa/cppunit/filters-pcd-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx index cd724781ff97..395d95409f10 100644 --- a/filter/qa/cppunit/filters-pcx-test.cxx +++ b/filter/qa/cppunit/filters-pcx-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index bdfa9c2134b9..16b4b20a5c1b 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -42,7 +42,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; OUString pictURL() { diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx index 10f265888964..304d759eb27c 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/filter/qa/cppunit/filters-ppm-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx index ea2bc1ee34c1..330856dda15e 100644 --- a/filter/qa/cppunit/filters-psd-test.cxx +++ b/filter/qa/cppunit/filters-psd-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx index a7f2a6952e2e..df482f5c9bfb 100644 --- a/filter/qa/cppunit/filters-ras-test.cxx +++ b/filter/qa/cppunit/filters-ras-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index 28b24507d908..aadbb9c6a4b9 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index d4218a53dfc5..133044550e2b 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx index a424c989c148..6c696801be07 100644 --- a/filter/qa/cppunit/xslt-test.cxx +++ b/filter/qa/cppunit/xslt-test.cxx @@ -57,11 +57,11 @@ struct Listener : public ::cppu::WeakImplHelper<io::XStreamListener> Listener() : m_bDone(false) {} - virtual void SAL_CALL disposing(const lang::EventObject&) throw() SAL_OVERRIDE {} - virtual void SAL_CALL started() throw() SAL_OVERRIDE { m_bDone = false; } - virtual void SAL_CALL closed() throw() SAL_OVERRIDE { m_bDone = true; } - virtual void SAL_CALL terminated() throw() SAL_OVERRIDE { m_bDone = true; } - virtual void SAL_CALL error(const uno::Any& e) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL disposing(const lang::EventObject&) throw() override {} + virtual void SAL_CALL started() throw() override { m_bDone = false; } + virtual void SAL_CALL closed() throw() override { m_bDone = true; } + virtual void SAL_CALL terminated() throw() override { m_bDone = true; } + virtual void SAL_CALL error(const uno::Any& e) throw(uno::RuntimeException, std::exception) override { m_bDone = true; // set on error too, otherwise main thread waits forever SAL_WARN("filter.xslt", "exception " << e); |