Kaydet (Commit) acc613a3 authored tarafından Caolán McNamara's avatar Caolán McNamara

unwind manifest xml parser and follow tag hierarchy model

so we validate that each tag is inside the right parent

Change-Id: Ibc82aeaf6b409ef2fed7de0cd8f15c164da65e53
üst 15943529
...@@ -46,10 +46,12 @@ struct ManifestScopeEntry ...@@ -46,10 +46,12 @@ struct ManifestScopeEntry
{ {
::rtl::OUString m_aConvertedName; ::rtl::OUString m_aConvertedName;
StringHashMap m_aNamespaces; StringHashMap m_aNamespaces;
bool m_bValid;
ManifestScopeEntry( const ::rtl::OUString& aConvertedName, const StringHashMap& aNamespaces ) ManifestScopeEntry( const ::rtl::OUString& aConvertedName, const StringHashMap& aNamespaces )
: m_aConvertedName( aConvertedName ) : m_aConvertedName( aConvertedName )
, m_aNamespaces( aNamespaces ) , m_aNamespaces( aNamespaces )
, m_bValid( true )
{} {}
~ManifestScopeEntry() ~ManifestScopeEntry()
...@@ -148,6 +150,12 @@ public: ...@@ -148,6 +150,12 @@ public:
throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator )
throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
private:
void doFileEntry(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException);
void doEncryptionData(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException);
void doAlgorithm(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException);
void doKeyDerivation(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException);
void doStartKeyAlg(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException);
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment