diff options
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 6 | ||||
| -rw-r--r-- | include/xmloff/xmlnmspe.hxx | 7 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 13 |
3 files changed, 25 insertions, 1 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 6d0dda96596a..8d557789aa4c 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -229,8 +229,12 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper< static void initializeNamespaceMaps(); void registerNamespaces(); - std::unique_ptr<SvXMLNamespaceMap> processNSAttributes( +public: + static std::unique_ptr<SvXMLNamespaceMap> processNSAttributes( + std::unique_ptr<SvXMLNamespaceMap> & rpNamespaceMap, + SvXMLImport *const pImport, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); +private: void Characters(const OUString& aChars); css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx index a00628b6b999..cc97a9c5aaa4 100644 --- a/include/xmloff/xmlnmspe.hxx +++ b/include/xmloff/xmlnmspe.hxx @@ -138,6 +138,13 @@ XML_NAMESPACE( XML_NAMESPACE_FIELD, 100U ) XML_NAMESPACE( XML_NAMESPACE_CSS3TEXT, 103U ) // CSS Text Level 3 XML_NAMESPACE( XML_NAMESPACE_FORMX, 101U ) // form interop extensions +// OOo extension digital signatures, used in ODF 1.1 +const sal_uInt16 XML_NAMESPACE_DSIG_OOO = 200; +// ODF 1.2 digital signature namespaces +const sal_uInt16 XML_NAMESPACE_DSIG = 201; +const sal_uInt16 XML_NAMESPACE_DS = 202; +const sal_uInt16 XML_NAMESPACE_XADES132 = 203; +const sal_uInt16 XML_NAMESPACE_XADES141 = 204; #endif // INCLUDED_XMLOFF_XMLNMSPE_HXX diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index b5105e5da0f3..a0e52903060a 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -133,6 +133,19 @@ namespace xmloff { namespace token { XML_NP_GRDDL, XML_N_GRDDL, + // OOo extension digital signatures, used in ODF 1.1 + XML_NP_DSIG_OOO, + XML_N_DSIG_OOO, + // ODF 1.2 digital signatures + XML_NP_DSIG, + XML_N_DSIG, + XML_NP_DS, + XML_N_DS, + XML_NP_XADES132, + XML_N_XADES132, + XML_NP_XADES141, + XML_N_XADES141, + // ODF Enhanced namespaces XML_NP_OFFICE_EXT, XML_N_OFFICE_EXT, |