summaryrefslogtreecommitdiff
path: root/vcl/source/window/window.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-01-28 19:19:29 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2010-01-28 19:19:29 +0000
commit5ae66b1fbadf8b2682f3f3716e298398d141826e (patch)
tree7e73c7540920a63da451c59f9766b000e11be0ba /vcl/source/window/window.cxx
parentfd5ee55b7b9ca4ce23c88b66c75d04b178a21891 (diff)
parentc0f197f920974f3fdaf8278dad16dc5ecb994d52 (diff)
koheidatapilot03: merge with DEV300_m63
Diffstat (limited to 'vcl/source/window/window.cxx')
-rw-r--r--vcl/source/window/window.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a011dfbc7551..c353771c8fde 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -6532,7 +6532,7 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
// nach vorne, wenn es gewuenscht ist
if ( ImplIsOverlapWindow() && !(nFlags & SHOW_NOACTIVATE) )
{
- ImplStartToTop( 0 );
+ ImplStartToTop(( nFlags & SHOW_FOREGROUNDTASK ) ? TOTOP_FOREGROUNDTASK : 0 );
ImplFocusToTop( 0, FALSE );
}