[libreoffice/f15] Resolves: rhbz#772768 crash choosing Data:Form... with hidden columns

[Caolán McNamara]

commit 4f881c80e3e6ebaf65b00fbc4f3de747332a180f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 10 10:26:15 2012 +0000

    Resolves: rhbz#772768 crash choosing Data:Form... with hidden columns

 ...-39773-crash-with-hidden-column-in-Data-F.patch |   26 ++++++++++++++++++++
 libreoffice.spec                                   |    5 +++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0001-fix-for-fdo-39773-crash-with-hidden-column-in-Data-F.patch b/0001-fix-for-fdo-39773-crash-with-hidden-column-in-Data-F.patch
new file mode 100644
index 0000000..71c6639
--- /dev/null
+++ b/0001-fix-for-fdo-39773-crash-with-hidden-column-in-Data-F.patch
@@ -0,0 +1,26 @@
+From d7c57d14bdc8968f52aa98b4bd82a0534587e118 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard <markus.mohrhard at googlemail.com>
+Date: Wed, 3 Aug 2011 03:27:17 +0200
+Subject: [PATCH] fix for fdo#39773: crash with hidden column in Data->Form
+
+---
+ sc/source/ui/miscdlgs/datafdlg.cxx |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
+index 2d3db4f..a93c4f5 100644
+--- a/sc/source/ui/miscdlgs/datafdlg.cxx
++++ b/sc/source/ui/miscdlgs/datafdlg.cxx
+@@ -201,7 +201,8 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell*  pTabViewShellOri
+                 pFixedTexts[nIndex] = NULL;
+                 pEdits[nIndex] = NULL;
+             }
+-        pEdits[nIndex]->SetModifyHdl( HDL(Impl_DataModifyHdl) );
++            if (pEdits[nIndex])
++                pEdits[nIndex]->SetModifyHdl( HDL(Impl_DataModifyHdl) );
+         }
+ 
+         Size nDialogSize = this->GetSizePixel();
+-- 
+1.7.6.5
+
diff --git a/libreoffice.spec b/libreoffice.spec
index aa9984e..209d5c0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -170,6 +170,7 @@ Patch78: smoketestoo_native-build.patch
 Patch79: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch
 Patch80: 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
 Patch81: 0001-sw-fdo-39159-fdo-40482-temp-selection-print-doc.patch
+Patch82: 0001-fix-for-fdo-39773-crash-with-hidden-column-in-Data-F.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -890,6 +891,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch79 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch
 %patch80 -p1 -b .rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
 %patch81 -p1 -b .sw-fdo-39159-fdo-40482-temp-selection-print-doc.patch
+%patch82 -p1 -b .fdo39773-crash-with-hidden-column-in-Data-F.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2251,10 +2253,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Wed Dec 07 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.4.1-2.UNBUILT
+* Tue Jan 10 2012 Caolán McNamara <caolanm at redhat.com> 1:3.3.4.1-2
 - Resolves: rhbz#759647 dispose clears mpPresTimer
 - Resolves: rhbz#767708 write to mmap'ed file w/o disk space: SIGBUS
 - Resolves: fdo#40482 Writer view options destroyed by printing
+- Resolves: rhbz#772768 crash choosing "Data:Form..." with hidden columns
 
 * Wed Nov 30 2011 David Tardon <dtardon at redhat.com> 1:3.3.4.1-1
 - Resolves: rhbz#747356 let Qt call XInitThreads