[Libreoffice-commits] core.git: 2 commits - sfx2/source starmath/source

[László Németh]

 sfx2/source/control/bindings.cxx |    4 ++--
 starmath/source/view.cxx         |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 17cdc92e46e84ec8d99dedfdd9e8e96fb950f6ea
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Mon Jun 15 10:57:58 2015 +0200

    starmath: dispose SmEditController object correctly
    
    Change-Id: I5d44ff6d514d2e40df23f6c419463b980f39d2c7

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 4e4ad79..b6b1480 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -727,6 +727,7 @@ void SmCmdBoxWindow::dispose()
 {
     aInitialFocusTimer.Stop();
     bExiting = true;
+    aController.dispose();
     aEdit.disposeAndClear();
     SfxDockingWindow::dispose();
 }
commit d505f1600d9aeb095405b9f62eaf444d5d399860
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Mon Jun 15 10:52:22 2015 +0200

    tdf#91721: fix crash during listbox control editing in database form
    
    Change-Id: I415ccb6132b802f62c93367a050242aee3c128b1

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 8c38703..cc65fa6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1030,8 +1030,8 @@ void SfxBindings::Release( SfxControllerItem& rItem )
     // find the bound function
     sal_uInt16 nId = rItem.GetId();
     sal_uInt16 nPos = GetSlotPos(nId);
-    SfxStateCache* pCache = (*pImp->pCaches)[nPos];
-    if ( pCache->GetId() == nId )
+    SfxStateCache* pCache = (nPos < pImp->pCaches->size()) ? (*pImp->pCaches)[nPos] : 0;
+    if ( pCache && pCache->GetId() == nId )
     {
         if ( pCache->GetInternalController() == &rItem )
         {