summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-06-15 11:08:48 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-08-24 11:21:08 +0200
commit871c9e19ef5c2286e1de9321c736541d3f93ceac (patch)
tree1b72cf29fee80789ac3fa54954f2e9ad0c92bc93
parentf8f9c0f50c99ec554584014a10e30b69d50b0fc8 (diff)
Related: tdf#108524 sw: dump follow/precede of cell frames in layout xml dump
These point to the other cell frame on the previous/next page (in case the cell frame is split across multiple pages). Change-Id: Ic03cf9a194a49320d84dbdb5176fa737e5d6520d Reviewed-on: https://gerrit.libreoffice.org/38818 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 835c1586f60e6bc03e045e8210e38876e0fe1abc)
-rw-r--r--sw/source/core/inc/cellfrm.hxx1
-rw-r--r--sw/source/core/layout/tabfrm.cxx10
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 8ddc89ffd404..ba2ae774519d 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -60,6 +60,7 @@ public:
const SwCellFrame& FindStartEndOfRowSpanCell( bool bStart ) const;
long GetLayoutRowSpan() const;
+ void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override;
DECL_FIXEDMEMPOOL_NEWDEL(SwCellFrame)
};
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 138fa1a2ff95..2230a4920e14 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -5028,6 +5028,16 @@ long SwCellFrame::GetLayoutRowSpan() const
return nRet;
}
+void SwCellFrame::dumpAsXmlAttributes(xmlTextWriterPtr pWriter) const
+{
+ SwFrame::dumpAsXmlAttributes(pWriter);
+ if (SwCellFrame* pFollow = GetFollowCell())
+ xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("follow"), "%" SAL_PRIuUINT32, pFollow->GetFrameId());
+
+ if (SwCellFrame* pPrevious = GetPreviousCell())
+ xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("precede"), "%" SAL_PRIuUINT32, pPrevious->GetFrameId());
+}
+
// #i103961#
void SwCellFrame::Cut()
{