diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 13:16:25 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 13:16:25 +0000 |
commit | b3e80e1998855e815db71b19df0ebb1d800c94d6 (patch) | |
tree | 5ea04ac53ab4054fc7c60136bd4addbfb7d4a775 /framework | |
parent | ff7aa2f1641b323a7cd9c11ff980607190f66d96 (diff) |
INTEGRATION: CWS c07v013_SRC680 (1.26.88); FILE MERGED
2007/06/12 07:31:01 as 1.26.88.1: #b6553792# bring recycled frames to front (but dont grab focus)
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 08fb85038733..e13e312b7b58 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: loadenv.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: vg $ $Date: 2006-11-01 18:16:44 $ + * last change: $Author: rt $ $Date: 2007-07-03 14:16:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1590,7 +1590,11 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() if (aTasksAnalyzer.m_xBackingComponent.is()) { if (!impl_isFrameAlreadyUsedForLoading(aTasksAnalyzer.m_xBackingComponent)) + { + // bring it to front ... + impl_makeFrameWindowVisible(aTasksAnalyzer.m_xBackingComponent->getContainerWindow(), sal_True); return aTasksAnalyzer.m_xBackingComponent; + } } // These states indicates the wishing for creation of a new view in general. @@ -1693,6 +1697,9 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() aWriteLock.unlock(); // <- SAFE .................................. + // bring it to front ... + impl_makeFrameWindowVisible(xTask->getContainerWindow(), sal_True); + return xTask; } |