diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-30 09:14:53 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-30 09:14:53 +0000 |
commit | 80dd0b2a020428fdcce5e6907e1a88e001d72e0d (patch) | |
tree | 9e834963867b30cf026396a05789b6f3f0451d2f /embeddedobj/source/general | |
parent | c8a34493b7bef0fa1ff99d9bebf1754b37d81632 (diff) |
INTEGRATION: CWS fwk21 (1.19.26); FILE MERGED
2005/08/15 15:50:51 mav 1.19.26.1: #i53031# when object is UI activated the window must get the focus
Diffstat (limited to 'embeddedobj/source/general')
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 4c46c1f1fa52..87cf1a5d6c47 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docholder.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hr $ $Date: 2005-09-23 15:44:51 $ + * last change: $Author: hr $ $Date: 2005-09-30 10:14:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -782,6 +782,11 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame:: m_xFrame->getCreator(), uno::UNO_QUERY ); if ( xSupp.is() ) xSupp->setActiveFrame( m_xFrame ); + + // TODO/LATER: The following action should be done only if the window is not hidden + // otherwise the activation must fail, unfortunatelly currently it is not possible + // to detect whether the window is hidden using UNO API + m_xOwnWindow->setFocus(); } catch( uno::Exception& ) { |