diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index b9cd3509376f..0168abd93280 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -24,7 +24,6 @@ #include -#include #include #include @@ -37,7 +36,7 @@ namespace framework{ // Hash code function for using in all hash maps of follow implementation. -class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -126,7 +125,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; -class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler { public: OWriteStatusBarDocumentHandler( diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index a0f45f7850b7..6837dbb8d170 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -20,7 +20,6 @@ #include -#include #include #include @@ -147,7 +146,6 @@ StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_EN OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( const Reference< XIndexContainer >& rStatusBarItems ) : - ThreadHelpBase( &Application::GetSolarMutex() ), m_aStatusBarItems( rStatusBarItems ) { OUString aNamespaceStatusBar( XMLNS_STATUSBAR ); @@ -191,7 +189,7 @@ throw ( SAXException, RuntimeException, std::exception ) void SAL_CALL OReadStatusBarDocumentHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { - Guard aGuard( m_aLock ); + SolarMutexGuard g; if (( m_bStatusBarStartFound && !m_bStatusBarEndFound ) || ( !m_bStatusBarStartFound && m_bStatusBarEndFound ) ) @@ -206,7 +204,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttribs ) throw( SAXException, RuntimeException, std::exception ) { - Guard aGuard( m_aLock ); + SolarMutexGuard g; StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName ) ; if ( pStatusBarEntry != m_aStatusBarMap.end() ) @@ -405,7 +403,7 @@ throw( SAXException, RuntimeException, std::exception ) void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName) throw( SAXException, RuntimeException, std::exception ) { - Guard aGuard( m_aLock ); + SolarMutexGuard g; StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName ) ; if ( pStatusBarEntry != m_aStatusBarMap.end() ) @@ -464,14 +462,14 @@ void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) throw( SAXException, RuntimeException, std::exception ) { - Guard aGuard( m_aLock ); + SolarMutexGuard g; m_xLocator = xLocator; } OUString OReadStatusBarDocumentHandler::getErrorLineString() { - Guard aGuard( m_aLock ); + SolarMutexGuard g; char buffer[32]; @@ -492,7 +490,6 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString() OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( const Reference< XIndexAccess >& aStatusBarItems, const Reference< XDocumentHandler >& rWriteDocumentHandler ) : - ThreadHelpBase( &Application::GetSolarMutex() ), m_aStatusBarItems( aStatusBarItems ), m_xWriteDocumentHandler( rWriteDocumentHandler ) { @@ -510,7 +507,7 @@ OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler() void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw ( SAXException, RuntimeException ) { - Guard aGuard( m_aLock ); + SolarMutexGuard g; m_xWriteDocumentHandler->startDocument();