[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d9525910e183c75f6d76b3be7d6b369da322feac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 25 12:10:01 2017 +0100

    Resolves: tdf#113328 crash in color replacer if parent closed before it
    
    Change-Id: I41a7af332cd36c9645b6042785c4d72f70e67795
    Reviewed-on: https://gerrit.libreoffice.org/43825
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 706bdecd860e..61b56a852447 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3200,6 +3200,8 @@ SvxListBoxColorWrapper::SvxListBoxColorWrapper(SvxColorListBox* pControl)
 
 void SvxListBoxColorWrapper::operator()(const OUString& /*rCommand*/, const NamedColor& rColor)
 {
+    if (!mxControl)
+        return;
     mxControl->Selected(rColor);
 }