diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-22 09:20:23 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-22 11:24:24 +0100 |
commit | fd6150915253e382a7e9f674fe23a72a9a801761 (patch) | |
tree | aa76c8e0cd09eaa2cafbf7897fe48eb42a0886ec /writerfilter/qa | |
parent | 9ffa900cb4d0381587162e3deb9d910965b69d58 (diff) |
RTF filter: drop now redundant astyle.options
I (tried to) keep the RTF filter style consistent locally with astyle in
the past, but now that's redundant when we have an enforcing
clang-format mechanism in place. So drop the astyle config and switch to
clang-format in the RTF filter case.
To minimize backport pain, do this shortly before the libreoffice-6-0
branch-off.
Change-Id: I708dbeb0b5ad2afacc90029ee5abba9495f4601f
Diffstat (limited to 'writerfilter/qa')
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index e380728b3c30..020086a1187e 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx @@ -25,23 +25,20 @@ using namespace ::com::sun::star; * the expected bool value for given inputs. More fine-grained tests can be * found under sw/qa/extras/rtfimport/. */ -class RtfTest - : public test::FiltersTest - , public test::BootstrapFixture +class RtfTest : public test::FiltersTest, public test::BootstrapFixture { public: - virtual void setUp() override; - virtual bool load(const OUString&, - const OUString& rURL, const OUString&, - SfxFilterFlags, SotClipboardFormatId, unsigned int) override; + virtual bool load(const OUString&, const OUString& rURL, const OUString&, SfxFilterFlags, + SotClipboardFormatId, unsigned int) override; void test(); CPPUNIT_TEST_SUITE(RtfTest); CPPUNIT_TEST(test); CPPUNIT_TEST_SUITE_END(); + private: uno::Reference<document::XFilter> m_xFilter; }; @@ -50,17 +47,15 @@ void RtfTest::setUp() { test::BootstrapFixture::setUp(); - m_xFilter.set(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); + m_xFilter.set(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), + uno::UNO_QUERY_THROW); } -bool RtfTest::load(const OUString&, - const OUString& rURL, const OUString&, - SfxFilterFlags, SotClipboardFormatId, unsigned int) +bool RtfTest::load(const OUString&, const OUString& rURL, const OUString&, SfxFilterFlags, + SotClipboardFormatId, unsigned int) { - uno::Sequence< beans::PropertyValue > aDescriptor = - { - beans::PropertyValue("URL", sal_Int32(0), uno::makeAny(rURL), beans::PropertyState_DIRECT_VALUE) - }; + uno::Sequence<beans::PropertyValue> aDescriptor = { beans::PropertyValue( + "URL", sal_Int32(0), uno::makeAny(rURL), beans::PropertyState_DIRECT_VALUE) }; try { return m_xFilter->filter(aDescriptor); @@ -83,8 +78,7 @@ bool RtfTest::load(const OUString&, void RtfTest::test() { #ifndef DISABLE_CVE_TESTS - testDir(OUString(), - m_directories.getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/")); + testDir(OUString(), m_directories.getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/")); #endif } |