diff options
| -rw-r--r-- | include/svx/xmlgrhlp.hxx | 11 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index c733ce5318bb..8a72664a5b55 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SVX_XMLGRHLP_HXX #define INCLUDED_SVX_XMLGRHLP_HXX +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <osl/mutex.hxx> #include <vcl/graph.hxx> #include <rtl/ref.hxx> @@ -46,12 +46,13 @@ struct SvxGraphicHelperStream_Impl css::uno::Reference < css::io::XStream > xStream; }; -class SVXCORE_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHelper<css::document::XGraphicObjectResolver, - css::document::XGraphicStorageHandler, - css::document::XBinaryStreamResolver> +class SVXCORE_DLLPUBLIC SvXMLGraphicHelper final : + public cppu::BaseMutex, + public cppu::WeakComponentImplHelper<css::document::XGraphicObjectResolver, + css::document::XGraphicStorageHandler, + css::document::XBinaryStreamResolver> { private: - ::osl::Mutex maMutex; css::uno::Reference < css::embed::XStorage > mxRootStorage; OUString maCurStorageName; std::vector< css::uno::Reference< css::io::XOutputStream > > diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 43195d1db82c..35d3a247c56a 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -369,7 +369,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() SvXMLGraphicHelper::SvXMLGraphicHelper(SvXMLGraphicHelperMode eCreateMode) : cppu::WeakComponentImplHelper<document::XGraphicObjectResolver, document::XGraphicStorageHandler, - document::XBinaryStreamResolver>(maMutex) + document::XBinaryStreamResolver>(m_aMutex) { Init( nullptr, eCreateMode ); } @@ -377,7 +377,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper(SvXMLGraphicHelperMode eCreateMode) SvXMLGraphicHelper::SvXMLGraphicHelper() : cppu::WeakComponentImplHelper<document::XGraphicObjectResolver, document::XGraphicStorageHandler, - document::XBinaryStreamResolver>(maMutex) + document::XBinaryStreamResolver>(m_aMutex) , meCreateMode(SvXMLGraphicHelperMode::Read) { } @@ -580,7 +580,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& / // XGraphicStorageHandler uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphic(OUString const & rURL) { - osl::MutexGuard aGuard(maMutex); + osl::MutexGuard aGuard(m_aMutex); uno::Reference<graphic::XGraphic> xGraphic; @@ -612,7 +612,7 @@ uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphic(OUStr uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphicFromOutputStream(uno::Reference<io::XOutputStream> const & rxOutputStream) { - osl::MutexGuard aGuard(maMutex); + osl::MutexGuard aGuard(m_aMutex); uno::Reference<graphic::XGraphic> xGraphic; |