diff options
author | Eike Rathke <erack@redhat.com> | 2013-12-09 21:04:03 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-10 04:23:36 +0000 |
commit | 8d7f6a429f66cf9d029cdd70bbf24906509900e2 (patch) | |
tree | 9e62def3d77d6d705ec407c8ac9795028fd19ec1 | |
parent | fffa2b69209f9c1387a6182ca1422aa3f71c1cae (diff) |
resolved fdo#72537 write <loext:fill-character>
... instead of <number:fill-character> but read both.
(cherry picked from commit 9f87de91cee05656808a98ab1bd65ad9509ef7df)
Also needed for this is:
xmloff: add a generic LibreOffice ODF extension namespace
XML_NAMESPACE_LO_EXT can be used for elements and attributes that are
not yet specified by OpenDocument.
(Change-Id: Id29392533d46f6592d964ce79c05ffefa4d69ebc)
Reviewed-on: https://gerrit.libreoffice.org/5419
Tested-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit de9b067bd13ec6632b49c9683255bd3a1d7ae13e)
Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3
Reviewed-on: https://gerrit.libreoffice.org/7014
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | include/xmloff/xmlnmspe.hxx | 3 | ||||
-rw-r--r-- | include/xmloff/xmltoken.hxx | 3 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/xmltoken.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 3 |
7 files changed, 15 insertions, 3 deletions
diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx index b1646c307b63..e1b3fdb95f42 100644 --- a/include/xmloff/xmlnmspe.hxx +++ b/include/xmloff/xmlnmspe.hxx @@ -82,8 +82,9 @@ 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 42U +#define _XML_OLD_NAMESPACE_BASE 43U // namespaces used in the technical preview (SO 5.2) XML_OLD_NAMESPACE( FO, 0U ) diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index a40da2c19b5c..2e4962f038df 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -152,6 +152,9 @@ namespace xmloff { namespace token { // calc extensions XML_NP_CALC_EXT, XML_N_CALC_EXT, + // generic LO extensions + XML_NP_LO_EXT, + XML_N_LO_EXT, // units XML_UNIT_MM, diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 491b58f5002a..77e7a25d70a4 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -362,6 +362,9 @@ void SvXMLExport::_InitCtor() GetXMLToken(XML_NP_CALC_EXT), GetXMLToken(XML_N_CALC_EXT), XML_NAMESPACE_CALC_EXT); mpNamespaceMap->Add( GetXMLToken(XML_NP_DRAW_EXT), GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT); + mpNamespaceMap->Add( + GetXMLToken(XML_NP_LO_EXT), GetXMLToken(XML_N_LO_EXT), + XML_NAMESPACE_LO_EXT); } } if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 263175d8be07..d0007f08d12d 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -373,6 +373,8 @@ void SvXMLImport::_InitCtor() mpNamespaceMap->Add( OUString( sXML_np__css3text ), GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT ); mpNamespaceMap->Add( "_calc_libo", GetXMLToken(XML_N_CALC_EXT), XML_NAMESPACE_CALC_EXT); + mpNamespaceMap->Add( "_office_libo", + GetXMLToken(XML_N_LO_EXT), XML_NAMESPACE_LO_EXT); } msPackageProtocol = "vnd.sun.star.Package:"; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 2dfbe312a819..f5831401f870 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -157,6 +157,8 @@ namespace xmloff { namespace token { // 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 ), + TOKEN( "loext", XML_NP_LO_EXT ), + TOKEN( "urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0", XML_N_LO_EXT ), // units TOKEN( "mm", XML_UNIT_MM ), diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 8beeab70abe3..e1eb48a6b174 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -532,7 +532,7 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool bLong ) void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar ) { FinishTextElement_Impl(); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, + SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, sal_True, sal_False ); rExport.Characters( OUString::valueOf( nChar ) ); } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 7fc2d973597d..ece3ea8db7f3 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -509,7 +509,8 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap() { // elements in a style { XML_NAMESPACE_NUMBER, XML_TEXT, XML_TOK_STYLE_TEXT }, - { XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, XML_TOK_STYLE_FILL_CHARACTER }, + { XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, XML_TOK_STYLE_FILL_CHARACTER }, + { XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, XML_TOK_STYLE_FILL_CHARACTER }, { XML_NAMESPACE_NUMBER, XML_NUMBER, XML_TOK_STYLE_NUMBER }, { XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER, XML_TOK_STYLE_SCIENTIFIC_NUMBER }, { XML_NAMESPACE_NUMBER, XML_FRACTION, XML_TOK_STYLE_FRACTION }, |