From ada5fa7e88cc975355b9de8104d66dde6c19d0ab Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 17 Nov 2004 13:47:54 +0000 Subject: [PATCH] INTEGRATION: CWS dba18 (1.53.16); FILE MERGED 2004/11/10 15:37:12 oj 1.53.16.2: RESYNC: (1.53-1.55); FILE MERGED 2004/10/15 08:15:19 oj 1.53.16.1: #i30188# short cuts --- dbaccess/source/ui/browser/genericcontroller.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 0090a3d8d398..6409dd274bb6 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: obo $ $Date: 2004-11-16 14:31:01 $ + * last change: $Author: obo $ $Date: 2004-11-17 14:47:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -382,6 +382,7 @@ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeEx // ----------------------------------------------------------------------- void OGenericUnoController::attachFrame(const Reference< XFrame > & xFrame) throw( RuntimeException ) { + ::osl::MutexGuard aGuard(m_aMutex); stopFrameListening( ); m_xCurrentFrame = xFrame; @@ -391,6 +392,8 @@ void OGenericUnoController::attachFrame(const Reference< XFrame > & xFrame) thro loadMenu(xFrame); if ( m_xCurrentFrame.is() ) updateTitle(); + if ( getView() ) + getView()->attachFrame(xFrame); } // ----------------------------------------------------------------------------- void OGenericUnoController::updateTitle()