[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx

[Bjoern Michaelsen]

 vcl/unx/inc/plugins/gtk/gtkdata.hxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit b3d61e7991192986dcd7103d3c86ee50f8425504
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jun 21 13:25:16 2011 +0200

    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 at canonical.com>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>>

diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index 93443f9..db7ebcf 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 );