summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2009-01-29 10:50:15 +0000
committerRüdiger Timm <rt@openoffice.org>2009-01-29 10:50:15 +0000
commit32e6165baecd2a341ba898f7b0a886531be3eec4 (patch)
treeed9dcf69b713524ee52bd782a6a5d201b21bd6b5 /vcl
parent4c39ae976837fe7c6a7529234ae369e7cc4519b7 (diff)
CWS-TOOLING: integrate CWS metropatch01_DEV300
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx3
-rw-r--r--vcl/unx/source/window/salframe.cxx3
2 files changed, 6 insertions, 0 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index c00d14a4a587..ceeb17be66dd 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1288,6 +1288,9 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL /*bNoActivate*/ )
gtk_widget_hide( m_pWindow );
if( m_pIMHandler )
m_pIMHandler->focusChanged( false );
+ // flush here; there may be a very seldom race between
+ // the display connection used for clipboard and our connection
+ Flush();
}
CallCallback( SALEVENT_RESIZE, NULL );
}
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 157558f28125..65645f7b0369 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -1324,6 +1324,9 @@ void X11SalFrame::Show( BOOL bVisible, BOOL /*bNoActivate*/ )
XUngrabPointer( GetXDisplay(),
CurrentTime );
}
+ // flush here; there may be a very seldom race between
+ // the display connection used for clipboard and our connection
+ Flush();
}
}