diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-04 21:30:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-07 16:49:58 +0200 |
| commit | a68eaa09a4979dc4814301f137e4186c85dee54f (patch) | |
| tree | be5a055e8fd7e6214f1b037d47bb9c3f9edb5ba0 /sw/inc/tblsel.hxx | |
| parent | b7a5b788f37707f9d0c473877be9777ce784175a (diff) | |
sw: convert boost::ptr_vector to std::vector<std::unique_ptr>
Change-Id: I341fb7c0712dff77ebfed41560a487f85c27c25a
Diffstat (limited to 'sw/inc/tblsel.hxx')
| -rw-r--r-- | sw/inc/tblsel.hxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 2979dc941bc5..1b7000e3883b 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -153,7 +153,7 @@ void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart, class _FndBox; class _FndLine; -typedef boost::ptr_vector<_FndBox> _FndBoxes; +typedef std::vector<std::unique_ptr<_FndBox>> FndBoxes_t; typedef std::vector<std::unique_ptr<_FndLine>> FndLines_t; class _FndBox @@ -194,12 +194,16 @@ public: class _FndLine { SwTableLine* pLine; - _FndBoxes aBoxes; + FndBoxes_t m_Boxes; _FndBox* pUpper; + + _FndLine(_FndLine const&) = delete; + _FndLine& operator=(_FndLine const&) = delete; + public: _FndLine(SwTableLine* pL, _FndBox* pFB=0) : pLine(pL), pUpper(pFB) {} - const _FndBoxes& GetBoxes() const { return aBoxes; } - _FndBoxes& GetBoxes() { return aBoxes; } + const FndBoxes_t& GetBoxes() const { return m_Boxes; } + FndBoxes_t& GetBoxes() { return m_Boxes; } const SwTableLine* GetLine() const { return pLine; } SwTableLine* GetLine() { return pLine; } const _FndBox* GetUpper() const { return pUpper; } |