fdo#75757 remove inheritance from std::vector

Removing TextLines class by the way

Change-Id: Ic491af976d61cac8e4b37857ff3a76570611d90d
Reviewed-on: https://gerrit.libreoffice.org/12474
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 5 insertions, 14 deletions

diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index b5e211807cb7..2834f0852b82 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -24,7 +24,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/cursor.hxx>
 
-#include <vector>
+#include <boost/ptr_container/ptr_vector.hpp>
 
 class TextNode;
 class TextView;
@@ -162,15 +162,6 @@ public:
     inline bool operator != ( const TextLine& rLine ) const;
 };
 
-class TextLines : public std::vector<TextLine*> {
-public:
-    ~TextLines()
-    {
-        for( iterator it = begin(); it != end(); ++it )
-            delete *it;
-    }
-};
-
 inline bool TextLine::operator == ( const TextLine& rLine ) const
 {
     return (    ( mnStart == rLine.mnStart ) &&
@@ -189,15 +180,15 @@ class TEParaPortion
 private:
     TextNode*               mpNode;
 
-    TextLines               maLines;
+    boost::ptr_vector<TextLine> maLines;
     TETextPortionList       maTextPortions;
     std::vector<TEWritingDirectionInfo> maWritingDirectionInfos;
 
-    sal_uInt16              mnInvalidPosStart;
+    sal_uInt16          mnInvalidPosStart;
     short               mnInvalidDiff;
 
     bool                mbInvalid;
-    bool                mbSimple;   // nur lineares Tippen
+    bool                mbSimple;   // only type linearly
 
                         TEParaPortion( const TEParaPortion& ) {;}
 
@@ -217,7 +208,7 @@ public:
     short               GetInvalidDiff() const      { return mnInvalidDiff; }
 
     TextNode*           GetNode() const             { return mpNode; }
-    TextLines&          GetLines()                  { return maLines; }
+    boost::ptr_vector<TextLine>& GetLines()         { return maLines; }
     TETextPortionList&  GetTextPortions()           { return maTextPortions; }
     std::vector<TEWritingDirectionInfo>& GetWritingDirectionInfos() { return maWritingDirectionInfos; }