diff options
| author | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-03-02 20:27:28 +0100 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-03-02 20:27:28 +0100 |
| commit | 65059ca0fa529270a520c78bf36a6f244bf66d73 (patch) | |
| tree | d6c42499d8ef649293ed46b5cda3b7cd8c43f158 /vcl/unx/gtk/window/gtkframe.cxx | |
| parent | 7a0a2ed6594a59db557e99646d8e128dcd7ee873 (diff) | |
| parent | 3f7378aed0d84eef9e7cc8d26dcbdc57dbf1a5ac (diff) | |
mtaccfixes: merge with DEV300_m73
Diffstat (limited to 'vcl/unx/gtk/window/gtkframe.cxx')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index b1d81ac026..e603687198 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gtkframe.cxx,v $ - * $Revision: 1.84.36.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -1322,7 +1319,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate ) setMinMaxSize(); // #i45160# switch to desktop where a dialog with parent will appear - if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea ) + if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea && GTK_WIDGET_MAPPED(m_pParent->m_pWindow) ) getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea ); if( isFloatGrabWindow() && |