diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
| commit | 88d39bd86ba879437ef28ea2c936dc13617b8774 (patch) | |
| tree | e082629558e2f17be1d8d8e5489c0dab3c449e7a /user/libreoffice/disable-outdated-font-test.patch | |
| parent | 6e61738144a4ddd8743afe561c789ccbc6634467 (diff) | |
| parent | e5e7f2a7e60e60c88d9f53b16b6bda81a2e4b6f9 (diff) | |
| download | packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.gz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.bz2 packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.xz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.zip | |
Merge branch 'libreoffice-6.2' into 'master'
Upgrade LibreOffice to 6.2 and upgrade some of its dependencies
See merge request !197
Diffstat (limited to 'user/libreoffice/disable-outdated-font-test.patch')
| -rw-r--r-- | user/libreoffice/disable-outdated-font-test.patch | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/user/libreoffice/disable-outdated-font-test.patch b/user/libreoffice/disable-outdated-font-test.patch index 2278fb587..02470d69a 100644 --- a/user/libreoffice/disable-outdated-font-test.patch +++ b/user/libreoffice/disable-outdated-font-test.patch @@ -1,22 +1,16 @@ 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() +--- libreoffice-6.2.1.2/editeng/qa/unit/core-test.cxx 2019-02-26 10:41:25.000000000 -0500 ++++ libreoffice-6.2.1.2/editeng/qa/unit/core-test.cxx 2019-03-11 04:28:15.930763760 -0400 +@@ -198,11 +198,6 @@ void Test::testLineSpacing() + const SvxLineSpacingItem& rLSItem = pNode->GetContentAttribs().GetItem(EE_PARA_SBL); + CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem.GetInterLineSpaceRule()); + CPPUNIT_ASSERT_EQUAL(nSpace, rLSItem.GetPropLineSpace()); +- +- // Check the first line +- ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL(nExpMaxAscent, aInfo.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL(nExpLineHeight, aEditEngine.GetLineHeight(0)); + }; - // 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() + // Test first case - 60% |