diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-10-16 17:08:15 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-16 12:56:58 +0200 |
| commit | 98fbe10fa3a8e9d795f9ee294b14585efe4c615a (patch) | |
| tree | 1962e3a0a53a6f62e1819c564f082b9193ebd6f8 | |
| parent | 1ca2a2119ad3e910f848344d51ba9ec173880715 (diff) | |
svl: Drop unnecessary abstraction of DdeItemImp
Instead, just use std::vector<DdeItemImpData>.
Change-Id: If0c4943bdf370211cd6e0466a899da718480a4ae
Reviewed-on: https://gerrit.libreoffice.org/43415
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svl/svdde.hxx | 4 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 20 |
2 files changed, 3 insertions, 21 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 2415ad8e03ba..003a14f83923 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -43,7 +43,7 @@ class DdeTopic; class DdeService; struct DdeDataImp; struct DdeImp; -class DdeItemImp; +struct DdeItemImpData; struct Conversation; typedef ::std::vector< DdeService* > DdeServices; @@ -207,7 +207,7 @@ class SVL_DLLPUBLIC DdeItem friend class DdeTopic; DdeString* pName; DdeTopic* pMyTopic; - DdeItemImp* pImpData; + std::vector<DdeItemImpData>* pImpData; protected: sal_uInt8 nType; diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index ad46b8a85ab5..8eedadf6ddf6 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -41,24 +41,6 @@ struct DdeItemImpData explicit DdeItemImpData( HCONV nH ) : nHCnv( nH ), nCnt( 1 ) {} }; -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( UINT nCode, UINT nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, ULONG_PTR, ULONG_PTR ) @@ -755,7 +737,7 @@ void DdeInternal::IncMonitor(DdeItem *const pItem, HCONV nHCnv) { if (!pItem->pImpData) { - pItem->pImpData = new DdeItemImp; + pItem->pImpData = new std::vector<DdeItemImpData>; if (DDEGETPUTITEM == pItem->nType) { static_cast<DdeGetPutItem*>(pItem)->AdviseLoop( true ); |