diff options
Diffstat (limited to 'svx/source/xml/xmlgrhlp.cxx')
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 35d3a247c56a..96be71b78769 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -367,18 +367,12 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() } SvXMLGraphicHelper::SvXMLGraphicHelper(SvXMLGraphicHelperMode eCreateMode) - : cppu::WeakComponentImplHelper<document::XGraphicObjectResolver, - document::XGraphicStorageHandler, - document::XBinaryStreamResolver>(m_aMutex) { Init( nullptr, eCreateMode ); } SvXMLGraphicHelper::SvXMLGraphicHelper() - : cppu::WeakComponentImplHelper<document::XGraphicObjectResolver, - document::XGraphicStorageHandler, - document::XBinaryStreamResolver>(m_aMutex) - , meCreateMode(SvXMLGraphicHelperMode::Read) + : meCreateMode(SvXMLGraphicHelperMode::Read) { } @@ -386,10 +380,6 @@ SvXMLGraphicHelper::~SvXMLGraphicHelper() { } -void SAL_CALL SvXMLGraphicHelper::disposing() -{ -} - bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr, OUString& rPictureStorageName, OUString& rPictureStreamName ) @@ -580,7 +570,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& / // XGraphicStorageHandler uno::Reference<graphic::XGraphic> SAL_CALL SvXMLGraphicHelper::loadGraphic(OUString const & rURL) { - osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); uno::Reference<graphic::XGraphic> xGraphic; @@ -612,7 +602,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(m_aMutex); + std::unique_lock aGuard(m_aMutex); uno::Reference<graphic::XGraphic> xGraphic; |