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

[Michael Stahl]

 svtools/source/graphic/provider.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit aa3b39b0bd65158ec3156e0a1391973507ebd19e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 10 00:11:31 2013 +0200

    unographic::GraphicProvider: lock SolarMutex as needed
    
    ... thanks to bug report from David O.
    
    Change-Id: I7a72c36848a110fe7487c85c7720990d3c1e14de

diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 9a5fa4e..16594c1 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -380,6 +380,8 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
         }
     }
 
+    SolarMutexGuard g;
+
     if( xIStm.is() )
     {
         GraphicDescriptor* pDescriptor = new GraphicDescriptor;
@@ -483,6 +485,8 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
         }
     }
 
+    SolarMutexGuard g;
+
     if( xIStm.is() )
     {
         pIStm = ::utl::UcbStreamHelper::CreateStream( xIStm );
@@ -769,6 +773,8 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
 void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties )
     throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
+    SolarMutexGuard g;
+
     SvStream*   pOStm = NULL;
     OUString    aPath;
     sal_Int32   i;