diff options
Diffstat (limited to 'writerperfect/qa/unit')
19 files changed, 416 insertions, 386 deletions
diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx index 730ce41aa718..8584184cfaad 100644 --- a/writerperfect/qa/unit/DirectoryStreamTest.cxx +++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx @@ -33,7 +33,6 @@ using writerperfect::DirectoryStream; namespace { - class DirectoryStreamTest : public test::BootstrapFixture { public: @@ -72,7 +71,8 @@ DirectoryStreamTest::DirectoryStreamTest() m_xDir = Content(m_directories.getURLFromSrc(g_aDirPath), xCmdEnv, xContext).get(); m_xFile = Content(m_directories.getURLFromSrc(g_aNondirPath), xCmdEnv, xContext).get(); - m_xNonexistent = Content(m_directories.getURLFromSrc(g_aNonexistentPath), xCmdEnv, xContext).get(); + m_xNonexistent + = Content(m_directories.getURLFromSrc(g_aNonexistentPath), xCmdEnv, xContext).get(); } void DirectoryStreamTest::testConstruction() @@ -102,7 +102,7 @@ void DirectoryStreamTest::testDetection() CPPUNIT_ASSERT(!DirectoryStream::isDirectory(m_xNonexistent)); } -void lcl_testDataOperations(RVNGInputStream &rStream) +void lcl_testDataOperations(RVNGInputStream& rStream) { CPPUNIT_ASSERT(rStream.isEnd()); CPPUNIT_ASSERT_EQUAL(0L, rStream.tell()); @@ -125,7 +125,7 @@ void DirectoryStreamTest::testDataOperations() lcl_testDataOperations(aFile); } -void lcl_testStructuredOperations(RVNGInputStream &rStream) +void lcl_testStructuredOperations(RVNGInputStream& rStream) { CPPUNIT_ASSERT(rStream.isStructured()); unique_ptr<RVNGInputStream> pSubstream(rStream.getSubStreamByName("mimetype")); @@ -145,7 +145,6 @@ void DirectoryStreamTest::testStructuredOperations() } CPPUNIT_TEST_SUITE_REGISTRATION(DirectoryStreamTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx index 06bb33aeec7f..f2e0a707a32b 100644 --- a/writerperfect/qa/unit/DrawingImportTest.cxx +++ b/writerperfect/qa/unit/DrawingImportTest.cxx @@ -27,34 +27,38 @@ namespace { - namespace uno = css::uno; class DrawingImportFilter : public writerperfect::ImportFilter<OdgGenerator> { public: - explicit DrawingImportFilter(const uno::Reference< uno::XComponentContext > &rxContext) - : writerperfect::ImportFilter<OdgGenerator>(rxContext) {} + explicit DrawingImportFilter(const uno::Reference<uno::XComponentContext>& rxContext) + : writerperfect::ImportFilter<OdgGenerator>(rxContext) + { + } // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString &ServiceName) override; - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override; + virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; private: - virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, rtl::OUString &rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdgGenerator &rGenerator, utl::MediaDescriptor &rDescriptor) override; + virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, + rtl::OUString& rTypeName) override; + virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdgGenerator& rGenerator, + utl::MediaDescriptor& rDescriptor) override; - static void generate(librevenge::RVNGDrawingInterface &rDocument); + static void generate(librevenge::RVNGDrawingInterface& rDocument); }; -bool DrawingImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdgGenerator &rGenerator, utl::MediaDescriptor &) +bool DrawingImportFilter::doImportDocument(librevenge::RVNGInputStream&, OdgGenerator& rGenerator, + utl::MediaDescriptor&) { DrawingImportFilter::generate(rGenerator); return true; } -bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName) +bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName) { rTypeName = "WpftDummyDrawing"; return true; @@ -66,17 +70,17 @@ rtl::OUString SAL_CALL DrawingImportFilter::getImplementationName() return OUString("org.libreoffice.comp.Wpft.QA.DrawingImportFilter"); } -sal_Bool SAL_CALL DrawingImportFilter::supportsService(const rtl::OUString &rServiceName) +sal_Bool SAL_CALL DrawingImportFilter::supportsService(const rtl::OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< rtl::OUString > SAL_CALL DrawingImportFilter::getSupportedServiceNames() +uno::Sequence<rtl::OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames() { - return {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } -void DrawingImportFilter::generate(librevenge::RVNGDrawingInterface &rDocument) +void DrawingImportFilter::generate(librevenge::RVNGDrawingInterface& rDocument) { using namespace librevenge; @@ -100,12 +104,10 @@ void DrawingImportFilter::generate(librevenge::RVNGDrawingInterface &rDocument) rDocument.endPage(); rDocument.endDocument(); } - } namespace { - class DrawingImportTest : public writerperfect::test::WpftFilterFixture { public: @@ -120,8 +122,9 @@ void DrawingImportTest::test() { using namespace css; - rtl::Reference<DrawingImportFilter> xFilter {new DrawingImportFilter(m_xContext)}; - writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), "private:factory/sdraw", m_xDesktop, m_xContext); + rtl::Reference<DrawingImportFilter> xFilter{ new DrawingImportFilter(m_xContext) }; + writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), + "private:factory/sdraw", m_xDesktop, m_xContext); uno::Reference<drawing::XDrawPagesSupplier> xDoc(aLoader.getDocument(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -142,13 +145,13 @@ void DrawingImportTest::test() uno::Reference<drawing::XShapeDescriptor> xShapeDesc; CPPUNIT_ASSERT(aShape >>= xShapeDesc); CPPUNIT_ASSERT(xShapeDesc.is()); - CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType()); + CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"), + xShapeDesc->getShapeType()); uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString()); } CPPUNIT_TEST_SUITE_REGISTRATION(DrawingImportTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index 231c63252efd..ce8f2964b0b7 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -30,11 +30,12 @@ using namespace ::com::sun::star; namespace { - char const DATA_DIRECTORY[] = "/writerperfect/qa/unit/data/writer/epubexport/"; /// Tests the EPUB export filter. -class EPUBExportTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools +class EPUBExportTest : public test::BootstrapFixture, + public unotest::MacrosTest, + public XmlTestTools { uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; @@ -46,14 +47,15 @@ class EPUBExportTest : public test::BootstrapFixture, public unotest::MacrosTest public: void setUp() override; void tearDown() override; - void registerNamespaces(xmlXPathContextPtr &pXmlXpathCtx) override; - void createDoc(const OUString &rFile, const uno::Sequence<beans::PropertyValue> &rFilterData); + void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override; + void createDoc(const OUString& rFile, const uno::Sequence<beans::PropertyValue>& rFilterData); /// Returns an XML representation of the stream named rName in the exported package. - xmlDocPtr parseExport(const OUString &rName); + xmlDocPtr parseExport(const OUString& rName); /// Parses a CSS representation of the stream named rName and returns it. - std::map< OUString, std::vector<OUString> > parseCss(const OUString &rName); + std::map<OUString, std::vector<OUString>> parseCss(const OUString& rName); /// Looks up a key of a class in rCss. - static OUString getCss(std::map< OUString, std::vector<OUString> > &rCss, const OUString &rClass, const OUString &rKey); + static OUString getCss(std::map<OUString, std::vector<OUString>>& rCss, const OUString& rClass, + const OUString& rKey); void testOutlineLevel(); void testMimetype(); void testEPUB2(); @@ -175,7 +177,7 @@ void EPUBExportTest::tearDown() test::BootstrapFixture::tearDown(); } -void EPUBExportTest::registerNamespaces(xmlXPathContextPtr &pXmlXpathCtx) +void EPUBExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) { xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("dc"), BAD_CAST("http://purl.org/dc/elements/1.1/")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("opf"), BAD_CAST("http://www.idpf.org/2007/opf")); @@ -183,7 +185,8 @@ void EPUBExportTest::registerNamespaces(xmlXPathContextPtr &pXmlXpathCtx) xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("svg"), BAD_CAST("http://www.w3.org/2000/svg")); } -void EPUBExportTest::createDoc(const OUString &rFile, const uno::Sequence<beans::PropertyValue> &rFilterData) +void EPUBExportTest::createDoc(const OUString& rFile, + const uno::Sequence<beans::PropertyValue>& rFilterData) { // Import the bugdoc and export as EPUB. OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + rFile; @@ -199,19 +202,20 @@ void EPUBExportTest::createDoc(const OUString &rFile, const uno::Sequence<beans: else aMediaDescriptor["FilterOptions"] <<= maFilterOptions; xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); - mxZipFile = packages::zip::ZipFileAccess::createWithURL(mxComponentContext, maTempFile.GetURL()); + mxZipFile + = packages::zip::ZipFileAccess::createWithURL(mxComponentContext, maTempFile.GetURL()); } -xmlDocPtr EPUBExportTest::parseExport(const OUString &rName) +xmlDocPtr EPUBExportTest::parseExport(const OUString& rName) { uno::Reference<io::XInputStream> xInputStream(mxZipFile->getByName(rName), uno::UNO_QUERY); std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); return parseXmlStream(pStream.get()); } -std::map< OUString, std::vector<OUString> > EPUBExportTest::parseCss(const OUString &rName) +std::map<OUString, std::vector<OUString>> EPUBExportTest::parseCss(const OUString& rName) { - std::map< OUString, std::vector<OUString> > aRet; + std::map<OUString, std::vector<OUString>> aRet; uno::Reference<io::XInputStream> xInputStream(mxZipFile->getByName(rName), uno::UNO_QUERY); std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); @@ -232,14 +236,15 @@ std::map< OUString, std::vector<OUString> > EPUBExportTest::parseCss(const OUStr return aRet; } -OUString EPUBExportTest::getCss(std::map< OUString, std::vector<OUString> > &rCss, const OUString &rClass, const OUString &rKey) +OUString EPUBExportTest::getCss(std::map<OUString, std::vector<OUString>>& rCss, + const OUString& rClass, const OUString& rKey) { OUString aRet; auto it = rCss.find(rClass); CPPUNIT_ASSERT(it != rCss.end()); - for (const auto &rKeyValue : it->second) + for (const auto& rKeyValue : it->second) { OUString aKeyValue = rKeyValue.trim(); std::vector<OUString> aTokens = comphelper::string::split(aKeyValue, ':'); @@ -279,7 +284,8 @@ void EPUBExportTest::testMimetype() OString aExpected("application/epub+zip"); CPPUNIT_ASSERT(aMemoryStream.GetSize() > static_cast<sal_uInt64>(38 + aExpected.getLength())); - OString aActual(static_cast<const char *>(aMemoryStream.GetBuffer()) + 38, aExpected.getLength()); + OString aActual(static_cast<const char*>(aMemoryStream.GetBuffer()) + 38, + aExpected.getLength()); // This failed: actual data was some garbage, not the uncompressed mime type. CPPUNIT_ASSERT_EQUAL(aExpected, aActual); @@ -288,10 +294,12 @@ void EPUBExportTest::testMimetype() assertXPath(mpXmlDoc, "/opf:package", "version", "3.0"); // This was just "libepubgen/x.y.z", i.e. the LO version was missing. - OUString aGenerator = getXPath(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@name='generator']", "content"); + OUString aGenerator + = getXPath(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@name='generator']", "content"); CPPUNIT_ASSERT(aGenerator.startsWith(utl::DocInfoHelper::GetGeneratorString())); - uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponentContext->getServiceManager(), uno::UNO_QUERY); + uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponentContext->getServiceManager(), + uno::UNO_QUERY); const OUString aServiceName("com.sun.star.comp.Writer.EPUBExportFilter"); uno::Reference<document::XFilter> xFilter(xMSF->createInstance(aServiceName), uno::UNO_QUERY); // Should result in no errors. @@ -305,10 +313,8 @@ void EPUBExportTest::testMimetype() void EPUBExportTest::testEPUB2() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - // Explicitly request EPUB2. - {"EPUBVersion", uno::makeAny(static_cast<sal_Int32>(20))} - })); + { // Explicitly request EPUB2. + { "EPUBVersion", uno::makeAny(static_cast<sal_Int32>(20)) } })); createDoc("hello.fodt", aFilterData); mpXmlDoc = parseExport("OEBPS/content.opf"); @@ -319,15 +325,15 @@ void EPUBExportTest::testEPUB2() void EPUBExportTest::testEPUBFixedLayout() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - // Explicitly request fixed layout. - {"EPUBLayoutMethod", uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED))} - })); + { // Explicitly request fixed layout. + { "EPUBLayoutMethod", + uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } })); createDoc("hello.fodt", aFilterData); mpXmlDoc = parseExport("OEBPS/content.opf"); // This was missing, EPUBLayoutMethod filter option was ignored and we always emitted reflowable layout. - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='rendition:layout']", "pre-paginated"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='rendition:layout']", + "pre-paginated"); } void EPUBExportTest::testEPUBFixedLayoutOption() @@ -338,16 +344,16 @@ void EPUBExportTest::testEPUBFixedLayoutOption() // This failed, fixed layout was only working via the FilterData map. mpXmlDoc = parseExport("OEBPS/content.opf"); - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='rendition:layout']", "pre-paginated"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='rendition:layout']", + "pre-paginated"); } void EPUBExportTest::testEPUBFixedLayoutImplicitBreak() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - // Explicitly request fixed layout. - {"EPUBLayoutMethod", uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED))} - })); + { // Explicitly request fixed layout. + { "EPUBLayoutMethod", + uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } })); createDoc("fxl-2page.fodt", aFilterData); CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0001.xhtml")); @@ -366,10 +372,9 @@ void EPUBExportTest::testEPUBFixedLayoutImplicitBreak() void EPUBExportTest::testPageBreakSplit() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - // Explicitly request split on page break (instead of on heading). - {"EPUBSplitMethod", uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_SPLIT_METHOD_PAGE_BREAK))} - })); + { // Explicitly request split on page break (instead of on heading). + { "EPUBSplitMethod", + uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_SPLIT_METHOD_PAGE_BREAK)) } })); createDoc("2pages.fodt", aFilterData); // Make sure that the output is split into two. @@ -410,11 +415,14 @@ void EPUBExportTest::testMeta() assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator", "A U Thor"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title", "Title"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language", "hu"); - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", "2017-09-27T09:51:19Z"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", + "2017-09-27T09:51:19Z"); // Make sure that cover image next to the source document is picked up. - assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", "properties", "cover-image"); - assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", "media-type", "image/png"); + assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", + "properties", "cover-image"); + assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", + "media-type", "image/png"); CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.png")); } @@ -424,48 +432,50 @@ void EPUBExportTest::testMetaXMP() mpXmlDoc = parseExport("OEBPS/content.opf"); // These were the libepubgen default values, metadata from a matching .xmp file was not picked up. - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:identifier", "deadbeef-e394-4cd6-9b83-7172794612e5"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:identifier", + "deadbeef-e394-4cd6-9b83-7172794612e5"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title", "unknown title from xmp"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator", "unknown author from xmp"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language", "nl"); - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", "2016-11-20T17:16:07Z"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", + "2016-11-20T17:16:07Z"); } void EPUBExportTest::testMetaAPI() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - {"RVNGIdentifier", uno::makeAny(OUString("deadc0de-e394-4cd6-9b83-7172794612e5"))}, - {"RVNGTitle", uno::makeAny(OUString("unknown title from api"))}, - {"RVNGInitialCreator", uno::makeAny(OUString("unknown author from api"))}, - {"RVNGLanguage", uno::makeAny(OUString("hu"))}, - {"RVNGDate", uno::makeAny(OUString("2015-11-20T17:16:07Z"))} - })); + { { "RVNGIdentifier", uno::makeAny(OUString("deadc0de-e394-4cd6-9b83-7172794612e5")) }, + { "RVNGTitle", uno::makeAny(OUString("unknown title from api")) }, + { "RVNGInitialCreator", uno::makeAny(OUString("unknown author from api")) }, + { "RVNGLanguage", uno::makeAny(OUString("hu")) }, + { "RVNGDate", uno::makeAny(OUString("2015-11-20T17:16:07Z")) } })); createDoc("meta-xmp.fodt", aFilterData); mpXmlDoc = parseExport("OEBPS/content.opf"); // These were values from XMP (deadbeef, etc.), not from API. - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:identifier", "deadc0de-e394-4cd6-9b83-7172794612e5"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:identifier", + "deadc0de-e394-4cd6-9b83-7172794612e5"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title", "unknown title from api"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator", "unknown author from api"); assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language", "hu"); - assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", "2015-11-20T17:16:07Z"); + assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']", + "2015-11-20T17:16:07Z"); } void EPUBExportTest::testCoverImage() { OUString aCoverURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "meta.cover-image.png"; - uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - {"RVNGCoverImage", uno::makeAny(aCoverURL)} - })); + uno::Sequence<beans::PropertyValue> aFilterData( + comphelper::InitPropertySequence({ { "RVNGCoverImage", uno::makeAny(aCoverURL) } })); createDoc("hello.fodt", aFilterData); mpXmlDoc = parseExport("OEBPS/content.opf"); // Make sure that the explicitly set cover image is used. // This failed, as the image was not part of the package. - assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", "properties", "cover-image"); - assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", "media-type", "image/png"); + assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", + "properties", "cover-image"); + assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='images/image0001.png']", + "media-type", "image/png"); CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.png")); } @@ -502,13 +512,14 @@ void EPUBExportTest::testNamedStyleInheritance() // Find the CSS rule for the blue text. mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); OUString aBlue = getXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span[2]", "class"); CPPUNIT_ASSERT_EQUAL(OUString("#0000ff"), EPUBExportTest::getCss(aCssDoc, aBlue, "color")); // This failed, the span only had the properties from its style, but not // from the style's parent(s). - CPPUNIT_ASSERT_EQUAL(OUString("'Liberation Mono'"), EPUBExportTest::getCss(aCssDoc, aBlue, "font-family")); + CPPUNIT_ASSERT_EQUAL(OUString("'Liberation Mono'"), + EPUBExportTest::getCss(aCssDoc, aBlue, "font-family")); } void EPUBExportTest::testNestedSpan() @@ -517,7 +528,7 @@ void EPUBExportTest::testNestedSpan() // Check textural content of nested span. mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); // This crashed, span had no content. assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:span[2]", "red"); @@ -525,7 +536,8 @@ void EPUBExportTest::testNestedSpan() OUString aRed = getXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]", "class"); // This failed, direct formatting on top of named style was lost. CPPUNIT_ASSERT_EQUAL(OUString("#ff0000"), EPUBExportTest::getCss(aCssDoc, aRed, "color")); - CPPUNIT_ASSERT_EQUAL(OUString("'Liberation Mono'"), EPUBExportTest::getCss(aCssDoc, aRed, "font-family")); + CPPUNIT_ASSERT_EQUAL(OUString("'Liberation Mono'"), + EPUBExportTest::getCss(aCssDoc, aRed, "font-family")); } void EPUBExportTest::testLineBreak() @@ -549,7 +561,10 @@ void EPUBExportTest::testEscape() // Make sure escaping happens only once. assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[2]", "a&b"); // This was also lost. - assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[3]", OUString::fromUtf8("\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0 ")); + assertXPathContent( + mpXmlDoc, "//xhtml:p[1]/xhtml:span[3]", + OUString::fromUtf8("\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2" + "\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0\xc2\xa0 ")); } void EPUBExportTest::testParaCharProps() @@ -557,10 +572,11 @@ void EPUBExportTest::testParaCharProps() createDoc("para-char-props.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); // Check formatting of the middle span. OUString aMiddle = getXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]", "class"); - CPPUNIT_ASSERT_EQUAL(OUString("italic"), EPUBExportTest::getCss(aCssDoc, aMiddle, "font-style")); + CPPUNIT_ASSERT_EQUAL(OUString("italic"), + EPUBExportTest::getCss(aCssDoc, aMiddle, "font-style")); // Direct para formatting was lost, only direct char formatting was // written, so this failed. CPPUNIT_ASSERT_EQUAL(OUString("bold"), EPUBExportTest::getCss(aCssDoc, aMiddle, "font-weight")); @@ -599,11 +615,12 @@ void EPUBExportTest::testImageBorder() createDoc("image-border.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:img", "class"); // This failed, image had no border. - CPPUNIT_ASSERT_EQUAL(OUString("0.99pt dashed #ed1c24"), EPUBExportTest::getCss(aCssDoc, aClass, "border")); + CPPUNIT_ASSERT_EQUAL(OUString("0.99pt dashed #ed1c24"), + EPUBExportTest::getCss(aCssDoc, aClass, "border")); } void EPUBExportTest::testImageNospan() @@ -637,11 +654,13 @@ void EPUBExportTest::testTableCellBorder() createDoc("table-cell-border.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); - OUString aClass = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]", "class"); + OUString aClass + = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]", "class"); // This failed, cell border wasn't exported. - CPPUNIT_ASSERT_EQUAL(OUString("0.05pt solid #000000"), EPUBExportTest::getCss(aCssDoc, aClass, "border-left")); + CPPUNIT_ASSERT_EQUAL(OUString("0.05pt solid #000000"), + EPUBExportTest::getCss(aCssDoc, aClass, "border-left")); } void EPUBExportTest::testTableCellWidth() @@ -649,13 +668,18 @@ void EPUBExportTest::testTableCellWidth() createDoc("table-cell-width.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); - OUString aClass1 = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]", "class"); - OUString aClass2 = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[2]", "class"); - OUString aClass3 = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[3]", "class"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + OUString aClass1 + = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]", "class"); + OUString aClass2 + = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[2]", "class"); + OUString aClass3 + = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[3]", "class"); // These failed, all widths were 0. - CPPUNIT_ASSERT_GREATER(EPUBExportTest::getCss(aCssDoc, aClass2, "width").toDouble(), EPUBExportTest::getCss(aCssDoc, aClass1, "width").toDouble()); - CPPUNIT_ASSERT_GREATER(EPUBExportTest::getCss(aCssDoc, aClass3, "width").toDouble(), EPUBExportTest::getCss(aCssDoc, aClass1, "width").toDouble()); + CPPUNIT_ASSERT_GREATER(EPUBExportTest::getCss(aCssDoc, aClass2, "width").toDouble(), + EPUBExportTest::getCss(aCssDoc, aClass1, "width").toDouble()); + CPPUNIT_ASSERT_GREATER(EPUBExportTest::getCss(aCssDoc, aClass3, "width").toDouble(), + EPUBExportTest::getCss(aCssDoc, aClass1, "width").toDouble()); } void EPUBExportTest::testTableRowHeight() @@ -663,11 +687,12 @@ void EPUBExportTest::testTableRowHeight() createDoc("table-row-height.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); OUString aClass1 = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]", "class"); OUString aClass2 = getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[2]", "class"); // These failed, both heights were 0. - CPPUNIT_ASSERT_GREATER(EPUBExportTest::getCss(aCssDoc, aClass2, "height").toDouble(), EPUBExportTest::getCss(aCssDoc, aClass1, "height").toDouble()); + CPPUNIT_ASSERT_GREATER(EPUBExportTest::getCss(aCssDoc, aClass2, "height").toDouble(), + EPUBExportTest::getCss(aCssDoc, aClass1, "height").toDouble()); } void EPUBExportTest::testLink() @@ -704,7 +729,7 @@ void EPUBExportTest::testLinkNamedCharFormat() createDoc("link-namedcharformat.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); // This failed, there was no span inside the hyperlink. assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span", "http://libreoffice.org"); assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a", "href", "http://libreoffice.org/"); @@ -718,7 +743,7 @@ void EPUBExportTest::testTableWidth() createDoc("table-width.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:table", "class"); // This failed, relative total width of table was lost. @@ -730,7 +755,7 @@ void EPUBExportTest::testTextBox() createDoc("text-box.fodt", {}); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); // This failed, image with caption was lost. assertXPath(mpXmlDoc, "//xhtml:img", "class", "frame1"); @@ -752,18 +777,22 @@ void EPUBExportTest::testFontEmbedding() // Make sure that the params of defineEmbeddedFont() are all handled. // librevenge:name - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); // 'SketchFlow Print' or ''SketchFlow Print1' - CPPUNIT_ASSERT(EPUBExportTest::getCss(aCssDoc, "font-face", "font-family").startsWith("'SketchFlow Print")); + CPPUNIT_ASSERT(EPUBExportTest::getCss(aCssDoc, "font-face", "font-family") + .startsWith("'SketchFlow Print")); // librevenge:mime-type mpXmlDoc = parseExport("OEBPS/content.opf"); - assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='fonts/font0001.otf']", "media-type", "application/vnd.ms-opentype"); + assertXPath(mpXmlDoc, "/opf:package/opf:manifest/opf:item[@href='fonts/font0001.otf']", + "media-type", "application/vnd.ms-opentype"); // office:binary-data CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/fonts/font0001.otf")); // librevenge:font-style - CPPUNIT_ASSERT_EQUAL(OUString("normal"), EPUBExportTest::getCss(aCssDoc, "font-face", "font-style")); + CPPUNIT_ASSERT_EQUAL(OUString("normal"), + EPUBExportTest::getCss(aCssDoc, "font-face", "font-style")); // librevenge:font-weight - CPPUNIT_ASSERT_EQUAL(OUString("normal"), EPUBExportTest::getCss(aCssDoc, "font-face", "font-weight")); + CPPUNIT_ASSERT_EQUAL(OUString("normal"), + EPUBExportTest::getCss(aCssDoc, "font-face", "font-weight")); #endif } @@ -822,10 +851,8 @@ void EPUBExportTest::testPopupAPI() { // Make sure that the popup works with data from a media directory. OUString aMediaDir = m_directories.getURLFromSrc(DATA_DIRECTORY) + "popup"; - uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - {"RVNGMediaDir", uno::makeAny(aMediaDir)} - })); + uno::Sequence<beans::PropertyValue> aFilterData( + comphelper::InitPropertySequence({ { "RVNGMediaDir", uno::makeAny(aMediaDir) } })); createDoc("popup-api.odt", aFilterData); // We have a non-empty anchor image. @@ -842,15 +869,15 @@ void EPUBExportTest::testPopupAPI() void EPUBExportTest::testPageSize() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - {"EPUBLayoutMethod", uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED))} - })); + { { "EPUBLayoutMethod", + uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } })); createDoc("hello.fodt", aFilterData); // This failed, viewport was empty, so page size was lost. mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); // 21,59cm x 27.94cm (letter). - assertXPath(mpXmlDoc, "/xhtml:html/xhtml:head/xhtml:meta[@name='viewport']", "content", "width=816, height=1056"); + assertXPath(mpXmlDoc, "/xhtml:html/xhtml:head/xhtml:meta[@name='viewport']", "content", + "width=816, height=1056"); xmlFreeDoc(mpXmlDoc); mpXmlDoc = parseExport("OEBPS/images/image0001.svg"); @@ -862,13 +889,13 @@ void EPUBExportTest::testPageSize() void EPUBExportTest::testSVG() { uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( - { - {"EPUBLayoutMethod", uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED))} - })); + { { "EPUBLayoutMethod", + uno::makeAny(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } })); createDoc("hello.fodt", aFilterData); CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.svg")); - uno::Reference<io::XInputStream> xInputStream(mxZipFile->getByName("OEBPS/images/image0001.svg"), uno::UNO_QUERY); + uno::Reference<io::XInputStream> xInputStream( + mxZipFile->getByName("OEBPS/images/image0001.svg"), uno::UNO_QUERY); std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); SvMemoryStream aMemoryStream; @@ -878,7 +905,7 @@ void EPUBExportTest::testSVG() // This failed, there was a '<!DOCTYPE' line between the xml and the svg // one, causing a validation error. - OString aActual(static_cast<const char *>(aMemoryStream.GetBuffer()), aExpected.getLength()); + OString aActual(static_cast<const char*>(aMemoryStream.GetBuffer()), aExpected.getLength()); CPPUNIT_ASSERT_EQUAL(aExpected, aActual); // This failed, we used the xlink attribute namespace, but we did not @@ -887,25 +914,26 @@ void EPUBExportTest::testSVG() assertXPathNSDef(mpXmlDoc, "/svg:svg", "xlink", "http://www.w3.org/1999/xlink"); } - void EPUBExportTest::testTdf115623SingleWritingMode() { // Simple page that has single writing mode should work. createDoc("tdf115623-single-writing-mode.odt", {}); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:body", "class"); - CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); + CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), + EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); } void EPUBExportTest::testTdf115623SplitByChapter() { createDoc("tdf115623-split-by-chapter.odt", {}); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); { mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:body", "class"); - CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); + CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), + EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); xmlFreeDoc(mpXmlDoc); mpXmlDoc = nullptr; } @@ -913,31 +941,33 @@ void EPUBExportTest::testTdf115623SplitByChapter() { mpXmlDoc = parseExport("OEBPS/sections/section0002.xhtml"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:body", "class"); - CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); + CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), + EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); } } void EPUBExportTest::testTdf115623ManyPageSpans() { createDoc("tdf115623-many-pagespans.odt", {}); - std::map< OUString, std::vector<OUString> > aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); + std::map<OUString, std::vector<OUString>> aCssDoc = parseCss("OEBPS/styles/stylesheet.css"); // Two pages should have different writing modes. { mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:body", "class"); - CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); + CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"), + EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); xmlFreeDoc(mpXmlDoc); mpXmlDoc = nullptr; } { mpXmlDoc = parseExport("OEBPS/sections/section0002.xhtml"); OUString aClass = getXPath(mpXmlDoc, "//xhtml:body", "class"); - CPPUNIT_ASSERT_EQUAL(OUString("horizontal-tb"), EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); + CPPUNIT_ASSERT_EQUAL(OUString("horizontal-tb"), + EPUBExportTest::getCss(aCssDoc, aClass, "writing-mode")); } } CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx index 9275c6c11b7f..dca0808bd432 100644 --- a/writerperfect/qa/unit/ImportTest.cxx +++ b/writerperfect/qa/unit/ImportTest.cxx @@ -23,7 +23,6 @@ namespace { - namespace beans = css::beans; namespace container = css::container; namespace document = css::document; @@ -48,11 +47,11 @@ public: CPPUNIT_TEST_SUITE_END(); private: - WpftLoader createCalcLoader(const rtl::OUString &rFile) const; + WpftLoader createCalcLoader(const rtl::OUString& rFile) const; - WpftLoader createLoader(const rtl::OUString &rUrl, const rtl::OUString &rFactoryUrl) const; + WpftLoader createLoader(const rtl::OUString& rUrl, const rtl::OUString& rFactoryUrl) const; - rtl::OUString makeUrl(const rtl::OUString &rFile) const; + rtl::OUString makeUrl(const rtl::OUString& rFile) const; private: uno::Reference<lang::XMultiServiceFactory> m_xFilterFactory; @@ -86,12 +85,13 @@ void ImportTest::testWK3WithFM3() #endif } -WpftLoader ImportTest::createCalcLoader(const rtl::OUString &rFile) const +WpftLoader ImportTest::createCalcLoader(const rtl::OUString& rFile) const { return createLoader(makeUrl(rFile), "private:factory/scalc"); } -WpftLoader ImportTest::createLoader(const rtl::OUString &rUrl, const rtl::OUString &rFactoryUrl) const +WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl, + const rtl::OUString& rFactoryUrl) const { utl::MediaDescriptor aDesc; aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl; @@ -99,18 +99,18 @@ WpftLoader ImportTest::createLoader(const rtl::OUString &rUrl, const rtl::OUStri uno::Sequence<beans::PropertyValue> lDesc(aDesc.getAsConstPropertyValueList()); const rtl::OUString sType = m_xTypeDetection->queryTypeByDescriptor(lDesc, true); CPPUNIT_ASSERT(!sType.isEmpty()); - const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sType), UNO_QUERY); + const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sType), + UNO_QUERY); CPPUNIT_ASSERT(xFilter.is()); return WpftLoader(rUrl, xFilter, rFactoryUrl, m_xDesktop, m_xTypeMap, m_xContext); } -rtl::OUString ImportTest::makeUrl(const rtl::OUString &rFile) const +rtl::OUString ImportTest::makeUrl(const rtl::OUString& rFile) const { - return const_cast<ImportTest *>(this)->m_directories.getURLFromSrc("/" TEST_DIR "/" + rFile); + return const_cast<ImportTest*>(this)->m_directories.getURLFromSrc("/" TEST_DIR "/" + rFile); } CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx index 9ad9fed92ac6..de0b951f1c03 100644 --- a/writerperfect/qa/unit/PresentationImportTest.cxx +++ b/writerperfect/qa/unit/PresentationImportTest.cxx @@ -27,34 +27,39 @@ namespace { - namespace uno = css::uno; class PresentationImportFilter : public writerperfect::ImportFilter<OdpGenerator> { public: - explicit PresentationImportFilter(const uno::Reference< uno::XComponentContext > &rxContext) - : writerperfect::ImportFilter<OdpGenerator>(rxContext) {} + explicit PresentationImportFilter(const uno::Reference<uno::XComponentContext>& rxContext) + : writerperfect::ImportFilter<OdpGenerator>(rxContext) + { + } // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString &ServiceName) override; - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override; + virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; private: - virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, rtl::OUString &rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdpGenerator &rGenerator, utl::MediaDescriptor &rDescriptor) override; + virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, + rtl::OUString& rTypeName) override; + virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, + utl::MediaDescriptor& rDescriptor) override; - static void generate(librevenge::RVNGPresentationInterface &rDocument); + static void generate(librevenge::RVNGPresentationInterface& rDocument); }; -bool PresentationImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdpGenerator &rGenerator, utl::MediaDescriptor &) +bool PresentationImportFilter::doImportDocument(librevenge::RVNGInputStream&, + OdpGenerator& rGenerator, utl::MediaDescriptor&) { PresentationImportFilter::generate(rGenerator); return true; } -bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName) +bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&, + rtl::OUString& rTypeName) { rTypeName = "WpftDummyPresentation"; return true; @@ -66,17 +71,17 @@ rtl::OUString SAL_CALL PresentationImportFilter::getImplementationName() return OUString("org.libreoffice.comp.Wpft.QA.PresentationImportFilter"); } -sal_Bool SAL_CALL PresentationImportFilter::supportsService(const rtl::OUString &rServiceName) +sal_Bool SAL_CALL PresentationImportFilter::supportsService(const rtl::OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< rtl::OUString > SAL_CALL PresentationImportFilter::getSupportedServiceNames() +uno::Sequence<rtl::OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames() { - return {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } -void PresentationImportFilter::generate(librevenge::RVNGPresentationInterface &rDocument) +void PresentationImportFilter::generate(librevenge::RVNGPresentationInterface& rDocument) { using namespace librevenge; @@ -100,12 +105,10 @@ void PresentationImportFilter::generate(librevenge::RVNGPresentationInterface &r rDocument.endSlide(); rDocument.endDocument(); } - } namespace { - class PresentationImportTest : public writerperfect::test::WpftFilterFixture { public: @@ -120,8 +123,9 @@ void PresentationImportTest::test() { using namespace css; - rtl::Reference<PresentationImportFilter> xFilter {new PresentationImportFilter(m_xContext)}; - writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), "private:factory/simpress", m_xDesktop, m_xContext); + rtl::Reference<PresentationImportFilter> xFilter{ new PresentationImportFilter(m_xContext) }; + writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), + "private:factory/simpress", m_xDesktop, m_xContext); uno::Reference<drawing::XDrawPagesSupplier> xDoc(aLoader.getDocument(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -142,13 +146,13 @@ void PresentationImportTest::test() uno::Reference<drawing::XShapeDescriptor> xShapeDesc; CPPUNIT_ASSERT(aShape >>= xShapeDesc); CPPUNIT_ASSERT(xShapeDesc.is()); - CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType()); + CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"), + xShapeDesc->getShapeType()); uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString()); } CPPUNIT_TEST_SUITE_REGISTRATION(PresentationImportTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx index a3aa1a968bc3..ef4e18c16ff0 100644 --- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx +++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx @@ -26,34 +26,38 @@ namespace { - namespace uno = css::uno; class SpreadsheetImportFilter : public writerperfect::ImportFilter<OdsGenerator> { public: - explicit SpreadsheetImportFilter(const uno::Reference< uno::XComponentContext > &rxContext) - : writerperfect::ImportFilter<OdsGenerator>(rxContext) {} + explicit SpreadsheetImportFilter(const uno::Reference<uno::XComponentContext>& rxContext) + : writerperfect::ImportFilter<OdsGenerator>(rxContext) + { + } // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString &ServiceName) override; - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override; + virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; private: - virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, rtl::OUString &rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &rDescriptor) override; + virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, + rtl::OUString& rTypeName) override; + virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdsGenerator& rGenerator, + utl::MediaDescriptor& rDescriptor) override; - static void generate(librevenge::RVNGSpreadsheetInterface &rDocument); + static void generate(librevenge::RVNGSpreadsheetInterface& rDocument); }; -bool SpreadsheetImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdsGenerator &rGenerator, utl::MediaDescriptor &) +bool SpreadsheetImportFilter::doImportDocument(librevenge::RVNGInputStream&, + OdsGenerator& rGenerator, utl::MediaDescriptor&) { SpreadsheetImportFilter::generate(rGenerator); return true; } -bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName) +bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName) { rTypeName = "WpftDummySpreadsheet"; return true; @@ -65,17 +69,17 @@ rtl::OUString SAL_CALL SpreadsheetImportFilter::getImplementationName() return OUString("org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter"); } -sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const rtl::OUString &rServiceName) +sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const rtl::OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< rtl::OUString > SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames() +uno::Sequence<rtl::OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames() { - return {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } -void SpreadsheetImportFilter::generate(librevenge::RVNGSpreadsheetInterface &rDocument) +void SpreadsheetImportFilter::generate(librevenge::RVNGSpreadsheetInterface& rDocument) { using namespace librevenge; @@ -95,12 +99,10 @@ void SpreadsheetImportFilter::generate(librevenge::RVNGSpreadsheetInterface &rDo rDocument.closePageSpan(); rDocument.endDocument(); } - } namespace { - class SpreadsheetImportTest : public writerperfect::test::WpftFilterFixture { public: @@ -115,8 +117,9 @@ void SpreadsheetImportTest::test() { using namespace css; - rtl::Reference<SpreadsheetImportFilter> xFilter {new SpreadsheetImportFilter(m_xContext)}; - writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), "private:factory/scalc", m_xDesktop, m_xContext); + rtl::Reference<SpreadsheetImportFilter> xFilter{ new SpreadsheetImportFilter(m_xContext) }; + writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), + "private:factory/scalc", m_xDesktop, m_xContext); uno::Reference<sheet::XSpreadsheetDocument> xDoc(aLoader.getDocument(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -131,7 +134,6 @@ void SpreadsheetImportTest::test() } CPPUNIT_TEST_SUITE_REGISTRATION(SpreadsheetImportTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/qa/unit/TextImportTest.cxx b/writerperfect/qa/unit/TextImportTest.cxx index dcf599577ee6..cbad0f154c27 100644 --- a/writerperfect/qa/unit/TextImportTest.cxx +++ b/writerperfect/qa/unit/TextImportTest.cxx @@ -25,34 +25,38 @@ namespace { - namespace uno = css::uno; class TextImportFilter : public writerperfect::ImportFilter<OdtGenerator> { public: - explicit TextImportFilter(const uno::Reference< uno::XComponentContext > &rxContext) - : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} + explicit TextImportFilter(const uno::Reference<uno::XComponentContext>& rxContext) + : writerperfect::ImportFilter<OdtGenerator>(rxContext) + { + } // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString &ServiceName) override; - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override; + virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; private: - virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, rtl::OUString &rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdtGenerator &rGenerator, utl::MediaDescriptor &rDescriptor) override; + virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, + rtl::OUString& rTypeName) override; + virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdtGenerator& rGenerator, + utl::MediaDescriptor& rDescriptor) override; - static void generate(librevenge::RVNGTextInterface &rDocument); + static void generate(librevenge::RVNGTextInterface& rDocument); }; -bool TextImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdtGenerator &rGenerator, utl::MediaDescriptor &) +bool TextImportFilter::doImportDocument(librevenge::RVNGInputStream&, OdtGenerator& rGenerator, + utl::MediaDescriptor&) { TextImportFilter::generate(rGenerator); return true; } -bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName) +bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName) { rTypeName = "WpftDummyText"; return true; @@ -64,17 +68,17 @@ rtl::OUString SAL_CALL TextImportFilter::getImplementationName() return OUString("org.libreoffice.comp.Wpft.QA.TextImportFilter"); } -sal_Bool SAL_CALL TextImportFilter::supportsService(const rtl::OUString &rServiceName) +sal_Bool SAL_CALL TextImportFilter::supportsService(const rtl::OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< rtl::OUString > SAL_CALL TextImportFilter::getSupportedServiceNames() +uno::Sequence<rtl::OUString> SAL_CALL TextImportFilter::getSupportedServiceNames() { - return {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; + return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } -void TextImportFilter::generate(librevenge::RVNGTextInterface &rDocument) +void TextImportFilter::generate(librevenge::RVNGTextInterface& rDocument) { using namespace librevenge; @@ -88,12 +92,10 @@ void TextImportFilter::generate(librevenge::RVNGTextInterface &rDocument) rDocument.closePageSpan(); rDocument.endDocument(); } - } namespace { - class TextImportTest : public writerperfect::test::WpftFilterFixture { public: @@ -108,8 +110,9 @@ void TextImportTest::test() { using namespace css; - rtl::Reference<TextImportFilter> xFilter {new TextImportFilter(m_xContext)}; - writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), "private:factory/swriter", m_xDesktop, m_xContext); + rtl::Reference<TextImportFilter> xFilter{ new TextImportFilter(m_xContext) }; + writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), + "private:factory/swriter", m_xDesktop, m_xContext); uno::Reference<text::XTextDocument> xDoc(aLoader.getDocument(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -118,7 +121,8 @@ void TextImportTest::test() uno::Reference<container::XEnumeration> xParas = xParaAccess->createEnumeration(); CPPUNIT_ASSERT(xParas.is()); CPPUNIT_ASSERT(xParas->hasMoreElements()); - uno::Reference<container::XEnumerationAccess> xPortionsAccess(xParas->nextElement(), uno::UNO_QUERY); + uno::Reference<container::XEnumerationAccess> xPortionsAccess(xParas->nextElement(), + uno::UNO_QUERY); CPPUNIT_ASSERT(xPortionsAccess.is()); uno::Reference<container::XEnumeration> xPortions = xPortionsAccess->createEnumeration(); CPPUNIT_ASSERT(xPortions.is()); @@ -136,7 +140,6 @@ void TextImportTest::test() } CPPUNIT_TEST_SUITE_REGISTRATION(TextImportTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 456af32f01a0..0899b4a64ad1 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -45,7 +45,6 @@ using writerperfect::WPXSvInputStream; namespace { - class WPXSvStreamTest : public test::BootstrapFixture { public: @@ -73,7 +72,8 @@ 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; @@ -83,22 +83,25 @@ shared_ptr<RVNGInputStream> lcl_createStream() return pInputStream; } -const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const rtl::OUString &rURL) +const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const rtl::OUString& rURL) { using uno::Reference; using uno::UNO_QUERY_THROW; - const Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), UNO_QUERY_THROW); + const Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), + UNO_QUERY_THROW); const Reference<ucb::XSimpleFileAccess> xFileAccess( - xContext->getServiceManager()->createInstanceWithContext("com.sun.star.ucb.SimpleFileAccess", xContext), + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.ucb.SimpleFileAccess", xContext), UNO_QUERY_THROW); - const Reference<io::XInputStream> xInputStream(xFileAccess->openFileRead(rURL), UNO_QUERY_THROW); + const Reference<io::XInputStream> xInputStream(xFileAccess->openFileRead(rURL), + UNO_QUERY_THROW); const shared_ptr<RVNGInputStream> pInput(new WPXSvInputStream(xInputStream)); return pInput; } -void lcl_testSubStreams(const shared_ptr<RVNGInputStream> &pInput) +void lcl_testSubStreams(const shared_ptr<RVNGInputStream>& pInput) { shared_ptr<RVNGInputStream> pSubStream; @@ -122,9 +125,9 @@ void WPXSvStreamTest::testRead() const unsigned long nLen = sizeof aText; unsigned long nReadBytes = 0; - const unsigned char *pData = nullptr; - const unsigned char *const pTextOrig = reinterpret_cast<const unsigned char *>(aText); - const unsigned char *pText = pTextOrig; + const unsigned char* pData = nullptr; + 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); @@ -174,7 +177,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 *>(nullptr)); + CPPUNIT_ASSERT_EQUAL(pData, static_cast<const unsigned char*>(nullptr)); CPPUNIT_ASSERT(!pInput->isEnd()); } @@ -293,7 +296,8 @@ void WPXSvStreamTest::testStructured() { // OLE2 { - const shared_ptr<RVNGInputStream> pInput(lcl_createStreamForURL(m_directories.getURLFromSrc(aOLEFile))); + const shared_ptr<RVNGInputStream> pInput( + lcl_createStreamForURL(m_directories.getURLFromSrc(aOLEFile))); assert(bool(pInput)); CPPUNIT_ASSERT(pInput->isStructured()); @@ -314,7 +318,8 @@ void WPXSvStreamTest::testStructured() // Zip { - const shared_ptr<RVNGInputStream> pInput(lcl_createStreamForURL(m_directories.getURLFromSrc(aZipFile))); + const shared_ptr<RVNGInputStream> pInput( + lcl_createStreamForURL(m_directories.getURLFromSrc(aZipFile))); assert(bool(pInput)); CPPUNIT_ASSERT(pInput->isStructured()); @@ -347,7 +352,6 @@ void WPXSvStreamTest::testStructured() } CPPUNIT_TEST_SUITE_REGISTRATION(WPXSvStreamTest); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx index 0e5584e1ff85..894c0bcf7f9a 100644 --- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx +++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx @@ -11,7 +11,6 @@ namespace { - class WpftCalcFilterTest : public writerperfect::test::WpftFilterTestBase { public: @@ -31,25 +30,26 @@ WpftCalcFilterTest::WpftCalcFilterTest() void WpftCalcFilterTest::test() { - const writerperfect::test::WpftOptionalMap_t aEtonyekOptional - { - {"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, + const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{ + { "Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2) }, }; - const writerperfect::test::WpftOptionalMap_t aWpsOptional - { - {"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)}, - {"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)}, - {"QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8)}, + const writerperfect::test::WpftOptionalMap_t aWpsOptional{ + { "Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5) }, + { "Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6) }, + { "QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8) }, }; - doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/"); - doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", "/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional); - doTest("org.libreoffice.comp.Calc.NumbersImportFilter", "/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional); - doTest("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter", "/writerperfect/qa/unit/data/calc/libstaroffice/"); + doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", + "/writerperfect/qa/unit/data/calc/libmwaw/"); + doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", + "/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional); + doTest("org.libreoffice.comp.Calc.NumbersImportFilter", + "/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional); + doTest("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter", + "/writerperfect/qa/unit/data/calc/libstaroffice/"); } CPPUNIT_TEST_SUITE_REGISTRATION(WpftCalcFilterTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx b/writerperfect/qa/unit/WpftDrawFilterTest.cxx index 95a85c4ef52b..bdf2e33fb058 100644 --- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx +++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx @@ -11,7 +11,6 @@ namespace { - class WpftDrawFilterTest : public writerperfect::test::WpftFilterTestBase { public: @@ -31,39 +30,43 @@ WpftDrawFilterTest::WpftDrawFilterTest() void WpftDrawFilterTest::test() { - const writerperfect::test::WpftOptionalMap_t aMWAWOptional - { - {"ClarisDraw.hqx", REQUIRE_MWAW_VERSION(0, 3, 5)}, - {"CricketDraw_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8)}, - {"CricketDraw_1.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8)}, - {"FreeHand_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8)}, - {"FreeHand_2.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8)}, - {"MacDraft_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 5)}, - {"MacDraft_5.5.drw", REQUIRE_MWAW_VERSION(0, 3, 6)}, - {"MacDraw_0.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)}, - {"MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)}, - {"MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3)}, - {"MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4)}, + const writerperfect::test::WpftOptionalMap_t aMWAWOptional{ + { "ClarisDraw.hqx", REQUIRE_MWAW_VERSION(0, 3, 5) }, + { "CricketDraw_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) }, + { "CricketDraw_1.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) }, + { "FreeHand_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) }, + { "FreeHand_2.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) }, + { "MacDraft_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 5) }, + { "MacDraft_5.5.drw", REQUIRE_MWAW_VERSION(0, 3, 6) }, + { "MacDraw_0.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, + { "MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, + { "MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3) }, + { "MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4) }, }; - const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional - { - {"Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1)}, + const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{ + { "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) }, }; doTest("com.sun.star.comp.Draw.CDRImportFilter", "/writerperfect/qa/unit/data/draw/libcdr/"); - doTest("com.sun.star.comp.Draw.CMXImportFilter", "/writerperfect/qa/unit/data/draw/libcdr-cmx/"); - doTest("com.sun.star.comp.Draw.FreehandImportFilter", "/writerperfect/qa/unit/data/draw/libfreehand/"); - doTest("com.sun.star.comp.Draw.MSPUBImportFilter", "/writerperfect/qa/unit/data/draw/libmspub/"); - doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter", "/writerperfect/qa/unit/data/draw/libmwaw/", aMWAWOptional); - doTest("com.sun.star.comp.Draw.VisioImportFilter", "/writerperfect/qa/unit/data/draw/libvisio/"); + doTest("com.sun.star.comp.Draw.CMXImportFilter", + "/writerperfect/qa/unit/data/draw/libcdr-cmx/"); + doTest("com.sun.star.comp.Draw.FreehandImportFilter", + "/writerperfect/qa/unit/data/draw/libfreehand/"); + doTest("com.sun.star.comp.Draw.MSPUBImportFilter", + "/writerperfect/qa/unit/data/draw/libmspub/"); + doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter", + "/writerperfect/qa/unit/data/draw/libmwaw/", aMWAWOptional); + doTest("com.sun.star.comp.Draw.VisioImportFilter", + "/writerperfect/qa/unit/data/draw/libvisio/"); doTest("com.sun.star.comp.Draw.WPGImportFilter", "/writerperfect/qa/unit/data/draw/libwpg/"); - doTest("org.libreoffice.comp.Draw.PageMakerImportFilter", "/writerperfect/qa/unit/data/draw/libpagemaker/"); - doTest("org.libreoffice.comp.Draw.StarOfficeDrawImportFilter", "/writerperfect/qa/unit/data/draw/libstaroffice/", aStarOfficeOptional); + doTest("org.libreoffice.comp.Draw.PageMakerImportFilter", + "/writerperfect/qa/unit/data/draw/libpagemaker/"); + doTest("org.libreoffice.comp.Draw.StarOfficeDrawImportFilter", + "/writerperfect/qa/unit/data/draw/libstaroffice/", aStarOfficeOptional); doTest("org.libreoffice.comp.Draw.ZMFImportFilter", "/writerperfect/qa/unit/data/draw/libzmf/"); } CPPUNIT_TEST_SUITE_REGISTRATION(WpftDrawFilterTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerperfect/qa/unit/WpftFilterFixture.cxx b/writerperfect/qa/unit/WpftFilterFixture.cxx index 60708ce30287..f7c3dfcc5999 100644 --- a/writerperfect/qa/unit/WpftFilterFixture.cxx +++ b/writerperfect/qa/unit/WpftFilterFixture.cxx @@ -21,7 +21,6 @@ namespace writerperfect { namespace test { - void WpftFilterFixture::setUp() { ::test::BootstrapFixture::setUp(); @@ -33,7 +32,6 @@ void WpftFilterFixture::setUp() uno::UNO_QUERY_THROW); m_xTypeMap.set(m_xTypeDetection, uno::UNO_QUERY_THROW); } - } } diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx index 058c042df3d1..f32478165617 100644 --- a/writerperfect/qa/unit/WpftFilterFixture.hxx +++ b/writerperfect/qa/unit/WpftFilterFixture.hxx @@ -21,25 +21,27 @@ #include <test/bootstrapfixture.hxx> -#define REQUIRE_VERSION(major, minor, micro, req_major, req_minor, req_micro) \ - (major) > (req_major) || \ - ((major) == (req_major) && \ - ((minor) > (req_minor) \ - || ((minor) == (req_minor) && ((micro) >= (req_micro))))) +#define REQUIRE_VERSION(major, minor, micro, req_major, req_minor, req_micro) \ + (major) > (req_major) \ + || ((major) == (req_major) \ + && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro))))) -#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ - REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro) +#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ + REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \ + micro) -#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ - REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) +#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ + REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \ + minor, micro) -#define REQUIRE_MWAW_VERSION(major, minor, micro) \ +#define REQUIRE_MWAW_VERSION(major, minor, micro) \ REQUIRE_VERSION(MWAW_VERSION_MAJOR, MWAW_VERSION_MINOR, MWAW_VERSION_MICRO, major, minor, micro) -#define REQUIRE_STAROFFICE_VERSION(major, minor, micro) \ - REQUIRE_VERSION(STAROFFICE_VERSION_MAJOR, STAROFFICE_VERSION_MINOR, STAROFFICE_VERSION_MICRO, major, minor, micro) +#define REQUIRE_STAROFFICE_VERSION(major, minor, micro) \ + REQUIRE_VERSION(STAROFFICE_VERSION_MAJOR, STAROFFICE_VERSION_MINOR, STAROFFICE_VERSION_MICRO, \ + major, minor, micro) -#define REQUIRE_WPS_VERSION(major, minor, micro) \ +#define REQUIRE_WPS_VERSION(major, minor, micro) \ REQUIRE_VERSION(WPS_VERSION_MAJOR, WPS_VERSION_MINOR, WPS_VERSION_MICRO, major, minor, micro) namespace com @@ -68,7 +70,6 @@ namespace writerperfect { namespace test { - class WPFTQAHELPER_DLLPUBLIC WpftFilterFixture : public ::test::BootstrapFixture { public: @@ -79,7 +80,6 @@ protected: css::uno::Reference<css::document::XTypeDetection> m_xTypeDetection; css::uno::Reference<css::container::XNameAccess> m_xTypeMap; }; - } } diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx index dbb1ba27f7a0..301d9a1348ab 100644 --- a/writerperfect/qa/unit/WpftFilterTestBase.cxx +++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx @@ -21,8 +21,7 @@ namespace writerperfect { namespace test { - -WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString &rFactoryURL) +WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString& rFactoryURL) : ::test::FiltersTest() , WpftFilterFixture() , m_aFactoryURL(rFactoryURL) @@ -30,10 +29,9 @@ WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString &rFactoryURL) { } -bool WpftFilterTestBase::load(const OUString &, const OUString &rURL, const OUString &, +bool WpftFilterTestBase::load(const OUString&, const OUString& rURL, const OUString&, SfxFilterFlags, SotClipboardFormatId, unsigned int) { - if (m_pOptionalMap) { // first check if this test file is supported by the used version of the library @@ -47,20 +45,20 @@ bool WpftFilterTestBase::load(const OUString &, const OUString &rURL, const OUSt return aLoader.getDocument().is(); } -void WpftFilterTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath) +void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath) { m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW); testDir(OUString(), m_directories.getURLFromSrc(rPath)); } -void WpftFilterTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath, const WpftOptionalMap_t &rOptionalMap) +void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath, + const WpftOptionalMap_t& rOptionalMap) { m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW); m_pOptionalMap = &rOptionalMap; testDir(OUString(), m_directories.getURLFromSrc(rPath)); m_pOptionalMap = nullptr; } - } } diff --git a/writerperfect/qa/unit/WpftFilterTestBase.hxx b/writerperfect/qa/unit/WpftFilterTestBase.hxx index 31267f8609bf..481d169d1663 100644 --- a/writerperfect/qa/unit/WpftFilterTestBase.hxx +++ b/writerperfect/qa/unit/WpftFilterTestBase.hxx @@ -40,30 +40,28 @@ namespace writerperfect { namespace test { - typedef std::unordered_map<rtl::OUString, bool> WpftOptionalMap_t; -class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase - : public ::test::FiltersTest - , public WpftFilterFixture +class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase : public ::test::FiltersTest, + public WpftFilterFixture { public: - explicit WpftFilterTestBase(const rtl::OUString &rFactoryURL); + explicit WpftFilterTestBase(const rtl::OUString& rFactoryURL); protected: - void doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath); - void doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath, const WpftOptionalMap_t &rOptionalMap); + void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath); + void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath, + const WpftOptionalMap_t& rOptionalMap); private: - 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; private: const rtl::OUString m_aFactoryURL; css::uno::Reference<css::document::XFilter> m_xFilter; - const WpftOptionalMap_t *m_pOptionalMap; + const WpftOptionalMap_t* m_pOptionalMap; }; - } } diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx index 2da1195d30c5..261085f97cdf 100644 --- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx +++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx @@ -11,7 +11,6 @@ namespace { - class WpftImpressFilterTest : public writerperfect::test::WpftFilterTestBase { public: @@ -31,31 +30,30 @@ WpftImpressFilterTest::WpftImpressFilterTest() void WpftImpressFilterTest::test() { - const writerperfect::test::WpftOptionalMap_t aEtonyekOptional - { - {"v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)}, - {"v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)}, - {"v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4)}, + const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{ + { "v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) }, + { "v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) }, + { "v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4) }, }; - const writerperfect::test::WpftOptionalMap_t aMWAWOptional - { - {"ClarisWorks_6.0.cwk", REQUIRE_MWAW_VERSION(0, 3, 3)}, - {"PowerPoint_Mac_1", REQUIRE_MWAW_VERSION(0, 3, 9)}, - {"PowerPoint_Mac_2", REQUIRE_MWAW_VERSION(0, 3, 9)}, - {"PowerPoint_Mac_3", REQUIRE_MWAW_VERSION(0, 3, 9)}, - {"PowerPoint_Mac_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)}, - {"PowerPoint_2.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)}, - {"PowerPoint_3.ppt", REQUIRE_MWAW_VERSION(0, 3, 9)}, - {"PowerPoint_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)}, - {"PowerPoint_7.ppt", REQUIRE_MWAW_VERSION(0, 3, 11)}, + const writerperfect::test::WpftOptionalMap_t aMWAWOptional{ + { "ClarisWorks_6.0.cwk", REQUIRE_MWAW_VERSION(0, 3, 3) }, + { "PowerPoint_Mac_1", REQUIRE_MWAW_VERSION(0, 3, 9) }, + { "PowerPoint_Mac_2", REQUIRE_MWAW_VERSION(0, 3, 9) }, + { "PowerPoint_Mac_3", REQUIRE_MWAW_VERSION(0, 3, 9) }, + { "PowerPoint_Mac_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10) }, + { "PowerPoint_2.ppt", REQUIRE_MWAW_VERSION(0, 3, 10) }, + { "PowerPoint_3.ppt", REQUIRE_MWAW_VERSION(0, 3, 9) }, + { "PowerPoint_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10) }, + { "PowerPoint_7.ppt", REQUIRE_MWAW_VERSION(0, 3, 11) }, }; - doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional); - doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter", "/writerperfect/qa/unit/data/impress/libmwaw/", aMWAWOptional); + doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", + "/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional); + doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter", + "/writerperfect/qa/unit/data/impress/libmwaw/", aMWAWOptional); } CPPUNIT_TEST_SUITE_REGISTRATION(WpftImpressFilterTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx index dbf94287ef8a..b89353d5c568 100644 --- a/writerperfect/qa/unit/WpftLoader.cxx +++ b/writerperfect/qa/unit/WpftLoader.cxx @@ -42,15 +42,12 @@ namespace writerperfect { namespace test { - -WpftLoader::WpftLoader( - const rtl::OUString &rURL, - const css::uno::Reference<css::document::XFilter> &rxFilter, - const rtl::OUString &rFactoryURL, - const css::uno::Reference<css::frame::XDesktop2> &rxDesktop, - const css::uno::Reference<css::container::XNameAccess> &rxTypeMap, - const css::uno::Reference<css::uno::XComponentContext> &rxContext -) +WpftLoader::WpftLoader(const rtl::OUString& rURL, + const css::uno::Reference<css::document::XFilter>& rxFilter, + const rtl::OUString& rFactoryURL, + const css::uno::Reference<css::frame::XDesktop2>& rxDesktop, + const css::uno::Reference<css::container::XNameAccess>& rxTypeMap, + const css::uno::Reference<css::uno::XComponentContext>& rxContext) : m_aURL(rURL) , m_aFactoryURL(rFactoryURL) , m_xFilter(rxFilter) @@ -62,13 +59,11 @@ WpftLoader::WpftLoader( impl_dispose(); } -WpftLoader::WpftLoader( - const css::uno::Reference<css::io::XInputStream> &rxInputStream, - const css::uno::Reference<css::document::XFilter> &rxFilter, - const rtl::OUString &rFactoryURL, - const css::uno::Reference<css::frame::XDesktop2> &rxDesktop, - const css::uno::Reference<css::uno::XComponentContext> &rxContext -) +WpftLoader::WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream, + const css::uno::Reference<css::document::XFilter>& rxFilter, + const rtl::OUString& rFactoryURL, + const css::uno::Reference<css::frame::XDesktop2>& rxDesktop, + const css::uno::Reference<css::uno::XComponentContext>& rxContext) : m_xInputStream(rxInputStream) , m_aFactoryURL(rFactoryURL) , m_xFilter(rxFilter) @@ -90,17 +85,14 @@ WpftLoader::~WpftLoader() } } -const css::uno::Reference<css::lang::XComponent> &WpftLoader::getDocument() const -{ - return m_xDoc; -} +const css::uno::Reference<css::lang::XComponent>& WpftLoader::getDocument() const { return m_xDoc; } bool WpftLoader::impl_load() { // create an empty frame - m_xDoc.set( - m_xDesktop->loadComponentFromURL(m_aFactoryURL, "_blank", 0, uno::Sequence<beans::PropertyValue>()), - uno::UNO_QUERY_THROW); + m_xDoc.set(m_xDesktop->loadComponentFromURL(m_aFactoryURL, "_blank", 0, + uno::Sequence<beans::PropertyValue>()), + uno::UNO_QUERY_THROW); // Find the model and frame. We need them later. m_xFrame.set(m_xDoc, uno::UNO_QUERY); @@ -143,14 +135,16 @@ bool WpftLoader::impl_load() } else { - ucbhelper::Content aContent(m_aURL, uno::Reference<ucb::XCommandEnvironment>(), m_xContext); + ucbhelper::Content aContent(m_aURL, uno::Reference<ucb::XCommandEnvironment>(), + m_xContext); aDescriptor[1].Name = "InputStream"; aDescriptor[1].Value <<= aContent.openStream(); aDescriptor[2].Name = "UCBContent"; aDescriptor[2].Value <<= aContent.get(); } - const uno::Reference<document::XExtendedFilterDetection> xDetector(m_xFilter, uno::UNO_QUERY_THROW); + const uno::Reference<document::XExtendedFilterDetection> xDetector(m_xFilter, + uno::UNO_QUERY_THROW); const rtl::OUString aTypeName(xDetector->detect(aDescriptor)); if (aTypeName.isEmpty()) @@ -164,7 +158,7 @@ bool WpftLoader::impl_load() xModel->unlockControllers(); return bLoaded; } - catch (const uno::Exception &) + catch (const uno::Exception&) { // ignore } @@ -184,7 +178,8 @@ void WpftLoader::impl_dispose() m_xFrame.clear(); } -void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName) +void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDescriptor, + const rtl::OUString& rTypeName) { const sal_Int32 nDescriptorLen = rDescriptor.getLength(); @@ -212,7 +207,6 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue> &rDes throw container::NoSuchElementException(); } - } } diff --git a/writerperfect/qa/unit/WpftLoader.hxx b/writerperfect/qa/unit/WpftLoader.hxx index 0283b6a6fcda..d76fb76ea52f 100644 --- a/writerperfect/qa/unit/WpftLoader.hxx +++ b/writerperfect/qa/unit/WpftLoader.hxx @@ -60,34 +60,30 @@ namespace writerperfect { namespace test { - class WPFTQAHELPER_DLLPUBLIC WpftLoader { public: - WpftLoader( - const rtl::OUString &rURL, - const css::uno::Reference<css::document::XFilter> &rxFilter, - const rtl::OUString &rFactoryURL, - const css::uno::Reference<css::frame::XDesktop2> &rxDesktop, - const css::uno::Reference<css::container::XNameAccess> &rxTypeMap, - const css::uno::Reference<css::uno::XComponentContext> &rxContext - ); - WpftLoader( - const css::uno::Reference<css::io::XInputStream> &rxInputStream, - const css::uno::Reference<css::document::XFilter> &rxFilter, - const rtl::OUString &rFactoryURL, - const css::uno::Reference<css::frame::XDesktop2> &rxDesktop, - const css::uno::Reference<css::uno::XComponentContext> &rxContext - ); + WpftLoader(const rtl::OUString& rURL, + const css::uno::Reference<css::document::XFilter>& rxFilter, + const rtl::OUString& rFactoryURL, + const css::uno::Reference<css::frame::XDesktop2>& rxDesktop, + const css::uno::Reference<css::container::XNameAccess>& rxTypeMap, + const css::uno::Reference<css::uno::XComponentContext>& rxContext); + WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream, + const css::uno::Reference<css::document::XFilter>& rxFilter, + const rtl::OUString& rFactoryURL, + const css::uno::Reference<css::frame::XDesktop2>& rxDesktop, + const css::uno::Reference<css::uno::XComponentContext>& rxContext); ~WpftLoader(); - const css::uno::Reference<css::lang::XComponent> &getDocument() const; + const css::uno::Reference<css::lang::XComponent>& getDocument() const; private: bool impl_load(); void impl_dispose(); - void impl_detectFilterName(css::uno::Sequence<css::beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName); + void impl_detectFilterName(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor, + const rtl::OUString& rTypeName); private: const rtl::OUString m_aURL; @@ -100,7 +96,6 @@ private: css::uno::Reference<css::lang::XComponent> m_xDoc; css::uno::Reference<css::frame::XFrame> m_xFrame; }; - } } diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx index 515a2b8a7e92..0ec335da6c00 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -11,7 +11,6 @@ namespace { - class WpftWriterFilterTest : public writerperfect::test::WpftFilterTestBase { public: @@ -31,43 +30,44 @@ WpftWriterFilterTest::WpftWriterFilterTest() void WpftWriterFilterTest::test() { - const writerperfect::test::WpftOptionalMap_t aEBookOptional - { - {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)}, + const writerperfect::test::WpftOptionalMap_t aEBookOptional{ + { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) }, }; - const writerperfect::test::WpftOptionalMap_t aEtonyekOptional - { - {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, + const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{ + { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) }, }; - const writerperfect::test::WpftOptionalMap_t aMWAWOptional - { - {"MaxWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8)}, - {"MouseWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8)}, - {"RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)}, - {"RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)}, - {"RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6)}, + const writerperfect::test::WpftOptionalMap_t aMWAWOptional{ + { "MaxWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) }, + { "MouseWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) }, + { "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, + { "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, + { "RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6) }, }; - const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional - { - {"Writer_3.1.sdw", REQUIRE_STAROFFICE_VERSION(0, 0, 2)}, + const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{ + { "Writer_3.1.sdw", REQUIRE_STAROFFICE_VERSION(0, 0, 2) }, }; - const writerperfect::test::WpftOptionalMap_t aWpsOptional - { - {"Word_5.0_DOS.doc", REQUIRE_WPS_VERSION(0, 4, 3)}, - {"Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2)}, + const writerperfect::test::WpftOptionalMap_t aWpsOptional{ + { "Word_5.0_DOS.doc", REQUIRE_WPS_VERSION(0, 4, 3) }, + { "Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2) }, }; - doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); - doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); - doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); - doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); - doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); - doTest("org.libreoffice.comp.Writer.StarOfficeWriterImportFilter", "/writerperfect/qa/unit/data/writer/libstaroffice/", aStarOfficeOptional); - doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/"); + doTest("com.sun.star.comp.Writer.AbiWordImportFilter", + "/writerperfect/qa/unit/data/writer/libabw/"); + doTest("org.libreoffice.comp.Writer.EBookImportFilter", + "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); + doTest("com.sun.star.comp.Writer.MSWorksImportFilter", + "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); + doTest("com.sun.star.comp.Writer.MWAWImportFilter", + "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); + doTest("org.libreoffice.comp.Writer.PagesImportFilter", + "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); + doTest("org.libreoffice.comp.Writer.StarOfficeWriterImportFilter", + "/writerperfect/qa/unit/data/writer/libstaroffice/", aStarOfficeOptional); + doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", + "/writerperfect/qa/unit/data/writer/libwpd/"); } CPPUNIT_TEST_SUITE_REGISTRATION(WpftWriterFilterTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerperfect/qa/unit/wpftimport.cxx b/writerperfect/qa/unit/wpftimport.cxx index 427cb2c294d6..fe3bfa02f9a6 100644 --- a/writerperfect/qa/unit/wpftimport.cxx +++ b/writerperfect/qa/unit/wpftimport.cxx @@ -19,7 +19,8 @@ css::uno::Reference<css::io::XInputStream> createDummyInput() { - rtl::Reference<comphelper::SequenceInputStream> xDummyInput(new comphelper::SequenceInputStream(css::uno::Sequence<sal_Int8>())); + rtl::Reference<comphelper::SequenceInputStream> xDummyInput( + new comphelper::SequenceInputStream(css::uno::Sequence<sal_Int8>())); return xDummyInput.get(); } |