sw/qa/extras/layout/data/tdf136588.docx |binary sw/qa/extras/layout/layout.cxx | 11 +++++++++++ sw/source/core/txtnode/fntcache.cxx | 7 +++++++ 3 files changed, 18 insertions(+)
New commits: commit fc42561952ea624dac25ec5e6fcf2a9997a4624e Author: Attila Bakos <[email protected]> AuthorDate: Tue Sep 22 16:37:22 2020 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Wed Jan 6 17:11:35 2021 +0100 tdf#136588 sw: fix line break regression with small caps Regression from commit 1b03a449161af225302e4b4dd2bb2e69c6d8d170 (tdf#112290 sw: fix missing line break in small capital). This replaces the previous commit with a better solution. Change-Id: I7510b78cd6520f260e6a3804ec69e0364b93440f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103178 Tested-by: László Németh <[email protected]> Reviewed-by: László Németh <[email protected]> (cherry picked from commit 0d28097fadf44ed58cb5e3e9b9c04a65a7a33fd6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108894 Tested-by: Gabor Kelemen <[email protected]> Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/sw/qa/extras/layout/data/tdf136588.docx b/sw/qa/extras/layout/data/tdf136588.docx new file mode 100644 index 000000000000..606931286470 Binary files /dev/null and b/sw/qa/extras/layout/data/tdf136588.docx differ diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 52b85318e9de..880891f4b089 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -187,6 +187,17 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFootnotes) CheckRedlineFootnotesHidden(); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf136588) +{ + load(DATA_DIRECTORY, "tdf136588.docx"); + auto pXMLLayoutDump = parseLayoutDump(); + CPPUNIT_ASSERT(pXMLLayoutDump); + + //there was a bad line break before, the correct break layout is this: + assertXPath(pXMLLayoutDump, "/root/page/body/txt[2]/LineBreak[2]", "Line", + "effectively by modern-day small to "); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody) { loadURL("private:factory/swriter", nullptr); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index decea02c4864..92717cd31966 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2536,6 +2536,13 @@ TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo const & rInf, long nTextWidth ? TextFrameIndex(COMPLETE_STRING) : nTextBreak; + // tdf112290 tdf136588 Break the line correctly only if there is an image inline, + // and the image wider than the line... + if (GetCaseMap() == SvxCaseMap::SmallCaps && TextFrameIndex(COMPLETE_STRING) == nTextBreak2 && + ! bCompress && nTextWidth == 0) + // If nTextWidth == 0 means the line is full, we have to break it + nTextBreak2 = TextFrameIndex(1); + if ( ! bCompress ) return nTextBreak2; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
