From b02998a7cb86bb69c01fd7c2625c801eef835e55 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 31 Aug 2017 09:55:52 +0200
Subject: inline some use-once typedefs

and remove some dead ones

Change-Id: I6946d717d3c15dc5207489ed3d56d985dd953d59
Reviewed-on: https://gerrit.libreoffice.org/41746
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/xmloff/xmlimp.hxx | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'include/xmloff')

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 36b70f88a4f7..390c3d511349 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -88,10 +88,6 @@ class XMLErrors;
 class StyleMap;
 enum class SvXMLErrorFlags;
 
-typedef std::stack<SvXMLImportContextRef> SvXMLImportContexts_Impl;
-typedef std::stack<css::uno::Reference<css::xml::sax::XFastContextHandler>>
-            FastSvXMLImportContexts_Impl;
-
 namespace xmloff {
     class RDFaImportHelper;
 }
@@ -204,12 +200,13 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
 
     std::unique_ptr<SvXMLImport_Impl>  mpImpl;            // dummy
 
-    std::unique_ptr<SvXMLNamespaceMap> mpNamespaceMap;
-    std::unique_ptr<SvXMLUnitConverter> mpUnitConv;
-    SvXMLImportContexts_Impl    maContexts;
-    FastSvXMLImportContexts_Impl    maFastContexts;
-    std::unique_ptr<SvXMLNumFmtHelper> mpNumImport;
-    std::unique_ptr<ProgressBarHelper> mpProgressBarHelper;
+    std::unique_ptr<SvXMLNamespaceMap>    mpNamespaceMap;
+    std::unique_ptr<SvXMLUnitConverter>   mpUnitConv;
+    std::stack<SvXMLImportContextRef>     maContexts;
+    std::stack<css::uno::Reference<css::xml::sax::XFastContextHandler>>
+                                          maFastContexts;
+    std::unique_ptr<SvXMLNumFmtHelper>    mpNumImport;
+    std::unique_ptr<ProgressBarHelper>    mpProgressBarHelper;
     std::unique_ptr<XMLEventImportHelper> mpEventImportHelper;
     std::unique_ptr<XMLErrors>  mpXMLErrors;
     rtl::Reference<StyleMap>    mpStyleMap;
-- 
cgit