commit 9e44075af76822106f738855bf36f0428088336d
author Attila Szűcs <szucs.attila3@nisz.hu> Fri Jul 24 09:10:41 2020 +0200
committer László Németh <nemeth@numbertext.org> Fri Aug 07 09:52:28 2020 +0200
tree 3a1855d6b94f6370f77b2dbcda904d80f1bd2a1c
parent e67ffd5a62c8c27697da594a0fea2362317f221f

tdf#135035 DOCX import: fix auto frame width in columns

in compatibility mode FRAME_AUTOWIDTH_WITH_MORE_PARA:
use paragraph width instead of page print area width
for frames with multiple paragraphs anchored to columns.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I73c9eff960e72ebffddfa778798918ff79a4b417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99346
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>

sw/qa/extras/layout/data/tdf135035.docx

diff --git a/sw/qa/extras/layout/data/tdf135035.docx b/sw/qa/extras/layout/data/tdf135035.docx
new file mode 100644
index 0000000..f314f29
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf135035.docx
Binary files differ

sw/qa/extras/layout/data/tdf135035.odt

diff --git a/sw/qa/extras/layout/data/tdf135035.odt b/sw/qa/extras/layout/data/tdf135035.odt
new file mode 100644
index 0000000..479dab1
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf135035.odt
Binary files differ

sw/qa/extras/layout/layout.cxx

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 88f0d38..d4ba6db 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -4330,6 +4330,25 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124423)
    CPPUNIT_ASSERT_LESS(nPageWidth / 2, nFly1Width);
}

CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf135035)
{
    createDoc("tdf135035.docx");
    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 nParentWidth = getXPath(pXmlDoc, "(//txt)[1]/infos/prtBounds", "width").toInt32();
    CPPUNIT_ASSERT_EQUAL(nParentWidth, nFly2Width);
    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();
    nParentWidth = getXPath(pXmlDoc, "(//txt)[1]/infos/prtBounds", "width").toInt32();
    CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly2Width);
    CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly1Width);
}

CPPUNIT_PLUGIN_IMPLEMENT();

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/core/layout/fly.cxx

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 149a42bd..3757529 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2517,11 +2517,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 (PagePrintArea) if it contains at least 2 paragraphs.
    // 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 SwPageFrame* pPage = pFrame->FindPageFrame();
        return pFrame->GetUpper()->IsVertical() ? pPage->getFramePrintArea().Height() : pPage->getFramePrintArea().Width();
        const SwFrame* pFrameRect = rFrame.IsFlyFrame() ? static_cast<const SwFlyFrame*>(&rFrame)->GetAnchorFrame() : pFrame->FindPageFrame();
        return rFrame.IsVertical() ? pFrameRect->getFramePrintArea().Height() : pFrameRect->getFramePrintArea().Width();
    }

    while ( pFrame )