[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sfx2/source

[Dennis Francis]

 sfx2/source/control/ctrlitem.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1571964b4f7c38f47e47973fb06a0589d11d17b5
Author: Dennis Francis <dennis.francis at collabora.co.uk>
Date:   Tue Aug 8 17:02:19 2017 +0530

    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 at libreoffice.org>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.co.uk>
    (cherry picked from commit 2585eb9d15f5c047d846ccb4b4d606d9ac89e518)
    Reviewed-on: https://gerrit.libreoffice.org/40907
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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