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

[Caolán McNamara (via logerrit)]

 framework/source/fwe/classes/rootactiontriggercontainer.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 4304856bfbc7f2a1a5f609b90e404e103268598f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Dec 11 21:13:33 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 12 15:58:11 2021 +0100

    these aSolarMutexGuard calls are redundant now
    
    Change-Id: Ic167b8d40c1c93f5e6f4408d260c4e70b4017fd6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126693
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx 
b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 0325ede70ea0..868a2632f622 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -151,10 +151,7 @@ sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
     if ( !m_bContainerCreated )
     {
         if ( m_xMenu )
-        {
-            SolarMutexGuard aSolarMutexGuard;
             return m_xMenu->getItemCount();
-        }
         else
             return 0;
     }
@@ -183,11 +180,7 @@ Type SAL_CALL RootActionTriggerContainer::getElementType()
 sal_Bool SAL_CALL RootActionTriggerContainer::hasElements()
 {
     if (m_xMenu)
-    {
-        SolarMutexGuard aSolarMutexGuard;
         return m_xMenu->getItemCount() > 0;
-    }
-
     return false;
 }