[libreoffice/f18] Resolves: rhbz#918544 do not attempt to access non-existing format

[Eike Rathke]

commit 6edc8897f6cc0f7f4f6af6786a23601731cea07d
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Apr 23 13:26:00 2013 +0200

    Resolves: rhbz#918544 do not attempt to access non-existing format

 ...bz-918544-do-not-attempt-to-access-non-ex.patch |   54 ++++++++++++++++++++
 libreoffice.spec                                   |    5 ++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/0001-resolved-rhbz-918544-do-not-attempt-to-access-non-ex.patch b/0001-resolved-rhbz-918544-do-not-attempt-to-access-non-ex.patch
new file mode 100644
index 0000000..12401d6
--- /dev/null
+++ b/0001-resolved-rhbz-918544-do-not-attempt-to-access-non-ex.patch
@@ -0,0 +1,54 @@
+From e7652ffc110f529734503621339f8a6b172be7e5 Mon Sep 17 00:00:00 2001
+Message-Id: <e7652ffc110f529734503621339f8a6b172be7e5.1366715629.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Thu, 18 Apr 2013 15:24:35 +0200
+Subject: [PATCH] resolved rhbz#918544 do not attempt to access non-existing
+ format
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+Removing the last condition removes the conditional format, don't use
+the null pointer.
+
+Change-Id: Icb3e01ccbf8182bdf8eed1d52263ab34c9b297ff
+Reviewed-on: https://gerrit.libreoffice.org/3460
+Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
+Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
+---
+ sc/source/ui/condformat/condformatmgr.cxx | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-resolved-rhbz-918544-do-not-attempt-to-access-non-ex.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-resolved-rhbz-918544-do-not-attempt-to-access-non-ex.patch"
+
+diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
+index 03fbeb3..e510ba9 100644
+--- a/sc/source/ui/condformat/condformatmgr.cxx
++++ b/sc/source/ui/condformat/condformatmgr.cxx
+@@ -216,8 +216,11 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl)
+         sal_Int32 nKey = pFormat->GetKey();
+         mpFormatList->erase(nKey);
+         ScConditionalFormat* pNewFormat = pDlg->GetConditionalFormat();
+-        pNewFormat->SetKey(nKey);
+-        mpFormatList->InsertNew(pNewFormat);
++        if (pNewFormat)
++        {
++            pNewFormat->SetKey(nKey);
++            mpFormatList->InsertNew(pNewFormat);
++        }
+         maCtrlManager.Update();
+     }
+     delete pDlg;
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 01e2f3b..7908e99 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -262,6 +262,7 @@ Patch40: 0001-Resolves-fdo-47209-and-rhbz-927223-syntax-highlighte.patch
 Patch41: 0001-rhbz-867808-Do-not-throw-RuntimeException-by-pointer.patch
 Patch42: 0001-rhbz-954991-Avoid-static-data-causing-trouble-at-exi.patch
 Patch43: 0001-resolved-rhbz-919020-Basic-CDbl-and-CSng-scan-locali.patch
+Patch44: 0001-resolved-rhbz-918544-do-not-attempt-to-access-non-ex.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1017,6 +1018,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch41 -p1 -b .rhbz-867808-Do-not-throw-RuntimeException-by-pointer.patch
 %patch42 -p1 -b .rhbz-954991-Avoid-static-data-causing-trouble-at-exi.patch
 %patch43 -p1 -b .rhbz-919020-Basic-CDbl-and-CSng-scan-locali.patch
+%patch44 -p1 -b .rhbz-918544-do-not-attempt-to-access-non-ex.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2286,10 +2288,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Tue Apr 23 2013 Stephan Bergmann <sbergman at redhat.com> - 1:3.6.6.2-4
+* Tue Apr 23 2013 Eike Rathke <erack at redhat.com> - 1:3.6.6.2-4
 - Resolves: rhbz#867808 do not throw UNO exceptions by pointer in C++
 - Resolves: rhbz#954991 Avoid static data (causing trouble at exit)
 - Resolves: rhbz#919020 Basic CDbl() and CSng() scan localized number
+- Resolves: rhbz#918544 do not attempt to access non-existing format
 
 * Tue Apr 16 2013 Caolán McNamara <caolanm at redhat.com> - 1:3.6.6.2-3
 - Related: rhbz#924515 uninitialized variable in editengine