framework/source/xml/imagesdocumenthandler.cxx | 10 ---------- 1 file changed, 10 deletions(-)
New commits: commit 934d246e77659ec91321f57e9a244dc39e917150 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Jan 11 10:01:19 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jan 11 12:55:43 2022 +0100 OWriteImagesDocumentHandler doesnt need SolarMutex it is only ever used from a single thread. This was there since the beginning. Change-Id: If6c2929677ea1231cbf3326974451c3c6d51486f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128269 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 478a92f43b3c..2c0716d8eb47 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -300,8 +300,6 @@ OWriteImagesDocumentHandler::~OWriteImagesDocumentHandler() void OWriteImagesDocumentHandler::WriteImagesDocument() { - SolarMutexGuard g; - m_xWriteDocumentHandler->startDocument(); // write DOCTYPE line! commit c155710de15a400efa4b1bf33eabb549c2dafa25 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Jan 11 10:00:01 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jan 11 12:55:30 2022 +0100 OReadImagesDocumentHandler doesn't need SolarMutex it is only ever used from a single thread. This was there since the beginning. Change-Id: I7a2629071a3b2f3d4ddb6c7758a24515cfd5cebc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128268 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 7fcedae5134d..478a92f43b3c 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -129,8 +129,6 @@ void SAL_CALL OReadImagesDocumentHandler::startDocument() void SAL_CALL OReadImagesDocumentHandler::endDocument() { - SolarMutexGuard g; - if (m_bImageContainerStartFound != m_bImageContainerEndFound) { OUString aErrorMessage = getErrorLineString() + "No matching start or end element 'image:imagecontainer' found!"; @@ -141,8 +139,6 @@ void SAL_CALL OReadImagesDocumentHandler::endDocument() void SAL_CALL OReadImagesDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttribs ) { - SolarMutexGuard g; - ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName ); if ( pImageEntry == m_aImageMap.end() ) return; @@ -230,8 +226,6 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) { - SolarMutexGuard g; - ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName ); if ( pImageEntry == m_aImageMap.end() ) return; @@ -270,13 +264,11 @@ void SAL_CALL OReadImagesDocumentHandler::processingInstruction( void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) { - SolarMutexGuard g; m_xLocator = xLocator; } OUString OReadImagesDocumentHandler::getErrorLineString() { - SolarMutexGuard g; if ( m_xLocator.is() ) { return "Line: " +