summaryrefslogtreecommitdiff
path: root/svx/inc
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-02-13 08:52:52 +0100
committerDavid Tardon <dtardon@redhat.com>2013-02-15 07:31:27 +0100
commit115054fef08998c56cba8f14472df1d15007f635 (patch)
tree918c54f9e1607da0bd4f22f70716070b45435187 /svx/inc
parent3164966103b7d5c19197b7e94040d585e5af04ac (diff)
fdo#34548 don't crash on undoing text frame removal
Change-Id: I48b95c6c0cbfb2f4c4b09cc90b254b96de40b3e9
Diffstat (limited to 'svx/inc')
-rw-r--r--svx/inc/svx/svdundo.hxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 0d3713ea74a5..22211640e148 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -253,6 +253,10 @@ public:
//************************************************************
class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
+ class ObjListListener;
+ friend class ObjListListener;
+
+private:
bool bOwner;
protected:
@@ -262,6 +266,7 @@ protected:
sal_uInt32 nOrdNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
// statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
+ ObjListListener* m_pListener;
protected:
SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect = false);
@@ -270,6 +275,10 @@ protected:
void SetView(SdrView* pView1, SdrPageView* pPageView1) { pView=pView1; pPageView=pPageView1; }
bool IsOwner() { return bOwner; }
void SetOwner(bool bNew);
+
+private:
+ sal_uInt32 GetOrdNum() const;
+ void SetOrdNum(sal_uInt32 nOrdNum_);
};
//************************************************************