diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-11-07 17:10:54 +0900 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-07 12:19:09 +0100 |
commit | 2168080905e9dbdc6100a34399a39b1a2df1975f (patch) | |
tree | ee55b863004e73552bf3fdab061af07cde1c7bba | |
parent | 9610bab09361f506fd7b1a5f81d796a1f2c8afe4 (diff) |
sfx2: SfxInPlaceClientList is just a std::vector
Change-Id: I6b676d17d9592a0ca998cdafb25b1aa12e11b6d6
Reviewed-on: https://gerrit.libreoffice.org/44384
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | sfx2/source/view/viewimp.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 18 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index 976869ac237e..6752ebaf788e 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -31,13 +31,15 @@ #include <rtl/ref.hxx> #include <vcl/print.hxx> #include <queue> +#include <vector> class SfxBaseController; typedef std::vector<SfxShell*> SfxShellArr_Impl; class SfxClipboardChangeListener; -class SfxInPlaceClientList; + +using SfxInPlaceClientList = std::vector<SfxInPlaceClient*>; struct SfxViewShell_Impl { diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 107a27ba6899..30efcb52b6b8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -207,24 +207,6 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c Application::PostUserEvent( LINK( nullptr, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo ); } -class SfxInPlaceClientList -{ - typedef std::vector<SfxInPlaceClient*> DataType; - DataType maData; - -public: - typedef DataType::iterator iterator; - - SfxInPlaceClient* at( size_t i ) { return maData.at(i); } - - iterator begin() { return maData.begin(); } - iterator end() { return maData.end(); } - - void push_back( SfxInPlaceClient* p ) { maData.push_back(p); } - void erase( const iterator& it ) { maData.erase(it); } - size_t size() const { return maData.size(); } -}; - sal_uInt32 SfxViewShell_Impl::m_nLastViewShellId = 0; SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags) |