From 72b1b560333c658b9f9bd360fc2eaf835be7789c Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Oct 23 2015 11:04:39 +0000
Subject: afl-eventtesting: fix crash on undoing insert new slide in impress


---

diff --git a/0001-afl-eventtesting-crash-on-undoing-insert-new-page-in.patch b/0001-afl-eventtesting-crash-on-undoing-insert-new-page-in.patch
new file mode 100644
index 0000000..cb9caec
--- /dev/null
+++ b/0001-afl-eventtesting-crash-on-undoing-insert-new-page-in.patch
@@ -0,0 +1,59 @@
+From 7103ffd27a00f784e77bee56b036d25bb4fdc341 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 23 Oct 2015 11:38:43 +0100
+Subject: [PATCH] afl-eventtesting: crash on undoing insert new page in impress
+
+this is an intermittent crash in the real world but under event testing we can
+see that the PaintView is informed that the page has been deleted, but doesn't
+clear its use of the page if it so happens that there was earlier modification
+events that caused the fire-modification-timer to be launched
+
+If there happens to be no such events then the page is correctly cleared
+
+If the timer is active, then the page is not cleared, but eventually the
+timer will fire and access the deleted page and fall over and die
+
+minimal change for backporting ease, follow ups now
+
+(cherry picked from commit f8b975995c5d0dc6a9fc8febba0667fe24542ad2)
+
+Change-Id: I090ad62cc175545902574c93dec7082225d97ab7
+---
+ svx/source/svdraw/svdpntv.cxx                        |   4 ++--
+ vcl/qa/afl-eventtesting/eventtesting.impress.crash-3 | Bin 0 -> 196 bytes
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 vcl/qa/afl-eventtesting/eventtesting.impress.crash-3
+
+diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
+index 4ea0087..7c97827 100644
+--- a/svx/source/svdraw/svdpntv.cxx
++++ b/svx/source/svdraw/svdpntv.cxx
+@@ -261,12 +261,12 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
+         return;
+     }
+ 
+-    bool bObjChg=!bSomeObjChgdFlag; // if true, evaluate for ComeBack timer
+-    if (bObjChg) {
++    {
+         const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
+         if (pSdrHint) {
+             SdrHintKind eKind=pSdrHint->GetKind();
+             if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) {
++                bool bObjChg=!bSomeObjChgdFlag; // if true, evaluate for ComeBack timer
+                 if (bObjChg) {
+                     bSomeObjChgdFlag=true;
+                     aComeBackIdle.Start();
+diff --git a/vcl/qa/afl-eventtesting/eventtesting.impress.crash-3 b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-3
+new file mode 100644
+index 0000000000000000000000000000000000000000..e6639bab1b851739a974c8ef1f4f9df05bcf769a
+GIT binary patch
+literal 196
+zcmWd@3Sr=2%485`Dq-Me%3)w(N@ZYVm1baK<zx^B%7OUeOch{xkT|y!L=8xsft44m
+o2A6(DrX&Utrc$uEFtdf3{^J0tU^_r&N-9-hU<MWj3^ABG0I;kp>Hq)$
+
+literal 0
+HcmV?d00001
+
+-- 
+2.4.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 87a2417..df5c304 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -53,7 +53,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        10%{?libo_prerelease}%{?dist}
+Release:        11%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -376,6 +376,7 @@ Patch57: 0001-Related-rhbz-1259746-Buffer-file-content-read-from-G.patch
 Patch58: 0001-implement-save-slide-background-for-impress.patch
 Patch59: 0001-Related-tdf-72880-presumably-using-startcenter-as-ge.patch
 Patch60: 0001-implement-dialog-control-over-enhanced-shape-control.patch
+Patch61: 0001-afl-eventtesting-crash-on-undoing-insert-new-page-in.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2435,6 +2436,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Oct 23 2015 Caolán McNamara <caolanm@redhat.com> - 1:4.4.5.2-11
+- afl-eventtesting: fix crash on undoing insert new slide in impress
+
 * Tue Oct 20 2015 Caolán McNamara <caolanm@redhat.com> - 1:4.4.5.2-10
 - multiple size groups are unreliable in 4-4, fix shape control dlg crash