[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-2-16-g934436a
The following commit has been merged in the master branch:
commit 934436afa33f5b11421a0d2bdaaa96ae9b0f327b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Sep 27 17:39:12 2011 +0200
fixing crash on screen resolution change (LP: #852819)
diff --git a/changelog b/changelog
index 72b4e98..a6df49b 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,7 @@ libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
* merge from ubuntu-oneiric-3.4:
- fixing crash on closing document with footnotes (LP: #854626)
+ - fixing crash on screen resolution change (LP: #852819)
-- Rene Engelhard <rene@debian.org> Mon, 26 Sep 2011 21:39:11 +0000
diff --git a/patches/lp852819.diff b/patches/lp852819.diff
new file mode 100644
index 0000000..caba4da
--- /dev/null
+++ b/patches/lp852819.diff
@@ -0,0 +1,33 @@
+--- /dev/null 2011-09-27 10:43:04.452932903 +0200
++++ libreoffice/libreoffice-build/patches/hotfixes/lp852819.diff 2011-09-27 17:30:56.828820094 +0200
+@@ -0,0 +1,30 @@
++From b3d61e7991192986dcd7103d3c86ee50f8425504 Mon Sep 17 00:00:00 2001
++From: Radek Doulik <rodo@novell.com>
++Date: Tue, 21 Jun 2011 13:25:16 +0200
++Subject: [PATCH] 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>>
++---
++ vcl/unx/inc/plugins/gtk/gtkdata.hxx | 1 -
++ 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 93443f9..db7ebcf 100644
++--- vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++++ 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 );
++--
++1.7.5.4
++
diff --git a/patches/series b/patches/series
index cc374c5..acf6845 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ handle-NULL-display-gracefully.diff
jdk-1.7.0-vendorname.diff
s390x.diff
fdo39510.diff
+lp852819.diff
--
LibreOffice packaging repository
Reply to: