[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source

[Eike Rathke]

 sc/source/ui/condformat/condformatmgr.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e7652ffc110f529734503621339f8a6b172be7e5
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 18 15:24:35 2013 +0200

    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 at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

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;