summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx11
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx3
2 files changed, 10 insertions, 4 deletions
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index b2b02d8f05af..927b8548a77a 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: atkwrapper.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.52.1 $
*
* This file is part of OpenOffice.org.
*
@@ -344,8 +344,13 @@ wrapper_get_name( AtkObject *atk_obj )
obj->mpContext->getAccessibleName(),
RTL_TEXTENCODING_UTF8);
- g_free(atk_obj->name);
- atk_obj->name = g_strdup(aName.getStr());
+ int nCmp = atk_obj->name ? rtl_str_compare( atk_obj->name, aName.getStr() ) : -1;
+ if( nCmp != 0 )
+ {
+ if( atk_obj->name )
+ g_free(atk_obj->name);
+ atk_obj->name = g_strdup(aName.getStr());
+ }
}
catch(const uno::Exception& e) {
g_warning( "Exception in getAccessibleName()" );
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 00e5f6215cd7..c00d14a4a587 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gtkframe.cxx,v $
- * $Revision: 1.84 $
+ * $Revision: 1.84.36.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1624,6 +1624,7 @@ void GtkSalFrame::moveToScreen( int nScreen )
GtkSalDisplay* pDisp = getDisplay();
m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(m_pWindow->window);
m_aSystemData.pVisual = pDisp->GetVisual( m_nScreen ).GetVisual();
+ m_aSystemData.nScreen = nScreen;
m_aSystemData.nDepth = pDisp->GetVisual( m_nScreen ).GetDepth();
m_aSystemData.aColormap = pDisp->GetColormap( m_nScreen ).GetXColormap();
m_aSystemData.pAppContext = NULL;