[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/ftnfrm.hxx      |    2 ++
 sw/source/core/layout/paintfrm.cxx |   13 +++++++++++++
 sw/source/core/text/xmldump.cxx    |    3 ---
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit ad811b4441f6f9f8f42114640fea39cf0f3156a5
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Mar 31 07:04:21 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Mar 31 06:02:34 2023 +0000

    sw layout xml dump: extract SwFootnoteContFrame::dumpAsXml() from SwFrame
    
    Ideally SwFrame should not really know anything about footnote container
    frames.
    
    Change-Id: I2745cb74ff503288863439a15b37cec06766d208
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149814
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index a6835c9a71ba..56061d97c21f 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -64,6 +64,8 @@ public:
         const SwBorderAttrs&) const override;
     virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) 
const override;
             void    PaintLine( const SwRect &, const SwPageFrame * ) const;
+
+    void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
 };
 
 inline SwFootnoteFrame* SwFootnoteContFrame::AppendChained(SwFrame* pThis, 
bool bDefaultFormat)
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 37a53417f1c8..66612ba3b840 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5503,6 +5503,19 @@ void SwFootnoteContFrame::PaintLine( const SwRect& rRect,
                 rInf.GetLineStyle() );
 }
 
+void SwFootnoteContFrame::dumpAsXml(xmlTextWriterPtr writer) const
+{
+    (void)xmlTextWriterStartElement(writer, reinterpret_cast<const 
xmlChar*>("ftncont"));
+    dumpAsXmlAttributes(writer);
+
+    (void)xmlTextWriterStartElement(writer, BAD_CAST("infos"));
+    dumpInfosAsXml(writer);
+    (void)xmlTextWriterEndElement(writer);
+    dumpChildrenAsXml(writer);
+
+    (void)xmlTextWriterEndElement(writer);
+}
+
 /// Paints the separator line for inside columns
 void SwLayoutFrame::PaintColLines( const SwRect &rRect, const SwFormatCol 
&rFormatCol,
                                  const SwPageFrame *pPage ) const
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 5544943f3dd0..8344ddbea178 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -174,9 +174,6 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const
 
     switch ( GetType(  ) )
     {
-    case SwFrameType::FtnCont:
-        name = "ftncont";
-        break;
     case SwFrameType::Ftn:
         name = "ftn";
         break;