sc/source/core/data/colorscale.cxx | 4 ++--
sw/qa/extras/layout/data/tdf134277.docx |binary
sw/qa/extras/layout/layout.cxx | 18 ++++++++++++++++++
sw/source/core/layout/tabfrm.cxx | 12 ++++++++----
4 files changed, 28 insertions(+), 6 deletions(-)
New commits:
commit 7842038e2ddbc9c1596fb732f5fb555b1c2ffdf0
Author: Bakos Attila <bakos.attilakar...@nisz.hu>
AuthorDate: Fri Jun 26 13:05:22 2020 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Jul 2 21:35:00 2020 +0200
tdf#134277 sw table: fix lagging shape at page break
Shapes anchored to characters in table cells didn't follow
their cells at page break, resulting lonely shapes at the end
of the previous page.
Co-authored-by: Attila Bánhegyi (NISZ)
Change-Id: I2149ef58696a8f5dc6f41959060d2d57f938d025
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97209
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
(cherry picked from commit 117011cf10032e6ca93a8d502f794deb16c13a8f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97674
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/qa/extras/layout/data/tdf134277.docx
b/sw/qa/extras/layout/data/tdf134277.docx
new file mode 100644
index 000000000000..cf4ecfbb1caa
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134277.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4f9ed8ec7f6f..a1eae5558356 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1114,6 +1114,24 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInFootnote)
}
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134277)
+{
+ SwDoc* pDoc = createDoc("tdf134277.docx");
+ CPPUNIT_ASSERT(pDoc);
+ SwDocShell* pShell = pDoc->GetDocShell();
+
+ std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+ MetafileXmlDump dumper;
+
+ xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc,
"/metafile/push/push/push/layoutmode[2]");
+ xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Bad position of shape in page break!", 0,
+ xmlXPathNodeSetGetLength(pXmlNodes));
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFlys)
{
loadURL("private:factory/swriter", nullptr);
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index f4aed1ed650d..02bcb593e323 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1066,7 +1066,6 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool
bTryToSplit, bool bTableRowK
else
bSplitRowAllowed = false;
}
-
// #i29438#
// #i26945# - Floating screen objects no longer forbid
// a splitting of the table row.
@@ -3890,11 +3889,16 @@ long CalcHeightWithFlys( const SwFrame *pFrame )
// the text flow have to be considered.
const SwFrameFormat& rFrameFormat =
pAnchoredObj->GetFrameFormat();
bool bFollowTextFlow =
rFrameFormat.GetFollowTextFlow().GetValue();
+ bool bIsFarAway = pAnchoredObj->GetObjRect().Top() !=
FAR_AWAY;
+ const SwPageFrame* pPageFrm = pTmp->FindPageFrame();
+ bool bIsAnchoredToTmpFrm = false;
+ if ( pPageFrm && pPageFrm->IsPageFrame() &&
pAnchoredObj->GetPageFrame())
+ bIsAnchoredToTmpFrm = pAnchoredObj->GetPageFrame() ==
pPageFrm ||
+ (pPageFrm->GetFormatPage().GetPhyPageNum() ==
pAnchoredObj->GetPageFrame()->GetFormatPage().GetPhyPageNum() + 1);
const bool bConsiderObj =
(rFrameFormat.GetAnchor().GetAnchorId() !=
RndStdIds::FLY_AS_CHAR) &&
- pAnchoredObj->GetObjRect().Top() != FAR_AWAY &&
- bFollowTextFlow &&
- pAnchoredObj->GetPageFrame() ==
pTmp->FindPageFrame();
+ bIsFarAway &&
+ bFollowTextFlow && bIsAnchoredToTmpFrm;
bool bWrapThrough = rFrameFormat.GetSurround().GetValue()
== text::WrapTextMode_THROUGH;
if (pFrame->IsInTab() && bFollowTextFlow && bWrapThrough)
{
commit 23d0bc0b948ecd22860abf247e57ac6dda82b8a1
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Jul 1 16:47:07 2020 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Jul 2 21:34:40 2020 +0200
tdf#126733: inverted emoticons sets for the conditional formatting
Change-Id: I5bd631b17c1008355c299ffceb622e6ea8c39d45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97636
(cherry picked from commit a76cb42a75b1694f20a1c95c99e3137369527dd3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97677
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 693da4ae62f2..9d157eeb1a5a 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1249,11 +1249,11 @@ const OUStringLiteral a3Flags[] = {
};
const OUStringLiteral a3Smilies[] = {
- BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+ BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
};
const OUStringLiteral a3ColorSmilies[] = {
- BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_NEGATIVE_RED_SMILIE
+ BMP_ICON_SET_NEGATIVE_RED_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE,
BMP_ICON_SET_POSITIVE_GREEN_SMILIE
};
const OUStringLiteral a3Stars[] = {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
