diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:16:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:16:44 +0000 |
| commit | 0df2c238da5dece18ac6168048787abe88ad8e34 (patch) | |
| tree | 4093114a1598abea90f2bce5d665e27ff21223b5 | |
| parent | 11f79ec299e53b48719c55933f7d307038a5f1d5 (diff) | |
INTEGRATION: CWS inplaceobjects (1.23.80); FILE MERGED
2006/09/28 18:27:08 mba 1.23.80.4: RESYNC: (1.24-1.25); FILE MERGED
2006/07/06 22:26:37 mba 1.23.80.3: merge problem solved
2006/07/06 13:12:04 mba 1.23.80.2: RESYNC: (1.23-1.24); FILE MERGED
2006/06/09 10:37:34 mba 1.23.80.1: #i66239#: don't grab focus if not requested by OS of by user
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 772cf0234f1e..08fb85038733 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: loadenv.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:05:26 $ + * last change: $Author: vg $ $Date: 2006-11-01 18:16:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1807,14 +1807,14 @@ void LoadEnv::impl_reactForLoadingState() 16.01.2005 13:04 -----------------------------------------------*/ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , - sal_Bool /*bForceToFront*/) + sal_Bool bForceToFront) { css::uno::Reference< css::awt::XTopWindow > xTopWindow(xWindow, css::uno::UNO_QUERY); if (xWindow.is()) xWindow->setVisible(sal_True); - if (xTopWindow.is()) + if (xTopWindow.is() && bForceToFront) xTopWindow->toFront(); /* #i19976# |