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

[Miklos Vajna]

 sw/source/core/docnode/nodedump.cxx |   68 ++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 22 deletions(-)

New commits:
commit 59eac78fdc1e6579f104601734bdccc0e056d266
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Oct 29 12:28:40 2014 +0100

    sw doc model xml dump: show bookmarks
    
    Change-Id: Ib41c48b328835da533cba4b67dc34ce3ddfc1f9a

diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index b195aa9..1e05423 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -213,35 +213,59 @@ void MarkManager::dumpAsXml( xmlTextWriterPtr w ) const
 {
     WriterHelper writer(w);
     writer.startElement("markManager");
-    writer.startElement("fieldmarks");
-    for (const_iterator_t it = m_vFieldmarks.begin(); it != m_vFieldmarks.end(); ++it)
+    if (!m_vBookmarks.empty())
     {
-        pMark_t pMark = *it;
-        writer.startElement("fieldmark");
-        writer.writeFormatAttribute("startNode", TMP_FORMAT, pMark->GetMarkStart().nNode.GetIndex());
-        writer.writeFormatAttribute("startOffset", TMP_FORMAT_I32, pMark->GetMarkStart().nContent.GetIndex());
-        writer.writeFormatAttribute("endNode", TMP_FORMAT, pMark->GetMarkEnd().nNode.GetIndex());
-        writer.writeFormatAttribute("endOffset", TMP_FORMAT_I32, pMark->GetMarkEnd().nContent.GetIndex());
-        OString txt8 = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
-        writer.writeFormatAttribute("name", "%s", BAD_CAST( txt8.getStr()));
+        writer.startElement("bookmarks");
+        for (const_iterator_t it = m_vBookmarks.begin(); it != m_vBookmarks.end(); ++it)
+        {
+            pMark_t pMark = *it;
+            writer.startElement("bookmark");
+            writer.writeFormatAttribute("startNode", TMP_FORMAT, pMark->GetMarkStart().nNode.GetIndex());
+            writer.writeFormatAttribute("startOffset", TMP_FORMAT_I32, pMark->GetMarkStart().nContent.GetIndex());
+            writer.writeFormatAttribute("endNode", TMP_FORMAT, pMark->GetMarkEnd().nNode.GetIndex());
+            writer.writeFormatAttribute("endOffset", TMP_FORMAT_I32, pMark->GetMarkEnd().nContent.GetIndex());
+            OString txt8 = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
+            writer.writeFormatAttribute("name", "%s", BAD_CAST( txt8.getStr()));
+            writer.endElement();
+        }
         writer.endElement();
     }
-    writer.endElement();
 
-    writer.startElement("annotationmarks");
-    for (const_iterator_t it = m_vAnnotationMarks.begin(); it != m_vAnnotationMarks.end(); ++it)
+    if (!m_vFieldmarks.empty())
     {
-        pMark_t pMark = *it;
-        writer.startElement("annotationmark");
-        writer.writeFormatAttribute("startNode", TMP_FORMAT, pMark->GetMarkStart().nNode.GetIndex());
-        writer.writeFormatAttribute("startOffset", TMP_FORMAT_I32, pMark->GetMarkStart().nContent.GetIndex());
-        writer.writeFormatAttribute("endNode", TMP_FORMAT, pMark->GetMarkEnd().nNode.GetIndex());
-        writer.writeFormatAttribute("endOffset", TMP_FORMAT_I32, pMark->GetMarkEnd().nContent.GetIndex());
-        OString txt8 = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
-        writer.writeFormatAttribute("name", "%s", BAD_CAST( txt8.getStr()));
+        writer.startElement("fieldmarks");
+        for (const_iterator_t it = m_vFieldmarks.begin(); it != m_vFieldmarks.end(); ++it)
+        {
+            pMark_t pMark = *it;
+            writer.startElement("fieldmark");
+            writer.writeFormatAttribute("startNode", TMP_FORMAT, pMark->GetMarkStart().nNode.GetIndex());
+            writer.writeFormatAttribute("startOffset", TMP_FORMAT_I32, pMark->GetMarkStart().nContent.GetIndex());
+            writer.writeFormatAttribute("endNode", TMP_FORMAT, pMark->GetMarkEnd().nNode.GetIndex());
+            writer.writeFormatAttribute("endOffset", TMP_FORMAT_I32, pMark->GetMarkEnd().nContent.GetIndex());
+            OString txt8 = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
+            writer.writeFormatAttribute("name", "%s", BAD_CAST( txt8.getStr()));
+            writer.endElement();
+        }
+        writer.endElement();
+    }
+
+    if (!m_vAnnotationMarks.empty())
+    {
+        writer.startElement("annotationmarks");
+        for (const_iterator_t it = m_vAnnotationMarks.begin(); it != m_vAnnotationMarks.end(); ++it)
+        {
+            pMark_t pMark = *it;
+            writer.startElement("annotationmark");
+            writer.writeFormatAttribute("startNode", TMP_FORMAT, pMark->GetMarkStart().nNode.GetIndex());
+            writer.writeFormatAttribute("startOffset", TMP_FORMAT_I32, pMark->GetMarkStart().nContent.GetIndex());
+            writer.writeFormatAttribute("endNode", TMP_FORMAT, pMark->GetMarkEnd().nNode.GetIndex());
+            writer.writeFormatAttribute("endOffset", TMP_FORMAT_I32, pMark->GetMarkEnd().nContent.GetIndex());
+            OString txt8 = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
+            writer.writeFormatAttribute("name", "%s", BAD_CAST( txt8.getStr()));
+            writer.endElement();
+        }
         writer.endElement();
     }
-    writer.endElement();
     writer.endElement();
 }
 } // namespace mark