From 223f761330486ef4c4c47f3b92cfa6dd0ed9d56a Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Tue, 5 Aug 2014 09:11:25 +0900
Subject: fdo#75757: remove inheritance to std::vector

typedefs just work.

Change-Id: Ib91c0d4c383b5efac1ad9b93e574dec62e8234a4
Reviewed-on: https://gerrit.libreoffice.org/10754
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
---
 xmloff/inc/XMLTextColumnsContext.hxx         | 5 +++--
 xmloff/inc/xmltabi.hxx                       | 3 ++-
 xmloff/source/core/xmlimp.cxx                | 2 --
 xmloff/source/style/xmltabi.cxx              | 8 --------
 xmloff/source/text/XMLTextColumnsContext.cxx | 2 --
 5 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index a1fe4e029352..1677eea960d8 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -22,11 +22,12 @@
 
 #include "XMLElementPropertyContext.hxx"
 
-
-class XMLTextColumnsArray_Impl;
+class XMLTextColumnContext_Impl;
 class XMLTextColumnSepContext_Impl;
 class SvXMLTokenMap;
 
+typedef std::vector<XMLTextColumnContext_Impl *> XMLTextColumnsArray_Impl;
+
 class XMLTextColumnsContext :public XMLElementPropertyContext
 {
     const OUString sSeparatorLineIsOn;
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index d7e7752e04a6..e8e1e275ab14 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -22,9 +22,10 @@
 
 #include "XMLElementPropertyContext.hxx"
 
-class SvxXMLTabStopArray_Impl;
 class SvXMLImport;
+class SvxXMLTabStopContext_Impl;
 
+typedef std::vector<SvxXMLTabStopContext_Impl *> SvxXMLTabStopArray_Impl;
 
 class SvxXMLTabStopImportContext : public XMLElementPropertyContext
 {
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 32e23dbe409e..5d15bea2fa8b 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -340,8 +340,6 @@ public:
     ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper;
 };
 
-class SvXMLImportContexts_Impl : public std::vector<SvXMLImportContext *> {};
-
 SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix,
                                          const OUString& rLocalName,
                                          const uno::Reference< xml::sax::XAttributeList >& )
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 289f3fca4105..ab9a9af32a13 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -169,14 +169,6 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext(
     return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 }
 
-
-
-
-class SvxXMLTabStopArray_Impl : public std::vector<SvxXMLTabStopContext_Impl *> {};
-
-
-
-
 TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext );
 
 SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 348471c6c8e5..badf922dbd7f 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -263,8 +263,6 @@ XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl()
 {
 }
 
-class XMLTextColumnsArray_Impl : public std::vector<XMLTextColumnContext_Impl *> {};
-
 TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext );
 
 XMLTextColumnsContext::XMLTextColumnsContext(
-- 
cgit