sc/source/ui/condformat/condformatdlg.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9b227212f648ecdd88926cbcbb6144f254b96223
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jan 30 18:11:49 2017 +0100
Resolves: tdf#105410 do not crash on a deleted format
... if the last condition was deleted and the Manage list is to be
updated. The format is gone.
Change-Id: I0fc056b5c75849197f351871b0d05e5015d0d1bf
(cherry picked from commit e32c8293709d4940ccf9f3def963e5a87925e583)
Reviewed-on: https://gerrit.libreoffice.org/33714
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index c5f4870..6f9cfbe 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -632,9 +632,12 @@ void ScCondFormatDlg::OkPressed()
nKey = pList->getMaxKey() + 1;
}
- pFormat->SetKey(nKey);
pList->erase(nKey);
- pList->InsertNew(pFormat);
+ if (pFormat)
+ {
+ pFormat->SetKey(nKey);
+ pList->InsertNew(pFormat);
+ }
mpViewData->GetViewShell()->GetPool().Put(*mpDlgItem);
SetDispatcherLock( false );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
