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

[Stephan Bergmann (via logerrit)]

 sfx2/source/notify/globalevents.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 2ff77d088424bc3f5a8e38ef5c1aa3457d102eca
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Feb 18 17:19:38 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Feb 18 20:02:07 2020 +0100

    SfxGlobalEvents_Impl::m_xEvents is never changed and never null
    
    It is always set in the SfxGlobalEvents_Impl ctor with
    
      m_xEvents = new GlobalEventConfig();
    
    This code added with 3ddbfc311cd4471a6733b2d9dee338d3a80416c7 "INTEGRATION: CWS
    fwkpostbeta03" appears to be nonsense boilerplate.
    
    Change-Id: I6a6a75c619015815a8c6231862cd162de6361ecb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88969
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index 569ab3a98cb8..c1a1f674760c 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -355,15 +355,7 @@ void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const document::D
 {
     try
     {
-        // SAFE ->
-        osl::ClearableMutexGuard aLock(m_aLock);
-        uno::Reference< container::XNameReplace > xEvents = m_xEvents;
-        aLock.clear();
-        // <- SAFE
-
-        uno::Any aAny;
-        if ( xEvents.is() && xEvents->hasByName( aEvent.EventName ) )
-            aAny = xEvents->getByName(aEvent.EventName);
+        uno::Any aAny = m_xEvents->getByName(aEvent.EventName);
         SfxEvents_Impl::Execute(aAny, aEvent, nullptr);
     }
     catch ( uno::RuntimeException const & )