Kaydet (Commit) 44afb981 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) David Tardon

fdo#75757: remove inheritance to std::vector

by replacing it with a typedef.

Change-Id: Iaa88086e3c5195012982dd625bfd589de2e484a2
Reviewed-on: https://gerrit.libreoffice.org/11017Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst ca54b6ea
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <editeng/numitem.hxx> #include <editeng/numitem.hxx>
#include <com/sun/star/linguistic2/XProofreadingIterator.hpp> #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
#include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
#include <tox.hxx>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
...@@ -126,11 +127,7 @@ class SwSectionFmt; ...@@ -126,11 +127,7 @@ class SwSectionFmt;
class SwSectionFmts; class SwSectionFmts;
class SwSectionData; class SwSectionData;
class SwSelBoxes; class SwSelBoxes;
class SwTOXBase;
class SwTOXBaseSection; class SwTOXBaseSection;
class SwTOXMark;
class SwTOXMarks;
class SwTOXType;
class SwTOXTypes; class SwTOXTypes;
class SwTabCols; class SwTabCols;
class SwTable; class SwTable;
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <fldupde.hxx> #include <fldupde.hxx>
#include <tblenum.hxx> #include <tblenum.hxx>
#include <IMark.hxx> #include <IMark.hxx>
#include <tox.hxx>
#include <vector> #include <vector>
#include <set> #include <set>
...@@ -77,9 +78,6 @@ class SwFmtFtn; ...@@ -77,9 +78,6 @@ class SwFmtFtn;
class SwSection; class SwSection;
class SwSectionData; class SwSectionData;
class SwSectionFmt; class SwSectionFmt;
class SwTOXMarks;
class SwTOXBase;
class SwTOXType;
class SwTableAutoFmt; class SwTableAutoFmt;
class SwPageDesc; class SwPageDesc;
class SwTxtINetFmt; class SwTxtINetFmt;
......
...@@ -40,7 +40,7 @@ class SwTOXMark; ...@@ -40,7 +40,7 @@ class SwTOXMark;
class SwTxtTOXMark; class SwTxtTOXMark;
class SwDoc; class SwDoc;
class SwTOXMarks : public std::vector<SwTOXMark*> {}; typedef std::vector<SwTOXMark*> SwTOXMarks;
// Entry of content index, alphabetical index or user defined index // Entry of content index, alphabetical index or user defined index
......
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