mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SolarMutexGuard directly

Browse Source 
Change-Id: I0438d85b0c51010eff9e8d53ed8acada98563a20
This commit is contained in:
Stephan Bergmann 2014-03-18 14:34:20 +01:00
parent 3b45c88a40
commit e28207718c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/inc/xml/toolboxdocumenthandler.hxx
View File

@ -25,7 +25,6 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <threadhelp/threadhelpbase.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <stdtypes.h> #include <stdtypes.h>
@ -36,7 +35,7 @@ namespace framework{
// Hash code function for using in all hash maps of follow implementation. // Hash code function for using in all hash maps of follow implementation.
class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{ {
public: public:
@ -152,7 +151,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S
}; };
class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
{ {
public: public:
OWriteToolBoxDocumentHandler( OWriteToolBoxDocumentHandler(

15
framework/source/fwe/xml/toolboxdocumenthandler.cxx
View File

@ -20,7 +20,6 @@
#include <stdio.h> #include <stdio.h>
#include <threadhelp/guard.hxx>
#include <xml/toolboxdocumenthandler.hxx> #include <xml/toolboxdocumenthandler.hxx>
#include <xml/toolboxconfigurationdefines.hxx> #include <xml/toolboxconfigurationdefines.hxx>
@ -139,7 +138,6 @@ ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_CO
}; };
OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) : OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) :
ThreadHelpBase( &Application::GetSolarMutex() ),
m_rItemContainer( rItemContainer ), m_rItemContainer( rItemContainer ),
m_aType( ITEM_DESCRIPTOR_TYPE ), m_aType( ITEM_DESCRIPTOR_TYPE ),
m_aLabel( ITEM_DESCRIPTOR_LABEL ), m_aLabel( ITEM_DESCRIPTOR_LABEL ),
@ -204,7 +202,7 @@ throw ( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void) void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void)
throw( SAXException, RuntimeException, std::exception ) throw( SAXException, RuntimeException, std::exception )
{ {
Guard aGuard( m_aLock ); SolarMutexGuard g;
if (( m_bToolBarStartFound && !m_bToolBarEndFound ) || if (( m_bToolBarStartFound && !m_bToolBarEndFound ) ||
( !m_bToolBarStartFound && m_bToolBarEndFound ) ) ( !m_bToolBarStartFound && m_bToolBarEndFound ) )
@ -219,7 +217,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs ) const OUString& aName, const Reference< XAttributeList > &xAttribs )
throw( SAXException, RuntimeException, std::exception ) throw( SAXException, RuntimeException, std::exception )
{ {
Guard aGuard( m_aLock ); SolarMutexGuard g;
ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ; ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ;
if ( pToolBoxEntry != m_aToolBoxMap.end() ) if ( pToolBoxEntry != m_aToolBoxMap.end() )
@ -537,7 +535,7 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName)
throw( SAXException, RuntimeException, std::exception ) throw( SAXException, RuntimeException, std::exception )
{ {
Guard aGuard( m_aLock ); SolarMutexGuard g;
ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ; ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ;
if ( pToolBoxEntry != m_aToolBoxMap.end() ) if ( pToolBoxEntry != m_aToolBoxMap.end() )
@ -635,14 +633,14 @@ void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator) const Reference< XLocator > &xLocator)
throw( SAXException, RuntimeException, std::exception ) throw( SAXException, RuntimeException, std::exception )
{ {
Guard aGuard( m_aLock ); SolarMutexGuard g;
m_xLocator = xLocator; m_xLocator = xLocator;
} }
OUString OReadToolBoxDocumentHandler::getErrorLineString() OUString OReadToolBoxDocumentHandler::getErrorLineString()
{ {
Guard aGuard( m_aLock ); SolarMutexGuard g;
char buffer[32]; char buffer[32];
@ -663,7 +661,6 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString()
OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler(
const Reference< XIndexAccess >& rItemAccess, const Reference< XIndexAccess >& rItemAccess,
Reference< XDocumentHandler >& rWriteDocumentHandler ) : Reference< XDocumentHandler >& rWriteDocumentHandler ) :
ThreadHelpBase( &Application::GetSolarMutex() ),
m_xWriteDocumentHandler( rWriteDocumentHandler ), m_xWriteDocumentHandler( rWriteDocumentHandler ),
m_rItemAccess( rItemAccess ) m_rItemAccess( rItemAccess )
{ {
@ -681,7 +678,7 @@ OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
( SAXException, RuntimeException ) ( SAXException, RuntimeException )
{ {
Guard aGuard( m_aLock ); SolarMutexGuard g;
m_xWriteDocumentHandler->startDocument(); m_xWriteDocumentHandler->startDocument();