diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-09-17 16:02:44 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-25 08:53:16 +0000 |
| commit | 805df2f4131be1a62e64da87cc990c07481b988f (patch) | |
| tree | 6cda82c3fcfbb9fa65c27f80bbee28e748d94eef /svl | |
| parent | 0f8ed329131573289c98b8339f53e57abf67967d (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 54a83d411666..1409b9d74cd4 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, |