[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.3-1-228-g76adda0
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 76adda005add6a2165e1a08091b0fe6d1ac140c3
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 11abbab..ce0d40e 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:3.4.3-1ubuntu4) UNRELEASED; urgency=low
* fixing crash on closing document with footnotes (LP: #854626)
+ * fixing crash on screen resolution change (LP: #852819)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 27 Sep 2011 17:25:21 +0200
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 5d6c676..9a7e9e1 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ fix-libreoffice-build-configure-in.diff
apply-ext-human-updates.diff
fdo39510-1.diff
fdo39510-2.diff
+lp852819.diff
--
LibreOffice packaging repository
Reply to: