Rebased ref, commits from common ancestor:
commit 376d7744306dc1f01d50bd7d436adc41b5405f9a
Author: Rosemary Sebastian <rosemarys...@gmail.com>
Date: Sat Jun 18 23:58:20 2016 +0530
No need to mention the type for format changes
Change-Id: Idf59881cda5338d44c73702cfb55ce49df781075
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index af2e5dd..425580d 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -863,7 +863,6 @@ namespace xmloff { namespace token {
XML_FORCE_MANUAL,
XML_FOREGROUND,
XML_FOREIGN_OBJECT,
- XML_FORMAT,
XML_FORMAT_CHANGE,
XML_FORMAT_SOURCE,
XML_FORMATTING_ENTRY,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index b81d544..1d30c0f 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -865,7 +865,6 @@ namespace xmloff { namespace token {
TOKEN( "force-manual", XML_FORCE_MANUAL ),
TOKEN( "foreground", XML_FOREGROUND ),
TOKEN( "foreign-object", XML_FOREIGN_OBJECT ),
- TOKEN( "format", XML_FORMAT ),
TOKEN( "format-change", XML_FORMAT_CHANGE ),
TOKEN( "format-source", XML_FORMAT_SOURCE ),
TOKEN( "formatting-entry", XML_FORMATTING_ENTRY ),
diff --git a/xmloff/source/text/XMLRedlineExport.cxx
b/xmloff/source/text/XMLRedlineExport.cxx
index 1ed7bde..4226e4a 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -348,9 +348,7 @@ void XMLRedlineExport::ExportChangedRegion(
aAny = rPropSet->getPropertyValue(sRedlineUndoType);
aAny >>= sUndoType;
- if( sType == sFormat )
- eUndoType = XML_FORMAT;
- else if( sUndoType == "text" )
+ if( sUndoType == "text" )
eUndoType = XML_TEXT;
if(eUndoType == XML_PARAGRAPH)
{
@@ -362,7 +360,8 @@ void XMLRedlineExport::ExportChangedRegion(
rExport.AddAttribute(XML_NAMESPACE_C, XML_START, "/" +
rtl::OUString::number(nParagraphIdx) + "/" + rtl::OUString::number(nCharStart));
if( sType == sInsert || sType == sFormat )
rExport.AddAttribute(XML_NAMESPACE_C, XML_END, "/" +
rtl::OUString::number(nParagraphIdx) + "/" + rtl::OUString::number(nCharEnd));
- rExport.AddAttribute(XML_NAMESPACE_DC, XML_TYPE, eUndoType);
+ if( sType != sFormat )
+ rExport.AddAttribute(XML_NAMESPACE_DC, XML_TYPE, XML_TEXT);
}
SvXMLElementExport aChange(rExport, XML_NAMESPACE_TEXT,
ConvertTypeName(sType), true, true);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
