summaryrefslogtreecommitdiff
path: root/sw/source/core/inc/frame.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-01-04 15:35:21 +0100
committerMichael Stahl <mstahl@redhat.com>2018-01-04 16:22:33 +0100
commit794e54cd34239006270a00a6e5017acc463063f9 (patch)
tree1a06fbf34fffcacfb911a072986390da33d2e87d /sw/source/core/inc/frame.hxx
parent67e1e2ee40dba196f706afb43d0379b29c3c0f42 (diff)
sw: convert SwFrame::mpDrawObjs to unique_ptr
Change-Id: I0713e6fb2b3f2cfc3115daafe37ae5380f3e7938
Diffstat (limited to 'sw/source/core/inc/frame.hxx')
-rw-r--r--sw/source/core/inc/frame.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 9d3ca61708de..7ecbefc600a9 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -32,6 +32,8 @@
#include <com/sun/star/style/TabStop.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <memory>
+
class SwLayoutFrame;
class SwRootFrame;
class SwPageFrame;
@@ -378,7 +380,7 @@ class SW_DLLPUBLIC SwFrame : public SwFrameAreaDefinition, public SwClient, publ
SwPageFrame* ImplFindPageFrame();
protected:
- SwSortedObjs* mpDrawObjs; // draw objects, can be 0
+ std::unique_ptr<SwSortedObjs> m_pDrawObjs; // draw objects, can be null
SwFrameType mnFrameType; //Who am I?
bool mbInDtor : 1;
@@ -524,8 +526,8 @@ public:
// work with chain of FlyFrames
void AppendFly( SwFlyFrame *pNew );
void RemoveFly( SwFlyFrame *pToRemove );
- const SwSortedObjs *GetDrawObjs() const { return mpDrawObjs; }
- SwSortedObjs *GetDrawObjs() { return mpDrawObjs; }
+ const SwSortedObjs *GetDrawObjs() const { return m_pDrawObjs.get(); }
+ SwSortedObjs *GetDrawObjs() { return m_pDrawObjs.get(); }
// #i28701# - change purpose of method and adjust its name
void InvalidateObjs( const bool _bNoInvaOfAsCharAnchoredObjs = true );