diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-24 12:37:39 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-24 12:38:11 +0200 |
| commit | f18a242966d3fd25ec0832c09ce7164bdae7ba2d (patch) | |
| tree | b115c7868a6eb6a07f3331847bb7da780a19b4a9 /xmloff | |
| parent | 655d61042f5b6130643d2dde3cd46e4e4d3bbb2b (diff) | |
use correct namespace for calc odf extensions
Change-Id: I6e0feab7e1d649fbf4dafb9f06d57f68e9a4b934
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmloff/xmlnmspe.hxx | 3 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 5 | ||||
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 5 |
4 files changed, 15 insertions, 1 deletions
diff --git a/xmloff/inc/xmloff/xmlnmspe.hxx b/xmloff/inc/xmloff/xmlnmspe.hxx index 2f4615da2a2c..0d222dac725f 100644 --- a/xmloff/inc/xmloff/xmlnmspe.hxx +++ b/xmloff/inc/xmloff/xmlnmspe.hxx @@ -90,8 +90,9 @@ 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 ) -#define _XML_OLD_NAMESPACE_BASE 41U +#define _XML_OLD_NAMESPACE_BASE 42U // namespaces used in the technical preview (SO 5.2) XML_OLD_NAMESPACE( FO, 0U ) diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index dd0529b6fcbb..d47a93b57e22 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -160,6 +160,10 @@ namespace xmloff { namespace token { XML_NP_CSS3TEXT, XML_N_CSS3TEXT, + // calc extensions + XML_NP_CALC_EXT, + XML_N_CALC_EXT, + // units XML_UNIT_MM, XML_UNIT_M, @@ -426,6 +430,7 @@ namespace xmloff { namespace token { XML_COLOR_INVERSION, XML_COLOR_MODE, XML_COLOR_SCALE, + XML_COLOR_SCALE_ENTRY, XML_COLUMN, XML_COLUMN_COUNT, XML_COLUMN_GAP, diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index e70a24ce4b0b..e9f80bba367d 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -374,6 +374,9 @@ void SvXMLExport::_InitCtor() { mpNamespaceMap->Add( GetXMLToken(XML_NP_TABLE_EXT), GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT); + mpNamespaceMap->Add( + GetXMLToken(XML_NP_CALC_EXT), GetXMLToken(XML_N_CALC_EXT), XML_NAMESPACE_CALC_EXT); + } } if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index d4e21b2d2bd5..759926aae048 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -164,6 +164,10 @@ namespace xmloff { namespace token { TOKEN( "css3t", XML_NP_CSS3TEXT ), TOKEN( "http://www.w3.org/TR/css3-text/", XML_N_CSS3TEXT ), + // extension namespace for calc extensions + TOKEN( "calcext", XML_NP_CALC_EXT ), + TOKEN( "urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0", XML_N_CALC_EXT ), + // units TOKEN( "mm", XML_UNIT_MM ), TOKEN( "m", XML_UNIT_M ), @@ -430,6 +434,7 @@ namespace xmloff { namespace token { TOKEN( "color-inversion", XML_COLOR_INVERSION ), TOKEN( "color-mode", XML_COLOR_MODE ), TOKEN( "color-scale", XML_COLOR_SCALE ), + TOKEN( "color-scale-entry", XML_COLOR_SCALE_ENTRY ), TOKEN( "column", XML_COLUMN ), TOKEN( "column-count", XML_COLUMN_COUNT ), TOKEN( "column-gap", XML_COLUMN_GAP ), |