[Libreoffice-commits] core.git: sw/inc

[Takeshi Abe]

 sw/inc/doc.hxx    |    5 +----
 sw/inc/editsh.hxx |    4 +---
 sw/inc/tox.hxx    |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 44afb981a587fb5b5e6fd9ba5c5b138526cfb04b
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Aug 19 18:24:54 2014 +0900

    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 at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e000a91..4a57c9b 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 6691202..60f0f2d 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 375a27b..4165a66 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