diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:51:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:51:14 +0000 |
| commit | 1f98910a952054fb4b69a5e2c8c6597af2b39b2b (patch) | |
| tree | d5d84c7f0ba866f2c51e9d05637c6759eb3e5966 /extensions | |
| parent | f5101c9c5abdb9577d798c2e75052c5cb00933e8 (diff) | |
INTEGRATION: CWS dba201b (1.25.134); FILE MERGED
2005/09/21 06:51:32 oj 1.25.134.2: RESYNC: (1.25-1.26); FILE MERGED
2005/07/11 13:56:12 fs 1.25.134.1: merging CWS dba201a into CWS dba201b
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/bibliography/framectr.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 2f39d2c483b7..6ec05fad24fc 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: framectr.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:17:39 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:51:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,6 +117,9 @@ #ifndef _COM_SUN_STAR_FRAME_COMMANDGROUP_HPP_ #include <com/sun/star/frame/CommandGroup.hpp> #endif +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif using namespace osl; using namespace cppu; @@ -238,6 +241,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno:: void BibFrameCtrl_Impl::disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); if ( pController ) pController->getFrame()->removeFrameActionListener( this ); } @@ -497,6 +501,7 @@ void BibFrameController_Impl::dispatch(const util::URL& aURL, const uno::Sequenc { if ( !bDisposing ) { + vos::OGuard aGuard(Application::GetSolarMutex()); Window* pParent = VCLUnoHelper::GetWindow( xWindow ); WaitObject aWaitObject( pParent ); |