diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-08-19 18:24:54 +0900 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-19 08:30:44 -0500 |
| commit | 44afb981a587fb5b5e6fd9ba5c5b138526cfb04b (patch) | |
| tree | eacc82f4134fed7882b90c71dc6a9f7981363ed8 | |
| parent | ca54b6ea903da7a1bc815c27389d2f1d362edaff (diff) | |
fdo#75757: remove inheritance to std::vector
by replacing it with a typedef.
Change-Id: Iaa88086e3c5195012982dd625bfd589de2e484a2
Reviewed-on: https://gerrit.libreoffice.org/11017
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | sw/inc/doc.hxx | 5 | ||||
| -rw-r--r-- | sw/inc/editsh.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/tox.hxx | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index e000a919063f..4a57c9b30110 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -42,6 +42,7 @@ #include <editeng/numitem.hxx> #include <com/sun/star/linguistic2/XProofreadingIterator.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> +#include <tox.hxx> #include <boost/unordered_map.hpp> @@ -126,11 +127,7 @@ class SwSectionFmt; class SwSectionFmts; class SwSectionData; class SwSelBoxes; -class SwTOXBase; class SwTOXBaseSection; -class SwTOXMark; -class SwTOXMarks; -class SwTOXType; class SwTOXTypes; class SwTabCols; class SwTable; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 6691202eba95..60f0f2d7a053 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -32,6 +32,7 @@ #include <fldupde.hxx> #include <tblenum.hxx> #include <IMark.hxx> +#include <tox.hxx> #include <vector> #include <set> @@ -77,9 +78,6 @@ class SwFmtFtn; class SwSection; class SwSectionData; class SwSectionFmt; -class SwTOXMarks; -class SwTOXBase; -class SwTOXType; class SwTableAutoFmt; class SwPageDesc; class SwTxtINetFmt; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 375a27b74e00..4165a66b7255 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -40,7 +40,7 @@ class SwTOXMark; class SwTxtTOXMark; class SwDoc; -class SwTOXMarks : public std::vector<SwTOXMark*> {}; +typedef std::vector<SwTOXMark*> SwTOXMarks; // Entry of content index, alphabetical index or user defined index |