summaryrefslogtreecommitdiff
path: root/sw/inc/tblsel.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-09-04 18:29:01 +0200
committerMichael Stahl <mstahl@redhat.com>2015-09-07 16:49:57 +0200
commitb7a5b788f37707f9d0c473877be9777ce784175a (patch)
treeba4850187e363e025f320139cd2bf78b6fd7502b /sw/inc/tblsel.hxx
parent8bf0e60d1da6d1ab79455dc916fd8701122812d2 (diff)
sw: convert boost::ptr_vector to std::vector<std::unique_ptr>
Change-Id: If8d9770717c21875b4472b0d94a1fa5a9d136085
Diffstat (limited to 'sw/inc/tblsel.hxx')
-rw-r--r--sw/inc/tblsel.hxx16
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index aa1001607b8f..2979dc941bc5 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -23,10 +23,13 @@
#include <swrect.hxx>
#include "swdllapi.h"
-#include <deque>
#include <boost/ptr_container/ptr_vector.hpp>
#include <o3tl/sorted_vector.hxx>
+#include <memory>
+#include <deque>
+#include <vector>
+
class SwCrsrShell;
class SwCursor;
class SwTableCursor;
@@ -151,23 +154,26 @@ class _FndBox;
class _FndLine;
typedef boost::ptr_vector<_FndBox> _FndBoxes;
-typedef boost::ptr_vector<_FndLine> _FndLines;
+typedef std::vector<std::unique_ptr<_FndLine>> FndLines_t;
class _FndBox
{
SwTableBox* pBox;
- _FndLines aLines;
+ FndLines_t m_Lines;
_FndLine* pUpper;
SwTableLine *pLineBefore; // For deleting/restoring the layout.
SwTableLine *pLineBehind;
+ _FndBox(_FndBox const&) = delete;
+ _FndBox& operator=(_FndBox const&) = delete;
+
public:
_FndBox( SwTableBox* pB, _FndLine* pFL ) :
pBox(pB), pUpper(pFL), pLineBefore( 0 ), pLineBehind( 0 ) {}
- const _FndLines& GetLines() const { return aLines; }
- _FndLines& GetLines() { return aLines; }
+ const FndLines_t& GetLines() const { return m_Lines; }
+ FndLines_t& GetLines() { return m_Lines; }
const SwTableBox* GetBox() const { return pBox; }
SwTableBox* GetBox() { return pBox; }
const _FndLine* GetUpper() const { return pUpper; }