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

[Takeshi Abe]

 svl/source/svdde/ddesvr.cxx |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 805df2f4131be1a62e64da87cc990c07481b988f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Sep 17 16:02:44 2014 +0900

    fdo#75757: remove inheritance to std::vector
    
    from DdeItemImp.
    
    Change-Id: Idb26f982f96ddf1641fd8030d87c88b0cbc14f16
    Reviewed-on: https://gerrit.libreoffice.org/11482
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 54a83d4..1409b9d 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -42,7 +42,23 @@ struct DdeItemImpData
     DdeItemImpData( sal_uLong nH ) : nHCnv( nH ), nCnt( 1 ) {}
 };
 
-class DdeItemImp : public std::vector<DdeItemImpData> {};
+class DdeItemImp {
+public:
+    DdeItemImp() : mvData() {}
+
+    size_t size() const { return mvData.size(); }
+
+    std::vector<DdeItemImpData>::iterator begin() { return mvData.begin(); }
+
+    void erase(std::vector<DdeItemImpData>::iterator it) { mvData.erase(it); }
+
+    void push_back(const DdeItemImpData& rData) { mvData.push_back(rData); }
+
+    DdeItemImpData& operator[](size_t i) { return mvData[i]; }
+
+private:
+    std::vector<DdeItemImpData> mvData;
+};
 
 HDDEDATA CALLBACK DdeInternal::SvrCallback(
             WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,