Kaydet (Commit) 223f7613 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Michael Stahl

fdo#75757: remove inheritance to std::vector

typedefs just work.

Change-Id: Ib91c0d4c383b5efac1ad9b93e574dec62e8234a4
Reviewed-on: https://gerrit.libreoffice.org/10754Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 42172ea6
...@@ -62,7 +62,6 @@ namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; } ...@@ -62,7 +62,6 @@ namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
class SvXMLNamespaceMap; class SvXMLNamespaceMap;
class SvXMLImportContext; class SvXMLImportContext;
class SvXMLImportContexts_Impl;
class SvXMLImport_Impl; class SvXMLImport_Impl;
class SvXMLUnitConverter; class SvXMLUnitConverter;
class SvXMLNumFmtHelper; class SvXMLNumFmtHelper;
...@@ -71,6 +70,8 @@ class XMLEventImportHelper; ...@@ -71,6 +70,8 @@ class XMLEventImportHelper;
class XMLErrors; class XMLErrors;
class StyleMap; class StyleMap;
typedef std::vector<SvXMLImportContext *> SvXMLImportContexts_Impl;
namespace xmloff { namespace xmloff {
class RDFaImportHelper; class RDFaImportHelper;
} }
......
...@@ -22,11 +22,12 @@ ...@@ -22,11 +22,12 @@
#include "XMLElementPropertyContext.hxx" #include "XMLElementPropertyContext.hxx"
class XMLTextColumnContext_Impl;
class XMLTextColumnsArray_Impl;
class XMLTextColumnSepContext_Impl; class XMLTextColumnSepContext_Impl;
class SvXMLTokenMap; class SvXMLTokenMap;
typedef std::vector<XMLTextColumnContext_Impl *> XMLTextColumnsArray_Impl;
class XMLTextColumnsContext :public XMLElementPropertyContext class XMLTextColumnsContext :public XMLElementPropertyContext
{ {
const OUString sSeparatorLineIsOn; const OUString sSeparatorLineIsOn;
......
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
#include "XMLElementPropertyContext.hxx" #include "XMLElementPropertyContext.hxx"
class SvxXMLTabStopArray_Impl;
class SvXMLImport; class SvXMLImport;
class SvxXMLTabStopContext_Impl;
typedef std::vector<SvxXMLTabStopContext_Impl *> SvxXMLTabStopArray_Impl;
class SvxXMLTabStopImportContext : public XMLElementPropertyContext class SvxXMLTabStopImportContext : public XMLElementPropertyContext
{ {
......
...@@ -340,8 +340,6 @@ public: ...@@ -340,8 +340,6 @@ public:
::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper;
}; };
class SvXMLImportContexts_Impl : public std::vector<SvXMLImportContext *> {};
SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix, SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& ) const uno::Reference< xml::sax::XAttributeList >& )
......
...@@ -169,14 +169,6 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext( ...@@ -169,14 +169,6 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext(
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
} }
class SvxXMLTabStopArray_Impl : public std::vector<SvxXMLTabStopContext_Impl *> {};
TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext ); TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext );
SvxXMLTabStopImportContext::SvxXMLTabStopImportContext( SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
......
...@@ -263,8 +263,6 @@ XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl() ...@@ -263,8 +263,6 @@ XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl()
{ {
} }
class XMLTextColumnsArray_Impl : public std::vector<XMLTextColumnContext_Impl *> {};
TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext ); TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext );
XMLTextColumnsContext::XMLTextColumnsContext( XMLTextColumnsContext::XMLTextColumnsContext(
......
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