[Libreoffice-commits] core.git: svx/source

Caolán McNamara caolanm at redhat.com
Wed Oct 25 14:44:10 UTC 2017


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

New commits:
commit 0ce75cde0a0bdf4b3c23044e713f906a765e8a8a
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/43824
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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


More information about the Libreoffice-commits mailing list