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

[Noel Grandin (via logerrit)]

 framework/source/fwe/xml/toolboxdocumenthandler.cxx |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 72493fe922ffe91c6587f660f82f99a229e4d6fd
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jan 11 10:12:32 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jan 11 12:55:57 2022 +0100

    OWriteToolBoxDocumentHandler doesnt need SolarMutex
    
    it is only ever used from a single thread. This was there
    since the beginning.
    
    Change-Id: I580cf86457b2983cd7729bce32cbc0ccca601005
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128270
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx 
b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 11385edd9b5c..57e28628273e 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -180,8 +180,6 @@ void SAL_CALL OReadToolBoxDocumentHandler::startDocument()
 
 void SAL_CALL OReadToolBoxDocumentHandler::endDocument()
 {
-    SolarMutexGuard g;
-
     if ( m_bToolBarStartFound )
     {
         OUString aErrorMessage = getErrorLineString() + "No matching start or 
end element 'toolbar' found!";
@@ -192,8 +190,6 @@ void SAL_CALL OReadToolBoxDocumentHandler::endDocument()
 void SAL_CALL OReadToolBoxDocumentHandler::startElement(
     const OUString& aName, const Reference< XAttributeList > &xAttribs )
 {
-    SolarMutexGuard g;
-
     ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName );
     if ( pToolBoxEntry == m_aToolBoxMap.end() )
         return;
@@ -461,8 +457,6 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
 
 void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName)
 {
-    SolarMutexGuard g;
-
     ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName );
     if ( pToolBoxEntry == m_aToolBoxMap.end() )
         return;
@@ -549,15 +543,11 @@ void SAL_CALL 
OReadToolBoxDocumentHandler::processingInstruction(
 void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator(
     const Reference< XLocator > &xLocator)
 {
-    SolarMutexGuard g;
-
     m_xLocator = xLocator;
 }
 
 OUString OReadToolBoxDocumentHandler::getErrorLineString()
 {
-    SolarMutexGuard g;
-
     if ( m_xLocator.is() )
         return "Line: " + OUString::number( m_xLocator->getLineNumber() ) + " 
- ";
     else
@@ -584,8 +574,6 @@ 
OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
 
 void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
 {
-    SolarMutexGuard g;
-
     m_xWriteDocumentHandler->startDocument();
 
     // write DOCTYPE line!