[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - 2 commits - include/xmloff xmloff/source

[Rosemary Sebastian]

 include/xmloff/xmlnmspe.hxx             |   16 +++++++---------
 xmloff/source/text/XMLRedlineExport.cxx |   32 ++++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 13 deletions(-)

New commits:
commit 3edd0d2e3591461af647e08f281c296923c8944d
Author: Rosemary Sebastian <rosemaryseb8 at gmail.com>
Date:   Tue Jun 7 16:36:18 2016 +0530

    Add placeholder xml to store tracked changes
    
    Change-Id: I53ad233faa7d148c6d5dbcb1c301b31f5110ced0

diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 7853056..ab1885f 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -505,6 +505,30 @@ void XMLRedlineExport::ExportChangeInfo(
                                           XML_END, true, false );
         rExport.Characters("end"); // TODO: Get the correct end position
     }
+    else if(sType == sInsert)
+    {
+        SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
+                                          XML_TYPE, true, false );
+        rExport.Characters("text"); // or paragraph TODO: Find a way to distinguish text and paragraph changes
+        SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
+                                          XML_START, true, false );
+        rExport.Characters("start"); // TODO: Get the correct start position (NumberingLevel for paragraph)
+        SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
+                                          XML_END, true, false );
+    }
+    else if(sType == sDelete)
+    {
+        SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
+                                          XML_TYPE, true, false );
+        rExport.Characters("text"); // or paragraph TODO: Find a way to distinguish text and paragraph changes
+        SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
+                                          XML_START, true, false );
+        rExport.Characters("start"); // TODO: Get the correct start position
+        SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
+                                          XML_END, true, false );
+        // TODO: Check if type is not paragraph
+        rExport.Characters("end"); // TODO: Get the correct end position
+    }
 
     // comment as <text:p> sequence
     aAny = rPropSet->getPropertyValue(sRedlineComment);
commit 9ee00a7db3412f13f70034e168d0b7fa8201f519
Author: Rosemary Sebastian <rosemaryseb8 at gmail.com>
Date:   Tue Jun 7 16:34:49 2016 +0530

    New namespace is not currently of interest
    
    Change-Id: I00f45f4f29f81128c80390acb3899a26cb3d2237

diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index da467d1..ae588d2 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -70,8 +70,6 @@ XML_NAMESPACE( REPORT,          33U )
 XML_NAMESPACE( OF,              34U )       // OpenFormula aka ODFF
 XML_NAMESPACE( XHTML,           35U )
 XML_NAMESPACE( GRDDL,           36U )
-XML_NAMESPACE( ADD,             37U )
-XML_NAMESPACE( DEL,             38U )
 
 // namespaces for odf extended formats
 
@@ -79,14 +77,14 @@ XML_NAMESPACE( DEL,             38U )
 const sal_uInt16 XML_NAMESPACE_##prefix##_EXT       = key; \
 const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX   = key;
 
-XML_NAMESPACE_EXT( OFFICE,      39U )
-XML_NAMESPACE_EXT( TABLE,       40U )
-XML_NAMESPACE_EXT( CHART,       41U )
-XML_NAMESPACE_EXT( DRAW,        42U )
-XML_NAMESPACE_EXT( CALC,        43U )
-XML_NAMESPACE_EXT( LO,          44U )
+XML_NAMESPACE_EXT( OFFICE,      37U )
+XML_NAMESPACE_EXT( TABLE,       38U )
+XML_NAMESPACE_EXT( CHART,       39U )
+XML_NAMESPACE_EXT( DRAW,        40U )
+XML_NAMESPACE_EXT( CALC,        41U )
+XML_NAMESPACE_EXT( LO,          42U )
 
-#define XML_OLD_NAMESPACE_BASE 45U
+#define XML_OLD_NAMESPACE_BASE 43U
 
 // namespaces used in the technical preview (SO 5.2)
 XML_OLD_NAMESPACE( FO,      0U )
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index c59fae5..7853056 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -492,16 +492,16 @@ void XMLRedlineExport::ExportChangeInfo(
     aAny >>= sType;
     if(sType == sFormat) // TODO: Find out if the style is inserted or deleted to give the proper namespace
     {
-        SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DEL,
+        SvXMLElementExport aTypeElem( rExport, XML_NAMESPACE_DC,
                                           XML_TYPE, true, false );
         rExport.Characters("style");
-        SvXMLElementExport aNameElem( rExport, XML_NAMESPACE_DEL,
+        SvXMLElementExport aNameElem( rExport, XML_NAMESPACE_DC,
                                           XML_NAME, true, false );
         rExport.Characters("bold"); // TODO: Get the correct style name
-        SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DEL,
+        SvXMLElementExport aStartElem( rExport, XML_NAMESPACE_DC,
                                           XML_START, true, false );
         rExport.Characters("start"); // TODO: Get the correct start position
-        SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DEL,
+        SvXMLElementExport aEndElem( rExport, XML_NAMESPACE_DC,
                                           XML_END, true, false );
         rExport.Characters("end"); // TODO: Get the correct end position
     }