commit d691e9ef4d77cf5e46aec288d5efcf9291534352
author Attila Bakos (NISZ) <bakos.attilakaroly@nisz.hu> Thu Feb 24 09:51:15 2022 +0100
committer László Németh <nemeth@numbertext.org> Thu Mar 10 13:34:41 2022 +0100
tree c55d0f4fc3778c6559249331be2cd67b0bdc99bc
parent bae5503ac47ac2faa4c4365f86a00543e43a149a

tdf#146597 sw: fix freezing with GroupShape

in case it is anchored to character and wrap is none.

Regression from 8da3586cff9cc11cf5db985d19851f21f0d42eb8
"tdf#141220 sw: fix textbox popped out of off-page shape".

Note: This is a backport-compatible fix made also for the
7.3 backport. There will be a less urgent 7.4-only fix
for its unresolved group case soon.

Change-Id: I421c85e2dd16ad2649bc299fc4733d462be8d7b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130478
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit e835c2c0d3aff4f1ee5d29c9eaf36400b1aca6a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130456
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130715
Reviewed-by: Attila Bakos <bakos.attilakaroly@nisz.hu>

sw/qa/extras/odfimport/data/tdf146597.odt

diff --git a/sw/qa/extras/odfimport/data/tdf146597.odt b/sw/qa/extras/odfimport/data/tdf146597.odt
new file mode 100644
index 0000000..6dcc379
--- /dev/null
+++ b/sw/qa/extras/odfimport/data/tdf146597.odt
Binary files differ

sw/qa/extras/odfimport/odfimport.cxx

diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index bd93693..c1ec472 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -1322,5 +1322,11 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146257)
    }
}

CPPUNIT_TEST_FIXTURE(Test, testTdf146597)
{
    load(mpTestDocumentPath, "tdf146597.odt");
    // This was creashed before.
}

CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/core/draw/dcontact.cxx

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ad37707..e4d2450 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1338,7 +1338,10 @@ void SwDrawContact::Changed_( const SdrObject& rObj,

            // tdf#135198: keep text box together with its shape
            const SwPageFrame* rPageFrame = pAnchoredDrawObj->GetPageFrame();
            if (rPageFrame && rPageFrame->isFrameAreaPositionValid())
            auto pFormat = GetFormat();
            if (rPageFrame && rPageFrame->isFrameAreaPositionValid() && pFormat
                && (SwTextBoxHelper::isTextBox(pFormat, RES_FLYFRMFMT) ||
                    SwTextBoxHelper::isTextBox(pFormat, RES_DRAWFRMFMT)))
            {
                SwDoc* const pDoc = GetFormat()->GetDoc();