[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source

[Takeshi Abe]

 include/xmloff/xmlimp.hxx                    |    3 ++-
 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 --
 6 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 223f761330486ef4c4c47f3b92cfa6dd0ed9d56a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Aug 5 09:11:25 2014 +0900

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 24414ff..4e801f9 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -62,7 +62,6 @@ namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
 
 class SvXMLNamespaceMap;
 class SvXMLImportContext;
-class SvXMLImportContexts_Impl;
 class SvXMLImport_Impl;
 class SvXMLUnitConverter;
 class SvXMLNumFmtHelper;
@@ -71,6 +70,8 @@ class XMLEventImportHelper;
 class XMLErrors;
 class StyleMap;
 
+typedef std::vector<SvXMLImportContext *> SvXMLImportContexts_Impl;
+
 namespace xmloff {
     class RDFaImportHelper;
 }
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index a1fe4e0..1677eea 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 d7e7752..e8e1e27 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 32e23db..5d15bea 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 289f3fc..ab9a9af 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 348471c..badf922 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(