download.lst | 4 ++--
vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 37c2d66fbdfd5b2fe33082a1a5b6c84536caece7
Author: Khaled Hosny <kha...@aliftype.com>
AuthorDate: Sun Jul 31 23:42:41 2022 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 28 15:38:34 2025 +0100
more_fonts: Update Amiri
Update PDF export test that depends on a mapping the font no longer has,
and use different characters that meet the test criteria.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137661
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
(cherry picked from commit c010c1375bfec3aaa7d154c7164ae31df556cb68)
Conflicts:
download.lst
Backporting this to distro/cib/libreoffice-6-4 because it happens to fix a
build of that branch that would otherwise fail CppunitTest_vcl_pdfexport
with
>
/home/libo/src/core/vcl/qa/cppunit/pdfexport/pdfexport.cxx:1257:(anonymous
namespace)::PdfExportTest::testTdf66597_1
> assertion failed
> - Expression: nPos != std::string::npos
Change-Id: I0f89297a52ffcef3513e0a788ec3bab645cc354b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183453
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/download.lst b/download.lst
index e344748b66a5..4a7181e22d85 100644
--- a/download.lst
+++ b/download.lst
@@ -184,8 +184,8 @@ FONT_ALEF_TARBALL := alef-1.001.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-FONT_AMIRI_SHA256SUM :=
1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
-FONT_AMIRI_TARBALL := Amiri-0.111.zip
+FONT_AMIRI_SHA256SUM :=
9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7
+FONT_AMIRI_TARBALL := Amiri-0.117.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt
b/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt
index 7fecc55c6386..e5cc9bc0b3cc 100644
Binary files a/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt and
b/vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 5d6fa51d7778..4969fc1defd1 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -1244,13 +1244,13 @@ void PdfExportTest::testTdf66597_1()
aZCodec.Decompress(pStream->GetMemory(), aObjectStream);
CPPUNIT_ASSERT(aZCodec.EndCompression());
aObjectStream.Seek(0);
- // The <01> is glyph id, <0020> is code point.
- // The document has three characters <space><nbspace><space>, but the
font
- // reuses the same glyph for space and nbspace so we should have a
single
- // CMAP entry for the space, and nbspace will be handled with
ActualText
- // (tested above).
+ // The <01> is glyph id, <2044> is code point.
+ // The document has two characters <2044><2215><2044>, but the font
+ // reuses the same glyph for U+2044 and U+2215 so we should have a
single
+ // CMAP entry for the U+2044, and U+2215 will be handled with
ActualText
+ // (tested below).
std::string aCmap("1 beginbfchar
"
- "<01> <0020>
"
+ "<01> <2044>
"
"endbfchar");
std::string aData(static_cast<const char*>(aObjectStream.GetData()),
aObjectStream.GetSize());
auto nPos = aData.find(aCmap);
@@ -1288,7 +1288,7 @@ void PdfExportTest::testTdf66597_1()
}
CPPUNIT_ASSERT_EQUAL_MESSAGE("The should be one ActualText entry!",
static_cast<size_t>(1), nCount);
- aActualText = "/Span<</ActualText<FEFF00A0>>>";
+ aActualText = "/Span<</ActualText<FEFF2215>>>";
nPos = aData.find(aActualText);
CPPUNIT_ASSERT_MESSAGE("ActualText not found!", nPos !=
std::string::npos);
}
