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

[Oliver-Rainer Wittmann]

 sfx2/source/control/ctrlitem.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 06803677ef3b91ebaaa1d1338a403c578cebba99
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue Apr 30 11:21:46 2013 +0000

    invalidate used slot to avoid inconsistent state information
    
    Invalid state information may cause crashes due to not updated slot data
    
    (cherry picked from commit 7267a4b856d9fb37c3f4855c1be0f35219743923)
    
    Change-Id: I3bc3f934c5144fb0873e7a9694c3c012ddb0b367

diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 2b241c6..7a0d16d 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -384,6 +384,11 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const
             SfxShell *pSh = pDispat->GetShell( pServer->GetShellLevel() );
             SfxItemPool &rPool = pSh->GetPool();
             sal_uInt16 nWhich = rPool.GetWhich( nId );
+
+            // invalidate slot and its message|slot server as 'global' information
+            // about the validated message|slot server is not made available
+            pCache->Invalidate( sal_True );
+
             return rPool.GetMetric( nWhich );
         }
     }