| commit | e38ab299c109766a5a431e5c0fb6b2c59ae3025c | [log] |
|---|---|---|
| author | Attila Bakos (NISZ) <bakos.attilakaroly@nisz.hu> | Thu Feb 24 09:51:15 2022 +0100 |
| committer | László Németh <nemeth@numbertext.org> | Mon Feb 28 10:00:50 2022 +0100 |
| tree | e97578f851f7502ac1cbd26b8b124f5450ff4c72 | |
| parent | 5ad7e886ceb7e79fb73ca00bfce14d7f2d6e3b2c [diff] |
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
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
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index fa79c71..336cca8 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -1328,5 +1328,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: */
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index cb9618c..668288d 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx
@@ -1342,7 +1342,8 @@ void SwDrawContact::Changed_( const SdrObject& rObj, // tdf#135198: keep text box together with its shape const SwPageFrame* rPageFrame = pAnchoredDrawObj->GetPageFrame(); if (rPageFrame && rPageFrame->isFrameAreaPositionValid() && !rObj.getChildrenOfSdrObject()) if (rPageFrame && rPageFrame->isFrameAreaPositionValid() && GetFormat() && GetFormat()->GetOtherTextBoxFormat()) { SwDoc* const pDoc = GetFormat()->GetDoc();