From 39a3b48068b157cee7a76dbb9aa091cdc4dce0fb Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 9 Nov 2004 14:11:20 +0000 Subject: INTEGRATION: CWS fwkpp2fix01 (1.9.8); FILE MERGED 2004/10/26 12:34:53 kso 1.9.8.1: #i35900# - DocumentHolder::[Show|Hide]UI now sets/resets active frame at parent frame. --- embeddedobj/source/general/docholder.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'embeddedobj/source') diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index b365fa4fc59d..678af7533510 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docholder.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:52:40 $ + * last change: $Author: rt $ $Date: 2004-11-09 15:11:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -751,6 +751,11 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::drafts::com::sun::star: bResult = sal_True; } + + uno::Reference< frame::XFramesSupplier > xSupp( + m_xFrame->getCreator(), uno::UNO_QUERY ); + if ( xSupp.is() ) + xSupp->setActiveFrame( m_xFrame ); } catch( uno::Exception& ) { @@ -793,6 +798,11 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::drafts::com::sun::star: if ( xOwnLM.is() ) { try { + uno::Reference< frame::XFramesSupplier > xSupp( + m_xFrame->getCreator(), uno::UNO_QUERY ); + if ( xSupp.is() ) + xSupp->setActiveFrame( 0 ); + uno::Reference< drafts::com::sun::star::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::UNO_QUERY_THROW ); xMerge->removeMergedMenuBar(); -- cgit