diff options
author | Eike Rathke <erack@redhat.com> | 2013-04-18 15:24:35 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-04-18 14:22:07 +0000 |
commit | e7652ffc110f529734503621339f8a6b172be7e5 (patch) | |
tree | e5193bc972976a1359ebc6a3320e9f6e9003c726 | |
parent | 88adf7858ff6a35b555204bded03d11fd7ea8128 (diff) |
resolved rhbz#918544 do not attempt to access non-existing format
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@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | sc/source/ui/condformat/condformatmgr.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 03fbeb3a4aa5..e510ba923168 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; |