[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 4134b2cfb80d0b04204863789e72303f60712ba1
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Fri Dec 13 16:02:17 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Fri Dec 13 15:19:28 2019 +0100

    tdf#129056: No need for catastrophe
    
    We can continue working without hurting others
    in case of an invalid reference.
    
    Putting in a warning so that it doesn't become
    a black hole which silences errors.
    
    Change-Id: I6d75edeba227a4293b0ae16217811e49ae336a6b
    Reviewed-on: https://gerrit.libreoffice.org/85110
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 6c9744ffee02..49a3cf5b9eba 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -70,8 +70,19 @@ ChartColorWrapper::ChartColorWrapper(
 
 void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor)
 {
+    if (!mxModel.is())
+    {
+        SAL_WARN("chart2", "Invalid reference to mxModel");
+        return;
+    }
+
     css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
-    assert(xPropSet.is());
+
+    if (!xPropSet.is())
+    {
+        SAL_WARN("chart2", "Invalid reference to xPropSet");
+        return;
+    }
 
     xPropSet->setPropertyValue(maPropertyName, css::uno::makeAny(rColor.first));
 }