[PATCH libreoffice-3-6] support new attribute also in 3.6, fdo#60760
Markus Mohrhard (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Feb 14 18:37:29 PST 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2159
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/2159/1
support new attribute also in 3.6, fdo#60760
Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1
---
M sc/source/filter/xml/xmlcondformat.cxx
M sc/source/filter/xml/xmlimprt.cxx
M sc/source/filter/xml/xmlimprt.hxx
M xmloff/inc/xmloff/xmltoken.hxx
M xmloff/source/core/xmltoken.cxx
5 files changed, 8 insertions(+), 1 deletion(-)
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 @@
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 @@
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 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 @@
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 @@
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 ),
--
To view, visit https://gerrit.libreoffice.org/2159
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Markus Mohrhard <markus.mohrhard at googlemail.com>
More information about the LibreOffice
mailing list