diff options
author | David Tardon <dtardon@redhat.com> | 2014-08-15 08:46:11 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-08-15 09:03:51 +0200 |
commit | 7de2366a975c22cd77a1a3a64da6b7c642334ae1 (patch) | |
tree | 0af883a899a2803f1d74fbdcd96577d4b6d31ca3 /writerperfect/qa | |
parent | 2c75925a809796e4177e5accaf6dfea566ea91bc (diff) |
use consistent style for writerperfect
Change-Id: I47089586094b58c39a128e44e2671d69c2d50177
Diffstat (limited to 'writerperfect/qa')
-rw-r--r-- | writerperfect/qa/unit/WPXSvStreamTest.cxx | 14 | ||||
-rw-r--r-- | writerperfect/qa/unit/WpftImportTestBase.cxx | 10 | ||||
-rw-r--r-- | writerperfect/qa/unit/WpftImportTestBase.hxx | 38 |
3 files changed, 42 insertions, 20 deletions
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 7fad6239e857..a2f6c14a8785 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -73,7 +73,7 @@ shared_ptr<RVNGInputStream> lcl_createStream() { using comphelper::SequenceInputStream; - const css::uno::Sequence<sal_Int8> aData(reinterpret_cast<const sal_Int8*>(aText), sizeof aText); + const css::uno::Sequence<sal_Int8> aData(reinterpret_cast<const sal_Int8 *>(aText), sizeof aText); const uno::Reference<io::XInputStream> xInputStream(new SequenceInputStream(aData)); shared_ptr<RVNGInputStream> pInputStream; @@ -90,8 +90,8 @@ const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const rtl::OUString &rU const Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), UNO_QUERY_THROW); const Reference<ucb::XSimpleFileAccess> xFileAccess( - xContext->getServiceManager()->createInstanceWithContext("com.sun.star.ucb.SimpleFileAccess", xContext), - UNO_QUERY_THROW); + xContext->getServiceManager()->createInstanceWithContext("com.sun.star.ucb.SimpleFileAccess", xContext), + UNO_QUERY_THROW); const Reference<io::XInputStream> xInputStream(xFileAccess->openFileRead(rURL), UNO_QUERY_THROW); const shared_ptr<RVNGInputStream> pInput(new WPXSvInputStream(xInputStream)); @@ -122,9 +122,9 @@ void WPXSvStreamTest::testRead() const unsigned long nLen = sizeof aText; unsigned long nReadBytes = 0; - const unsigned char* pData = 0; - const unsigned char* const pTextOrig = reinterpret_cast<const unsigned char*>(aText); - const unsigned char* pText = pTextOrig; + const unsigned char *pData = 0; + const unsigned char *const pTextOrig = reinterpret_cast<const unsigned char *>(aText); + const unsigned char *pText = pTextOrig; // reading by small pieces pData = pInput->read(1UL, nReadBytes); @@ -176,7 +176,7 @@ void WPXSvStreamTest::testRead() pData = pInput->read(0UL, nReadBytes); CPPUNIT_ASSERT_EQUAL(0UL, nReadBytes); CPPUNIT_ASSERT_EQUAL(0L, pInput->tell()); - CPPUNIT_ASSERT_EQUAL(pData, static_cast<const unsigned char*>(0)); + CPPUNIT_ASSERT_EQUAL(pData, static_cast<const unsigned char *>(0)); CPPUNIT_ASSERT(!pInput->isEnd()); } diff --git a/writerperfect/qa/unit/WpftImportTestBase.cxx b/writerperfect/qa/unit/WpftImportTestBase.cxx index de82980537e6..697928953f82 100644 --- a/writerperfect/qa/unit/WpftImportTestBase.cxx +++ b/writerperfect/qa/unit/WpftImportTestBase.cxx @@ -60,8 +60,8 @@ void WpftImportTestBase::setUp() m_xDesktop = frame::theDesktop::get(m_xContext); const uno::Reference<document::XTypeDetection> xTypeDetection( - m_xFactory->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext), - uno::UNO_QUERY_THROW); + m_xFactory->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext), + uno::UNO_QUERY_THROW); m_xTypeMap.set(xTypeDetection, uno::UNO_QUERY_THROW); } @@ -73,12 +73,12 @@ void WpftImportTestBase::tearDown() } bool WpftImportTestBase::load(const OUString &, const OUString &rURL, const OUString &, - unsigned int, unsigned int, unsigned int) + unsigned int, unsigned int, unsigned int) { // create an empty frame const uno::Reference<lang::XComponent> xDoc( - m_xDesktop->loadComponentFromURL(m_aFactoryURL, "_blank", 0, uno::Sequence<beans::PropertyValue>()), - uno::UNO_QUERY_THROW); + m_xDesktop->loadComponentFromURL(m_aFactoryURL, "_blank", 0, uno::Sequence<beans::PropertyValue>()), + uno::UNO_QUERY_THROW); // Find the model and frame. We need them later. uno::Reference<frame::XFrame> xFrame(xDoc, uno::UNO_QUERY); diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx index 3aa50a05819a..e6526a24da52 100644 --- a/writerperfect/qa/unit/WpftImportTestBase.hxx +++ b/writerperfect/qa/unit/WpftImportTestBase.hxx @@ -19,13 +19,35 @@ #include <unotest/filters-test.hxx> -namespace com { namespace sun { namespace star { - namespace beans { struct PropertyValue; } - namespace container { class XNameAccess; } - namespace document { class XFilter; } - namespace frame { class XDesktop2; } - namespace ucb { class XSimpleFileAccess; } -} } } +namespace com +{ +namespace sun +{ +namespace star +{ +namespace beans +{ +struct PropertyValue; +} +namespace container +{ +class XNameAccess; +} +namespace document +{ +class XFilter; +} +namespace frame +{ +class XDesktop2; +} +namespace ucb +{ +class XSimpleFileAccess; +} +} +} +} namespace writerperfect { @@ -47,7 +69,7 @@ protected: private: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - unsigned int, unsigned int, unsigned int) SAL_OVERRIDE; + unsigned int, unsigned int, unsigned int) SAL_OVERRIDE; void impl_detectFilterName(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName); |