diff options
| author | Kohei Yoshida <kohei@openoffice.org> | 2009-11-17 18:35:42 +0000 |
|---|---|---|
| committer | Kohei Yoshida <kohei@openoffice.org> | 2009-11-17 18:35:42 +0000 |
| commit | 62304c9343b1fbd247c813111ed13e3359998340 (patch) | |
| tree | 2fadc6b3dd64536996d1dcf413bb079f29733810 /xmloff | |
| parent | 119da1585819ab945cf07866c0185b7e63d691fa (diff) | |
#i106975# Added new namespace tableooo to handle extended ODF for 'table' namespace.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmlnmspe.hxx | 3 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 5 |
5 files changed, 17 insertions, 1 deletions
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmlnmspe.hxx index f90ff05c084d..795b71b1a5bb 100644 --- a/xmloff/inc/xmlnmspe.hxx +++ b/xmloff/inc/xmlnmspe.hxx @@ -89,8 +89,9 @@ const sal_uInt16 XML_NAMESPACE_##prefix##_EXT = key; \ const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX = key; XML_NAMESPACE_EXT( OFFICE, 37U ) +XML_NAMESPACE_EXT( TABLE, 38U ) -#define _XML_OLD_NAMESPACE_BASE 38U +#define _XML_OLD_NAMESPACE_BASE 39U // 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 f4d8016a6358..4a96de28b480 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -148,6 +148,9 @@ namespace xmloff { namespace token { XML_NP_OFFICE_EXT, XML_N_OFFICE_EXT, + XML_NP_TABLE_EXT, + XML_N_TABLE_EXT, + // units XML_UNIT_MM, XML_UNIT_M, diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index d4dc48ede241..997712f45a95 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -101,6 +101,7 @@ sal_Char __READONLY_DATA sXML_np__of[] = "_of"; sal_Char __READONLY_DATA sXML_np__style[] = "_style"; sal_Char __READONLY_DATA sXML_np__text[] = "_text"; sal_Char __READONLY_DATA sXML_np__table[] = "_table"; +sal_Char __READONLY_DATA sXML_np__table_ext[] = "_table_ooo"; sal_Char __READONLY_DATA sXML_np__draw[] = "_draw"; sal_Char __READONLY_DATA sXML_np__dr3d[] = "_dr3d"; sal_Char __READONLY_DATA sXML_np__fo[] = "_fo"; @@ -259,6 +260,9 @@ void SvXMLImport::_InitCtor() mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__table ) ), GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE ); + mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__table_ext ) ), + GetXMLToken(XML_N_TABLE_EXT), + XML_NAMESPACE_TABLE_EXT ); mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw ) ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 61c95a9dac9f..3073ead17646 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -156,6 +156,9 @@ namespace xmloff { namespace token { TOKEN( "officeooo", XML_NP_OFFICE_EXT ), TOKEN( "http://openoffice.org/2009/office", XML_N_OFFICE_EXT ), + TOKEN( "tableooo", XML_NP_TABLE_EXT ), + TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ), + // units TOKEN( "mm", XML_UNIT_MM ), TOKEN( "m", XML_UNIT_M ), diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 1d7414d4ca23..90d807efd12c 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -650,6 +650,11 @@ 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(); |