summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-06-21 13:25:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-09-27 10:58:27 +0200
commitb3d61e7991192986dcd7103d3c86ee50f8425504 (patch)
tree8b320223cf35920bed2378003a87aad730b706d6
parentcd19349339135af876d3c484813738c39a175a42 (diff)
fix crash when changing screen resolution
- m_aXineramaScreenIndexMap in GtkSalDisplay was shadowing the same field in SalDisplay, which led to crash in saldisp.cxx code in SalDisplay::addXineramaScreenUnique Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Michael Meeks <michael.meeks@novell.com>>
-rw-r--r--vcl/unx/inc/plugins/gtk/gtkdata.hxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index 93443f986f..db7ebcfe4d 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
@@ -60,7 +60,6 @@ class GtkSalDisplay : public SalDisplay
GdkDisplay* m_pGdkDisplay;
GdkCursor *m_aCursors[ POINTER_COUNT ];
bool m_bStartupCompleted;
- std::vector< int > m_aXineramaScreenIndexMap;
GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask,
int nWidth, int nHeight, int nXHot, int nYHot );