[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source xmloff/inc xmloff/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlcondformat.cxx |    3 +++
 sc/source/filter/xml/xmlimprt.cxx      |    1 +
 sc/source/filter/xml/xmlimprt.hxx      |    3 ++-
 xmloff/inc/xmloff/xmltoken.hxx         |    1 +
 xmloff/source/core/xmltoken.cxx        |    1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 931198a43b2d03404a3a75eb5005ddacaa64540c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Feb 14 17:14:37 2013 +0100

    support new attribute also in 3.6, fdo#60760
    
    Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1
    Reviewed-on: https://gerrit.libreoffice.org/2159
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index dbb5028..83daa86 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -294,6 +294,9 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP
         case XML_TOK_DATABAR_DATABARENTRY:
             pContext = new ScXMLDataBarFormatEntryContext( GetScImport(), nPrefix, rLocalName, xAttrList, mpFormatData );
             break;
+        case XML_TOK_DATABAR_FORMATTINGENTRY:
+            pContext = new ScXMLDataBarFormatEntryContext( GetScImport(), nPrefix, rLocalName, xAttrList, mpFormatData );
+            break;
         default:
             break;
     }
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 204a3fa..aa925f7 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -706,6 +706,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataBarTokenMap()
         static SvXMLTokenMapEntry aDataBarElemTokenMap[] =
         {
             { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY, XML_TOK_DATABAR_DATABARENTRY },
+            { XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, XML_TOK_DATABAR_FORMATTINGENTRY },
             XML_TOKEN_MAP_END
         };
 
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index c4a4412..0974491 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -189,7 +189,8 @@ enum ScXMLColorScaleEntryAttrTokens
 
 enum ScXMLDataBarFormatTokens
 {
-    XML_TOK_DATABAR_DATABARENTRY
+    XML_TOK_DATABAR_DATABARENTRY,
+    XML_TOK_DATABAR_FORMATTINGENTRY
 };
 
 enum ScXMLDataBarAttrTokens
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 16fe5e8..dca9fcf 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -850,6 +850,7 @@ namespace xmloff { namespace token {
         XML_FOREIGN_OBJECT,
         XML_FORMAT_CHANGE,
         XML_FORMAT_SOURCE,
+        XML_FORMATTING_ENTRY,
         XML_FORMS,
         XML_FORMULA,
         XML_FORMULA_HIDDEN,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a1147aa..b21d7fa 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -854,6 +854,7 @@ namespace xmloff { namespace token {
         TOKEN( "foreign-object",                  XML_FOREIGN_OBJECT ),
         TOKEN( "format-change",                   XML_FORMAT_CHANGE ),
         TOKEN( "format-source",                   XML_FORMAT_SOURCE ),
+        TOKEN( "formatting-entry",                XML_FORMATTING_ENTRY ),
         TOKEN( "forms",                           XML_FORMS ),
         TOKEN( "formula",                         XML_FORMULA ),
         TOKEN( "formula-hidden",                  XML_FORMULA_HIDDEN ),