[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra/words-change=5Ftracking-ganeshp=5D_libs/od?=
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-03-08 9:27:34
Message-ID: 20110308092734.93FDAA60BB () git ! kde ! org
[Download RAW message or body]

Git commit abb105d6a98c13e5984d303728bbada1c1798c22 by Ganesh Paramasivam.
Committed on 08/03/2011 at 10:26.
Pushed by ganeshp into branch 'words-change_tracking-ganeshp'.

Bug fixes in the saving of changes in ODF 1.2 format.

M  +5    -0    libs/odf/KoGenChange.h     
M  +7    -2    libs/odf/KoGenChanges.cpp     

http://commits.kde.org/calligra/abb105d6a98c13e5984d303728bbada1c1798c22

diff --git a/libs/odf/KoGenChange.h b/libs/odf/KoGenChange.h
index 2ee5ad2..b7418f0 100644
--- a/libs/odf/KoGenChange.h
+++ b/libs/odf/KoGenChange.h
@@ -81,6 +81,11 @@ public:
         return m_type;
     }
 
+    /// Return the format to be used to save changes
+    KoGenChange::ChangeFormat changeFormat() const {
+        return m_changeFormat;
+    }
+
     /// Add a property to the style
     void addChangeMetaData(const QString &propName, const QString &propValue) {
         m_changeMetaData.insert(propName, propValue);
diff --git a/libs/odf/KoGenChanges.cpp b/libs/odf/KoGenChanges.cpp
index 14d9c02..2a3845a 100644
--- a/libs/odf/KoGenChanges.cpp
+++ b/libs/odf/KoGenChanges.cpp
@@ -128,10 +128,15 @@ const KoGenChange* KoGenChanges::change(const QString& name) const
 
 void KoGenChanges::saveOdfChanges(KoXmlWriter* xmlWriter) const
 {
-    xmlWriter->startElement("delta:tracked-changes");
-
     QMap<KoGenChange, QString> changesList = changes();
     QMap<KoGenChange, QString>::const_iterator it = changesList.constBegin();
+
+    if ((it != changesList.constEnd()) && (it.key().changeFormat() == KoGenChange::DELTAXML)) {
+        xmlWriter->startElement("delta:tracked-changes");
+    } else {
+        xmlWriter->startElement("text:tracked-changes");
+    }
+
     for (; it != changesList.constEnd() ; ++it) {
         it.key().writeChange(xmlWriter, it.value());
     }

[prev in list] [next in list] [prev in thread] [next in thread]