summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.co.uk>2017-08-08 17:02:19 +0530
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-08-09 09:09:55 +0200
commit1571964b4f7c38f47e47973fb06a0589d11d17b5 (patch)
tree3b953e13a1821a0dd56bf9ab5234a2686e4d4fc0
parent3a7a2b4f97d5e02f73f22c4868f4b0a97d8f22b8 (diff)
tdf#108802 : In SfxControllerItem::dispose do not directly...
call pBindings->Release(), but call UnBind() instead which correctly sets the state to "UnBound" by setting pNext = this. Thanks to Miklos Vajna for pointing this out ! Change-Id: I08e85496cff6df0952d6c5ec4ee979a93b8862d0 Reviewed-on: https://gerrit.libreoffice.org/40882 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> (cherry picked from commit 2585eb9d15f5c047d846ccb4b4d606d9ac89e518) Reviewed-on: https://gerrit.libreoffice.org/40907 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sfx2/source/control/ctrlitem.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index cd22920f144e..dadead816898 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -203,7 +203,7 @@ SfxControllerItem::~SfxControllerItem()
void SfxControllerItem::dispose()
{
if ( IsBound() )
- pBindings->Release(*this);
+ UnBind();
}
void SfxControllerItem::StateChanged