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

Miklos Vajna vmiklos at collabora.co.uk
Sun Feb 1 04:11:28 PST 2015


 sw/source/core/doc/docbm.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 41465d9b7c978ce93aff9e3ff82ecfa83e90d64b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Feb 1 11:36:52 2015 +0100

    sw::mark::MarkManager: make it possible to generate a default ctor
    
    Should fix Windows werror build.
    
    Change-Id: I9e71bc9042e86e3208cc23f804034957deeb0f81
    Reviewed-on: https://gerrit.libreoffice.org/14269
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 0a3d27f..72fdf6d 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1138,21 +1138,21 @@ void MarkManager::dumpAsXml(xmlTextWriterPtr pWriter) const
     struct
     {
         const char* pName;
-        const container_t& rContainer;
+        const container_t* pContainer;
     } aContainers[] =
     {
-        {"bookmarks", m_vBookmarks},
-        {"fieldmarks", m_vFieldmarks},
-        {"annotationmarks", m_vAnnotationMarks}
+        {"bookmarks", &m_vBookmarks},
+        {"fieldmarks", &m_vFieldmarks},
+        {"annotationmarks", &m_vAnnotationMarks}
     };
 
     xmlTextWriterStartElement(pWriter, BAD_CAST("markManager"));
     for (size_t i = 0; i < SAL_N_ELEMENTS(aContainers); ++i)
     {
-        if (!aContainers[i].rContainer.empty())
+        if (!aContainers[i].pContainer->empty())
         {
             xmlTextWriterStartElement(pWriter, BAD_CAST(aContainers[i].pName));
-            for (const_iterator_t it = aContainers[i].rContainer.begin(); it != aContainers[i].rContainer.end(); ++it)
+            for (const_iterator_t it = aContainers[i].pContainer->begin(); it != aContainers[i].pContainer->end(); ++it)
                 (*it)->dumpAsXml(pWriter);
             xmlTextWriterEndElement(pWriter);
         }


More information about the Libreoffice-commits mailing list