INTEGRATION: CWS dba24a (1.80.6); FILE MERGED

2007/08/29 13:21:59 oj 1.80.6.1: #i69084# lock and release mutex
This commit is contained in:
Jens-Heiner Rechtien 2007-09-26 13:48:32 +00:00
parent 73258d6209
commit 72aee61ab6

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: genericcontroller.cxx,v $ * $RCSfile: genericcontroller.cxx,v $
* *
* $Revision: 1.80 $ * $Revision: 1.81 $
* *
* last change: $Author: hr $ $Date: 2007-08-02 14:26:28 $ * last change: $Author: hr $ $Date: 2007-09-26 14:48:32 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -398,6 +398,7 @@ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeEx
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void OGenericUnoController::attachFrame(const Reference< XFrame > & xFrame) throw( RuntimeException ) void OGenericUnoController::attachFrame(const Reference< XFrame > & xFrame) throw( RuntimeException )
{ {
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
stopFrameListening( ); stopFrameListening( );