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

[Michael Stahl]

 oox/source/drawingml/table/tablecell.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ba1ae835fa3629deb64b0a7a359cadc5aa0a9763
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 9 16:48:29 2014 +0200

    oox: fix 0-pointer crash in sd_import_tests
    
    (regression from 43efd9b40d40b791a2c2deedcac36b99f7efb2cf)
    
    Change-Id: Ib8ee521cf8142000cbd38a7475772cc3455f7357

diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 4053325..f3810f1 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -361,8 +361,13 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     else if (rBackgroundFillStyle.mnThemedIdx != 0)
         if (const Theme* pTheme = rFilterBase.getCurrentTheme())
         {
-            aBgColor = pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx)->getBestSolidColor();
-            nPhClr = rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
+            FillProperties const*const pStyle(
+                    pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx));
+            if (pStyle)
+            {
+                aBgColor = pStyle->getBestSolidColor();
+                nPhClr = rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
+            }
         }
     if (aBgColor.isUsed())
     {