[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.3-3-219-g54b3028
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 4360deaddbd555a6960e1a6378f87a6a527b1ccd
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Oct 26 17:38:24 2011 +0200
remove patches fdo39510.diff and lp852819.diff, which are included in 3.4.4.1
diff --git a/patches/fdo39510.diff b/patches/fdo39510.diff
deleted file mode 100644
index ecff07e..0000000
--- a/patches/fdo39510.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- /dev/null 2011-09-27 10:43:04.452932903 +0200
-+++ libreoffice/libreoffice-build/patches/hotfixes/fdo39510.diff 2011-09-27 17:03:55.218832472 +0200
-@@ -0,0 +1,46 @@
-+From f8f5d96666bff5051cc88d06b10d855548a441de Mon Sep 17 00:00:00 2001
-+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+Date: Thu, 22 Sep 2011 18:47:21 +0200
-+Subject: [PATCH 1/2] fdo#39510 lp#854626: crash on closing document with
-+ footnotes
-+
-+Signed-off-by: Michael Stahl <mst@openoffice.org>
-+---
-+ sw/source/core/layout/newfrm.cxx | 1 +
-+ 1 files changed, 1 insertions(+), 0 deletions(-)
-+
-+From 6a3faed5b459ea133c39ef5243dad8e366ca00c3 Mon Sep 17 00:00:00 2001
-+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+Date: Fri, 23 Sep 2011 01:13:34 +0200
-+Subject: [PATCH 2/2] fdo#39510: comment added
-+
-+Signed-off-by: Michael Stahl <mst@openoffice.org>
-+---
-+ sw/source/core/layout/newfrm.cxx | 10 ++++++++++
-+ 1 files changed, 10 insertions(+), 0 deletions(-)
-+
-+diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
-+index 7f19c1a..3943336 100644
-+--- sw/source/core/layout/newfrm.cxx
-++++ sw/source/core/layout/newfrm.cxx
-+@@ -607,6 +607,17 @@ SwRootFrm::~SwRootFrm()
-+ {
-+ bTurboAllowed = sal_False;
-+ pTurbo = 0;
-++ // fdo#39510 crash on document close with footnotes
-++ // Object ownership in writer and esp. in layout are a mess: Before the
-++ // document/layout split SwDoc and SwRootFrm were essentially one object
-++ // and magically/uncleanly worked around their common destruction by call
-++ // to SwDoc::IsInDtor() -- even from the layout. As of now destuction of
-++ // the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms
-++ // also searches backwards to find the master of footnotes, they must be
-++ // considered to be owned by the SwRootFrm and also be destroyed here,
-++ // before tearing down the (now footnote free) rest of the layout.
-++ AllRemoveFtns();
-++
-+ if(pBlink)
-+ pBlink->FrmDelete( this );
-+ if ( static_cast<SwFrmFmt*>(GetRegisteredInNonConst()) )
-+--
-+1.7.5.4
-+
diff --git a/patches/lp852819.diff b/patches/lp852819.diff
deleted file mode 100644
index caba4da..0000000
--- a/patches/lp852819.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- /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 d1c87a8..56316eb 100644
--- a/patches/series
+++ b/patches/series
@@ -25,8 +25,6 @@ update-sdbc-postgresql.diff
handle-NULL-display-gracefully.diff
jdk-1.7.0-vendorname.diff
s390x.diff
-fdo39510.diff
-lp852819.diff
ubuntufixes-core.diff
ubuntufixes-binfilter.diff
fix-libreoffice-build-configure-in.diff
--
LibreOffice packaging repository
Reply to: