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

[Michael Stahl]

 framework/source/helper/statusindicatorfactory.cxx |    5 ++++-
 sfx2/source/view/frmload.cxx                       |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b1f5986c57445588d513eefff9c4e8ceb6f0f75a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Nov 3 13:45:54 2013 +0100

    StatusIndicatorFactory::impl_reschedule(): lock SolarMutex
    
    ... before calling Reschedule().
    
    Change-Id: I244fdd1a4642ea0e1ad266f6d9c4c56527018952

diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 4555dce..b2e3762 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -573,7 +573,10 @@ void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce)
         aGlobalLock.unlock();
         // <- SAFE
 
-        Application::Reschedule(true);
+        {
+            SolarMutexGuard g;
+            Application::Reschedule(true);
+        }
 
         // SAFE ->
         aGlobalLock.lock();
commit 2faa8537b661bb8ca427e0f39547fe49b6ac2325
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Nov 3 13:45:08 2013 +0100

    SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() silly mutex
    
    Change-Id: I5b9ffed3527b5be544a7aa57f67840d30b4ebff5

diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index b7dfc24..a54f877a 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -671,7 +671,6 @@ Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() th
 /* Helper for XServiceInfo */
 Sequence< OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames()
 {
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
     Sequence< OUString > seqServiceNames( 2 );
     seqServiceNames.getArray() [0] = OUString( "com.sun.star.frame.SynchronousFrameLoader" );
     seqServiceNames.getArray() [1] = OUString( "com.sun.star.frame.OfficeFrameLoader" );