mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the existing namespace map for the oox namespace export

Browse Source 
Change-Id: I7909b08db556c6c65c1547303f2b899c30feaba4
Reviewed-on: https://gerrit.libreoffice.org/32425
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
2016-12-25 23:23:11 +01:00
parent 0ba8da9164
commit c61981c193
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/oox/core/xmlfilterbase.hxx
View File

@@ -236,6 +236,8 @@ public:
void checkDocumentProperties( void checkDocumentProperties(
const css::uno::Reference<css::document::XDocumentProperties>& xDocProps); const css::uno::Reference<css::document::XDocumentProperties>& xDocProps);
OUString getNamespaceURL(sal_Int32 nNSID) const;
protected: protected:
virtual css::uno::Reference< css::io::XInputStream > virtual css::uno::Reference< css::io::XInputStream >
implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const override; implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const override;

17
oox/source/core/xmlfilterbase.cxx
View File

@@ -63,6 +63,7 @@
#include <tools/datetime.hxx> #include <tools/datetime.hxx>
#include <com/sun/star/util/Duration.hpp> #include <com/sun/star/util/Duration.hpp>
#include <sax/tools/converter.hxx> #include <sax/tools/converter.hxx>
#include <oox/token/namespacemap.hxx>
using ::com::sun::star::xml::dom::DocumentBuilder; using ::com::sun::star::xml::dom::DocumentBuilder;
using ::com::sun::star::xml::dom::XDocument; using ::com::sun::star::xml::dom::XDocument;
@@ -178,6 +179,7 @@ struct XmlFilterBaseImpl
const OUString maBinSuffix; const OUString maBinSuffix;
RelationsMap maRelationsMap; RelationsMap maRelationsMap;
TextFieldStack maTextFieldStack; TextFieldStack maTextFieldStack;
const NamespaceMap& mrNamespaceMap;
explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ); explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
~XmlFilterBaseImpl(); ~XmlFilterBaseImpl();
@@ -186,7 +188,8 @@ struct XmlFilterBaseImpl
XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
mxContext(rxContext), mxContext(rxContext),
maFastParser( rxContext ), maFastParser( rxContext ),
maBinSuffix( ".bin" ) maBinSuffix( ".bin" ),
mrNamespaceMap(StaticNamespaceMap::get())
{ {
// register XML namespaces // register XML namespaces
registerNamespaces(maFastParser); registerNamespaces(maFastParser);
@@ -910,6 +913,18 @@ bool XmlFilterBase::isMSO2007Document() const
return mbMSO2007; return mbMSO2007;
} }
OUString XmlFilterBase::getNamespaceURL(sal_Int32 nNSID) const
{
auto itr = mxImpl->mrNamespaceMap.maTransitionalNamespaceMap.find(nNSID);
if (itr == mxImpl->mrNamespaceMap.maTransitionalNamespaceMap.end())
{
SAL_WARN("oox", "missing namespace in the namespace map for : " << nNSID);
return OUString();
}
return itr->second;
}
} // namespace core } // namespace core
} // namespace oox } // namespace oox

1
oox/source/token/namespaces.hxx.tail
View File

@@ -30,6 +30,7 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; }
// defines for tokens with specific namespaces // defines for tokens with specific namespaces
#define OOX_TOKEN( namespace, token ) (::oox::NMSP_##namespace | ::oox::XML_##token) #define OOX_TOKEN( namespace, token ) (::oox::NMSP_##namespace | ::oox::XML_##token)
#define OOX_NS( namespace ) (::oox::NMSP_##namespace)
#define A_TOKEN( token ) OOX_TOKEN( dml, token ) #define A_TOKEN( token ) OOX_TOKEN( dml, token )
#define AX_TOKEN( token ) OOX_TOKEN( ax, token ) #define AX_TOKEN( token ) OOX_TOKEN( ax, token )

3
sc/source/filter/excel/xecontent.cxx
View File

@@ -44,6 +44,7 @@
#include "xestyle.hxx" #include "xestyle.hxx"
#include "xename.hxx" #include "xename.hxx"
#include <rtl/uuid.h> #include <rtl/uuid.h>
#include <oox/token/namespaces.hxx>
using namespace ::oox; using namespace ::oox;
@@ -1396,7 +1397,7 @@ void XclExpDataBar::SaveXml( XclExpXmlStream& rStrm )
// extLst entries for Excel 2010 and 2013 // extLst entries for Excel 2010 and 2013
rWorksheet->startElement( XML_extLst, FSEND ); rWorksheet->startElement( XML_extLst, FSEND );
rWorksheet->startElement( XML_ext, rWorksheet->startElement( XML_ext,
FSNS( XML_xmlns, XML_x14 ), "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main", FSNS( XML_xmlns, XML_x14 ), XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(xls14Lst))).getStr(),
XML_uri, "{B025F937-C7B1-47D3-B67F-A62EFF666E3E}", XML_uri, "{B025F937-C7B1-47D3-B67F-A62EFF666E3E}",
FSEND ); FSEND );