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

[Takeshi Abe]

 sw/source/filter/ww8/ww8par2.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 7da303f371c4bcfd8bde284e47a7e2d20c6cb719
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Oct 13 18:04:18 2016 +0900

    sw: Remove inheritance from std::vector
    
    Change-Id: I1b0e42149a91d9e92d227659147584beb27a5704
    Reviewed-on: https://gerrit.libreoffice.org/29753
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 34fb283..2e5b820 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -76,9 +76,10 @@
 using namespace ::com::sun::star;
 
 class WW8SelBoxInfo
-    : public std::vector<SwTableBox*>
 {
 private:
+    std::vector<SwTableBox*> m_vBoxes;
+
     WW8SelBoxInfo(WW8SelBoxInfo const&) = delete;
     WW8SelBoxInfo& operator=(WW8SelBoxInfo const&) = delete;
 
@@ -90,6 +91,12 @@ public:
     WW8SelBoxInfo(short nXCenter, short nWidth)
         : nGroupXStart( nXCenter ), nGroupWidth( nWidth ), bGroupLocked(false)
     {}
+
+    size_t size() const { return m_vBoxes.size(); }
+
+    SwTableBox* operator[]( size_t nIndex ) { return m_vBoxes[nIndex]; }
+
+    void push_back( SwTableBox* pBox ) { m_vBoxes.push_back(pBox); }
 };
 
 WW8TabBandDesc::WW8TabBandDesc()