[libreoffice/f16] Resolves: rhbz#751982 shadowed m_aXineramaScreenIndexMap

[Caolán McNamara]

commit cbff17651e22d5c76c55959b98ddfc9117e01a64
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 10 11:10:29 2011 +0000

    Resolves: rhbz#751982 shadowed m_aXineramaScreenIndexMap

 0001-make-sure-we-stay-in-array-bounds.patch |   24 ++++++++++++------------
 libreoffice.spec                             |    5 ++++-
 2 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/0001-make-sure-we-stay-in-array-bounds.patch b/0001-make-sure-we-stay-in-array-bounds.patch
index 81d262c..6b3b718 100644
--- a/0001-make-sure-we-stay-in-array-bounds.patch
+++ b/0001-make-sure-we-stay-in-array-bounds.patch
@@ -1,12 +1,3 @@
-From dcb9d674c898d33f1895871c38ec308a460e9400 Mon Sep 17 00:00:00 2001
-From: Radek Doulik <rodo at novell.com>
-Date: Thu, 1 Sep 2011 11:14:21 +0200
-Subject: [PATCH] make sure we stay in array bounds
-
----
- vcl/unx/gtk/app/gtkdata.cxx |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
 diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
 index b68d023..c5d12c8 100644
 --- a/vcl/unx/gtk/app/gtkdata.cxx
@@ -24,6 +15,15 @@ index b68d023..c5d12c8 100644
      }
  #endif
      return 0;
--- 
-1.7.6.4
-
+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 );
diff --git a/libreoffice.spec b/libreoffice.spec
index 432d6d9..cd25d71 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.3.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -2112,6 +2112,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Thu Nov 10 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.3.2-16
+- Resolves: rhbz#751982 shadowed m_aXineramaScreenIndexMap crash
+
 * Thu Oct 27 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.3.2-15
 - Related: rhbz#748585 throw the additional requires away, because it
   does not help