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

[Miklos Vajna (via logerrit)]

 sw/source/core/layout/flycnt.cxx |   18 ++++++++++++++++++
 sw/source/core/text/xmldump.cxx  |   18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit f81554ef7855d76fbb1708b127c66e29c5d125bd
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Aug 31 20:06:00 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Sep 1 08:09:01 2023 +0200

    sw layout xml dump: move at-content fly dumper to flycnt
    
    That's where the rest of the SwFlyAtContentFrame member functions are
    defined.
    
    Change-Id: I0215a21c6f3bf41a1e5998b2c5a91864c70f2f93
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156355
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 113eaafbce9d..5eabc5ccaef2 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1732,6 +1732,24 @@ void SwFlyAtContentFrame::DelEmpty()
     }
 }
 
+void SwFlyAtContentFrame::dumpAsXmlAttributes(xmlTextWriterPtr pWriter) const
+{
+    SwFlyFreeFrame::dumpAsXmlAttributes(pWriter);
+
+    if (m_pFollow != nullptr)
+    {
+        (void)xmlTextWriterWriteAttribute(
+            pWriter, BAD_CAST("follow"),
+            
BAD_CAST(OString::number(m_pFollow->GetFrame().GetFrameId()).getStr()));
+    }
+    if (m_pPrecede != nullptr)
+    {
+        (void)xmlTextWriterWriteAttribute(
+            pWriter, BAD_CAST("precede"),
+            
BAD_CAST(OString::number(m_pPrecede->GetFrame().GetFrameId()).getStr()));
+    }
+}
+
 void SwRootFrame::InsertEmptyFly(SwFlyFrame* pDel)
 {
     if (!mpFlyDestroy)
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 48c893bf403c..e3b333b602a0 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -294,22 +294,4 @@ void SwFont::dumpAsXml(xmlTextWriterPtr writer) const
     (void)xmlTextWriterEndElement(writer);
 }
 
-void SwFlyAtContentFrame::dumpAsXmlAttributes(xmlTextWriterPtr pWriter) const
-{
-    SwFlyFreeFrame::dumpAsXmlAttributes(pWriter);
-
-    if (m_pFollow != nullptr)
-    {
-        (void)xmlTextWriterWriteAttribute(
-            pWriter, BAD_CAST("follow"),
-            
BAD_CAST(OString::number(m_pFollow->GetFrame().GetFrameId()).getStr()));
-    }
-    if (m_pPrecede != nullptr)
-    {
-        (void)xmlTextWriterWriteAttribute(
-            pWriter, BAD_CAST("precede"),
-            
BAD_CAST(OString::number(m_pPrecede->GetFrame().GetFrameId()).getStr()));
-    }
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */