vcl/qa/cppunit/pdfexport/pdfexport.cxx | 46 --------------------------------- 1 file changed, 46 deletions(-)
New commits: commit 905117465025820762be08db9ce7224b90a15de4 Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Wed Mar 3 08:22:30 2021 +0100 Commit: Gabor Kelemen <kelemen.gab...@nisz.hu> CommitDate: Wed Mar 3 08:24:12 2021 +0100 Revert failing unit test backported in 2a4dc079 Change-Id: I334ac2128a62957ee0e2a5063e3b91948d5fe661 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111866 Tested-by: Gabor Kelemen <kelemen.gab...@nisz.hu> Reviewed-by: Gabor Kelemen <kelemen.gab...@nisz.hu> diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 33683ee75a7a..fe402b4ed8b8 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -151,7 +151,6 @@ public: void testVersion15(); void testDefaultVersion(); void testMultiPagePDF(); - void testFormFontName(); CPPUNIT_TEST_SUITE(PdfExportTest); @@ -197,7 +196,6 @@ public: CPPUNIT_TEST(testVersion15); CPPUNIT_TEST(testDefaultVersion); CPPUNIT_TEST(testMultiPagePDF); - CPPUNIT_TEST(testFormFontName); CPPUNIT_TEST_SUITE_END(); }; @@ -2288,50 +2286,6 @@ void PdfExportTest::testMultiPagePDF() #endif } -void PdfExportTest::testFormFontName() -{ - // Import the bugdoc and export as PDF. - OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "form-font-name.odt"; - mxComponent = loadFromDesktop(aURL); - - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); - - // Parse the export result with pdfium. - SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ); - SvMemoryStream aMemory; - aMemory.WriteStream(aFile); - ScopedFPDFDocument pPdfDocument( - FPDF_LoadMemDocument(aMemory.GetData(), aMemory.GetSize(), /*password=*/nullptr)); - CPPUNIT_ASSERT(pPdfDocument); - - // The document has one page. - CPPUNIT_ASSERT_EQUAL(1, FPDF_GetPageCount(pPdfDocument.get())); - ScopedFPDFPage pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/0)); - CPPUNIT_ASSERT(pPdfPage); - - // The page has one annotation. - CPPUNIT_ASSERT_EQUAL(1, FPDFPage_GetAnnotCount(pPdfPage.get())); - ScopedFPDFAnnotation pAnnot(FPDFPage_GetAnnot(pPdfPage.get(), 0)); - - // Examine the default appearance. - CPPUNIT_ASSERT(FPDFAnnot_HasKey(pAnnot.get(), "DA")); - CPPUNIT_ASSERT_EQUAL(FPDF_OBJECT_STRING, FPDFAnnot_GetValueType(pAnnot.get(), "DA")); - size_t nDALength = FPDFAnnot_GetStringValue(pAnnot.get(), "DA", nullptr, 0); - std::vector<FPDF_WCHAR> aDABuf(nDALength); - FPDFAnnot_GetStringValue(pAnnot.get(), "DA", aDABuf.data(), nDALength); - OUString aDA(reinterpret_cast<sal_Unicode*>(aDABuf.data())); - - // Without the accompanying fix in place, this test would have failed with: - // - Expected: 0 0 0 rg /TiRo 12 Tf - // - Actual : 0 0 0 rg /F2 12 Tf - // i.e. Liberation Serif was exposed as a form font as-is, without picking the closest built-in - // font. - CPPUNIT_ASSERT_EQUAL(OUString("0 0 0 rg /TiRo 12 Tf"), aDA); -} - CPPUNIT_TEST_SUITE_REGISTRATION(PdfExportTest); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits