From a5be07d6b627a18f104e2feed063ff9020e8c610 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 18 Dec 2017 14:24:50 +0200 Subject: inline use-once typedefs Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157 Reviewed-on: https://gerrit.libreoffice.org/46764 Tested-by: Jenkins Reviewed-by: Noel Grandin --- unoxml/source/dom/elementlist.hxx | 4 +--- unoxml/source/dom/saxbuilder.hxx | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'unoxml') diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index 3f44d05a0253..28a4cb61670e 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -42,8 +42,6 @@ namespace DOM { class CElement; - typedef std::vector< xmlNodePtr > nodevector_t; - class CElementListImpl : public cppu::WeakImplHelper< css::xml::dom::XNodeList, css::xml::dom::events::XEventListener > @@ -59,7 +57,7 @@ namespace DOM ::std::unique_ptr const m_pName; ::std::unique_ptr const m_pURI; bool m_bRebuild; - nodevector_t m_nodevector; + std::vector< xmlNodePtr > m_nodevector; void buildlist(xmlNodePtr pNode, bool start=true); diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index 0caf53ea4faf..dd2331426c63 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -44,10 +44,8 @@ namespace DOM { - typedef std::stack< css::uno::Reference< css::xml::dom::XNode > > NodeStack; typedef std::map< OUString, OUString > NSMap; typedef std::map< OUString, OUString > AttrMap; - typedef std::stack< NSMap > NSStack; class CSAXDocumentBuilder : public ::cppu::WeakImplHelper< css::xml::dom::XSAXDocumentBuilder2, css::lang::XServiceInfo > @@ -58,8 +56,8 @@ namespace DOM const css::uno::Reference< css::lang::XMultiServiceFactory > m_aServiceManager; css::xml::dom::SAXDocumentBuilderState m_aState; - NodeStack m_aNodeStack; - NSStack m_aNSStack; + std::stack< css::uno::Reference< css::xml::dom::XNode > > m_aNodeStack; + std::stack< NSMap > m_aNSStack; css::uno::Reference< css::xml::dom::XDocument > m_aDocument; css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment; -- cgit