[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/qa sw/source

[Attila Szűcs (via logerrit)]

 sw/qa/extras/layout/data/tdf135035.docx |binary
 sw/qa/extras/layout/data/tdf135035.odt  |binary
 sw/qa/extras/layout/layout.cxx          |    4 ++++
 sw/source/core/layout/fly.cxx           |   20 ++++++++++++++------
 4 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit bd3fc5be2c4ab9d559a4461841bca53665455673
Author:     Attila Szűcs <szucs.attila3 at nisz.hu>
AuthorDate: Mon Sep 14 14:16:27 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Wed Jan 6 13:12:22 2021 +0100

    tdf#135035 DOCX import: fix auto width of frame in column
    
    In compatibility mode FRAME_AUTOWIDTH_WITH_MORE_PARA
    no frames should be wider as the column it is anchored to,
    if the frame width is set to automatic.
    
    If there is a paragraph in the frame, that is longer then
    the parent width of frame, then the frame width will be set
    to the same size as its parents width.
    
    Co-authored-by: Tibor Nagy (NISZ)
    
    Change-Id: Ie5e7e94fd58219eb944ad9163b1ff2c1e7171858
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102671
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 25302321097afbde034196f1b6b00892fafbee1b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108862
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/sw/qa/extras/layout/data/tdf135035.docx b/sw/qa/extras/layout/data/tdf135035.docx
index f314f29d2b8b..acd7b1493899 100644
Binary files a/sw/qa/extras/layout/data/tdf135035.docx and b/sw/qa/extras/layout/data/tdf135035.docx differ
diff --git a/sw/qa/extras/layout/data/tdf135035.odt b/sw/qa/extras/layout/data/tdf135035.odt
index 479dab14c937..bf84ec4457ee 100644
Binary files a/sw/qa/extras/layout/data/tdf135035.odt and b/sw/qa/extras/layout/data/tdf135035.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index fd486657a7c0..31655426c98e 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -4362,17 +4362,21 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf135035)
     xmlDocUniquePtr pXmlDoc = parseLayoutDump();
     sal_Int32 nFly1Width = getXPath(pXmlDoc, "(//fly)[1]/infos/prtBounds", "width").toInt32();
     sal_Int32 nFly2Width = getXPath(pXmlDoc, "(//fly)[2]/infos/prtBounds", "width").toInt32();
+    sal_Int32 nFly3Width = getXPath(pXmlDoc, "(//fly)[3]/infos/prtBounds", "width").toInt32();
     sal_Int32 nParentWidth = getXPath(pXmlDoc, "(//txt)[1]/infos/prtBounds", "width").toInt32();
     CPPUNIT_ASSERT_EQUAL(nParentWidth, nFly2Width);
+    CPPUNIT_ASSERT_EQUAL(nParentWidth, nFly3Width);
     CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly1Width);
 
     createDoc("tdf135035.odt");
     pXmlDoc = parseLayoutDump();
     nFly1Width = getXPath(pXmlDoc, "(//fly)[1]/infos/prtBounds", "width").toInt32();
     nFly2Width = getXPath(pXmlDoc, "(//fly)[2]/infos/prtBounds", "width").toInt32();
+    nFly3Width = getXPath(pXmlDoc, "(//fly)[3]/infos/prtBounds", "width").toInt32();
     nParentWidth = getXPath(pXmlDoc, "(//txt)[1]/infos/prtBounds", "width").toInt32();
     CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly2Width);
     CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly1Width);
+    CPPUNIT_ASSERT_GREATER(nParentWidth, nFly3Width);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index d5366ca991b0..607027afc8fd 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2562,15 +2562,11 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrame& rFrame )
     // No autowidth defined for columned frames
     if ( !pFrame || pFrame->IsColumnFrame() )
         return nRet;
-    // tdf#124423 In Microsoft compatibility mode: widen the frame to max (PrintArea of the frame it anchored to) if it contains at least 2 paragraphs.
-    if (rFrame.GetFormat()->getIDocumentSettingAccess().get(DocumentSettingId::FRAME_AUTOWIDTH_WITH_MORE_PARA) && pFrame && pFrame->GetNext())
-    {
-        const SwFrame* pFrameRect = rFrame.IsFlyFrame() ? static_cast<const SwFlyFrame*>(&rFrame)->GetAnchorFrame() : pFrame->FindPageFrame();
-        return rFrame.IsVertical() ? pFrameRect->getFramePrintArea().Height() : pFrameRect->getFramePrintArea().Width();
-    }
 
+    int nParagraphCount = 0;
     while ( pFrame )
     {
+        nParagraphCount++;
         if ( pFrame->IsSctFrame() )
         {
             nMin = lcl_CalcAutoWidth( *static_cast<const SwSectionFrame*>(pFrame) );
@@ -2607,6 +2603,18 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrame& rFrame )
         pFrame = pFrame->GetNext();
     }
 
+    // tdf#124423 In Microsoft compatibility mode: widen the frame to max (PrintArea of the frame it anchored to) if it contains at least 2 paragraphs,
+    // or 1 paragraph wider then its parent area.
+    if (rFrame.GetFormat()->getIDocumentSettingAccess().get(DocumentSettingId::FRAME_AUTOWIDTH_WITH_MORE_PARA))
+    {
+        const SwFrame* pFrameRect = rFrame.IsFlyFrame() ? static_cast<const SwFlyFrame*>(&rFrame)->GetAnchorFrame() : rFrame.Lower()->FindPageFrame();
+        SwTwips nParentWidth = rFrame.IsVertical() ? pFrameRect->getFramePrintArea().Height() : pFrameRect->getFramePrintArea().Width();
+        if (nParagraphCount > 1 || nRet > nParentWidth)
+        {
+            return nParentWidth;
+        }
+    }
+
     return nRet;
 }