diff options
| author | Kohei Yoshida <kohei@openoffice.org> | 2009-11-17 19:48:16 +0000 |
|---|---|---|
| committer | Kohei Yoshida <kohei@openoffice.org> | 2009-11-17 19:48:16 +0000 |
| commit | 4b24821fddaf7bb3ebb2097f7227befdf9a46389 (patch) | |
| tree | dc4fb80b08469256bb3a4919b2822de8c3f1ca2d /xmloff | |
| parent | 62304c9343b1fbd247c813111ed13e3359998340 (diff) | |
#i106975# Put the extended namespace in the (hopefully) correct place for ods export.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 55af99802f9d..18d4644ee872 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -322,6 +322,12 @@ void SvXMLExport::_InitCtor() mpNamespaceMap->Add( GetXMLToken(XML_NP_OOOW), GetXMLToken(XML_N_OOOW), XML_NAMESPACE_OOOW ); mpNamespaceMap->Add( GetXMLToken(XML_NP_OOOC), GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC ); mpNamespaceMap->Add( GetXMLToken(XML_NP_OF), GetXMLToken(XML_N_OF), XML_NAMESPACE_OF ); + + if (getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST) + { + mpNamespaceMap->Add( + GetXMLToken(XML_NP_TABLE_EXT), GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT); + } } if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) { diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 90d807efd12c..1d7414d4ca23 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -650,11 +650,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent GetXMLToken(XML_NP_OFFICE_EXT), GetXMLToken(XML_N_OFFICE_EXT), XML_NAMESPACE_OFFICE_EXT); - - _GetNamespaceMap().Add( - GetXMLToken(XML_NP_TABLE_EXT), - GetXMLToken(XML_N_TABLE_EXT), - XML_NAMESPACE_TABLE_EXT); } GetShapeExport()->enableLayerExport(); |