diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-09-29 18:56:16 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-09-29 18:56:16 +0000 |
| commit | eb6c30bd65bb005698f2f65cd5ca76283b03334c (patch) | |
| tree | 874a5aeef6433dc3759261a25a247edefc6c9093 /user/libreoffice/disable-outdated-font-test.patch | |
| parent | 99f31680a05d6e4fa4f1e987ca2880929128d6ee (diff) | |
| parent | 87c304e5193d6b6616187da747cf922b6c830996 (diff) | |
| download | packages-eb6c30bd65bb005698f2f65cd5ca76283b03334c.tar.gz packages-eb6c30bd65bb005698f2f65cd5ca76283b03334c.tar.bz2 packages-eb6c30bd65bb005698f2f65cd5ca76283b03334c.tar.xz packages-eb6c30bd65bb005698f2f65cd5ca76283b03334c.zip | |
Merge branch 'libreoffice-gen' into 'master'
Replace libreoffice-gtk3 with libreoffice-gtk2 and downgrade relevant dependencies
See merge request !77
Diffstat (limited to 'user/libreoffice/disable-outdated-font-test.patch')
| -rw-r--r-- | user/libreoffice/disable-outdated-font-test.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/user/libreoffice/disable-outdated-font-test.patch b/user/libreoffice/disable-outdated-font-test.patch new file mode 100644 index 000000000..2278fb587 --- /dev/null +++ b/user/libreoffice/disable-outdated-font-test.patch @@ -0,0 +1,22 @@ +https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg217102.html + +--- libreoffice-6.0.6.2/editeng/qa/unit/core-test.cxx 2018-07-27 13:15:59.000000000 +0000 ++++ libreoffice-6.0.6.2/editeng/qa/unit/core-test.cxx 2018-09-27 03:45:48.400130363 +0000 +@@ -195,8 +195,6 @@ void Test::testLineSpacing() + + // Check the first line + ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL((sal_uInt16)122, aInfo.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL((sal_uInt16)153, (sal_uInt16)aEditEngine.GetLineHeight(0)); + + // Prepare second case - 150% + std::unique_ptr<SfxItemSet> pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet())); +@@ -218,8 +216,6 @@ void Test::testLineSpacing() + + // Check the first line + ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL(sal_uInt16(337), aInfo2.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL(sal_uInt16(382), static_cast<sal_uInt16>(aEditEngine.GetLineHeight(0))); + } + + void Test::testConstruction() |