diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2025-02-13 13:45:38 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2025-02-13 15:53:53 +0100 |
| commit | 6007fbef5c2e4a0b80a4c0031ff36117aa41e63f (patch) | |
| tree | 3fc6949f6301d37f49fb79e2d8233487c3ba8cb7 /vcl/qa | |
| parent | 8acd6b515e087ce60d3ddefec162a208951fe082 (diff) | |
Update pdfium to 7012
Windows has to switch to clang-cl, see
<https://groups.google.com/g/pdfium/c/d7KZi_wePHs/m/7eZyhYhVDAAJ> "Does
anyone still use MSVC?", similar to what skia does already.
This also allows reverting the CppunitTest_vcl_pdfexport and
CppunitTest_vcl_pdfexport2 test tweaks from commit
59c5a7d5c7502770896491a59c73de3c627afcc5 (Update pdfium to 6764,
2024-10-14).
Change-Id: I14052c74c551c4412a13a77eac6284455365d888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181544
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 4 | ||||
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index c49c01aa7133..b40f60724fd5 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1414,7 +1414,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf154549) int nChars = pPdfTextPage->countChars(); - CPPUNIT_ASSERT_EQUAL(1, nChars); + CPPUNIT_ASSERT_EQUAL(3, nChars); std::vector<sal_uInt32> aChars(nChars); for (int i = 0; i < nChars; i++) @@ -1424,7 +1424,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf154549) // Without the fix in place, this test would have failed with // - Expected: ִبي // - Actual : بִي - CPPUNIT_ASSERT_EQUAL(u"\u064a"_ustr, aActualText); + CPPUNIT_ASSERT_EQUAL(u"\u05B4\u0628\u064A"_ustr, aActualText); #endif } diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index f49fd712356b..05e3342fde1a 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx @@ -5198,17 +5198,17 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf71956) CPPUNIT_ASSERT_EQUAL(12, nTextObjectCount); CPPUNIT_ASSERT_EQUAL(u"ه"_ustr, aText[0].trim()); - CPPUNIT_ASSERT_EQUAL(u"\u0670\u0020\u0644\u0644"_ustr, aText[1].trim()); + CPPUNIT_ASSERT_EQUAL(u"\u064e\u0651\u0670ل"_ustr, aText[1].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[2].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[3].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[4].trim()); CPPUNIT_ASSERT_EQUAL(u"ل"_ustr, aText[5].trim()); - CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[6].trim()); - CPPUNIT_ASSERT_EQUAL(u"\u0647"_ustr, aText[7].trim()); + CPPUNIT_ASSERT_EQUAL(u"ل"_ustr, aText[6].trim()); + CPPUNIT_ASSERT_EQUAL(u"\u064e\u0651\u0670ل"_ustr, aText[7].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[8].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[9].trim()); CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[10].trim()); - CPPUNIT_ASSERT_EQUAL(u""_ustr, aText[11].trim()); + CPPUNIT_ASSERT_EQUAL(u"ه"_ustr, aText[11].trim()); // Verify that the corresponding text segments are positioned roughly equally auto fnEqualPos |