summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-12-05 17:45:58 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-12-05 20:11:51 +0100
commit7c1b420c0f094eee1020806a75f4baa48c3d5d2b (patch)
tree33b172ba5be91c4fb38a9174ed86d0d9ba52d76f /sw/inc
parentc7b57c6c2b15a4b9f65dafb642e3f1da402e62ca (diff)
removing in callback should be alright, we update the iterators
Change-Id: Iefaee20a603fa3f43a58107ea54e6e3f7a4d344f
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/calbck.hxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 3f6ca203f2c5..68fa315b4061 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -67,11 +67,6 @@ class SW_DLLPUBLIC SwClient : ::boost::noncopyable
SwClient *pLeft, *pRight; ///< double-linked list of other clients
SwModify *pRegisteredIn; ///< event source
- // in general clients should not be removed when their SwModify sends out Modify()
- // notifications; in some rare cases this is necessary, but only the concrete SwClient
- // sub class will know that; this flag allows to make that known
- bool mbIsAllowedToBeRemovedInModifyCall;
-
// callbacks received from SwModify (friend class - so these methods can be private)
// should be called only from SwModify the client is registered in
// mba: IMHO these methods should be pure virtual
@@ -84,7 +79,6 @@ protected:
// write access to pRegisteredIn shall be granted only to the object itself (protected access)
SwModify* GetRegisteredInNonConst() const { return pRegisteredIn; }
- void SetIsAllowedToBeRemovedInModifyCall( bool bSet ) { mbIsAllowedToBeRemovedInModifyCall = bSet; }
public:
@@ -112,7 +106,7 @@ public:
};
inline SwClient::SwClient() :
- pLeft(0), pRight(0), pRegisteredIn(0), mbIsAllowedToBeRemovedInModifyCall(false)
+ pLeft(0), pRight(0), pRegisteredIn(0)
{}
// SwModify