summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-01-30 18:11:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-01-31 20:36:34 +0000
commitd9423d80e7a2c8dc323027425780a17e76b6d0c6 (patch)
tree6ef99ad55479c98a1dfb6e1ca88a5febc293aeed
parent096baf452992b91ce07a3ade9e7b3c0f4283df39 (diff)
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/33713 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 37bf0b2bb4aa..b2c0a1c07dd8 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -635,9 +635,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 );