oox: fix 0-pointer crash in sd_import_tests

(regression from 43efd9b4) Change-Id: Ib8ee521cf8142000cbd38a7475772cc3455f7357

oox: fix 0-pointer crash in sd_import_tests
(regression from 43efd9b4) Change-Id: Ib8ee521cf8142000cbd38a7475772cc3455f7357
ba1ae835 · Michael Stahl · 36692428 · ba1ae835
Kaydet (Commit) ba1ae835 authored Eyl 09, 2014 tarafından Michael Stahl
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

tablecell.cxx oox/source/drawingml/table/tablecell.cxx +7 -2

No files found.
--- 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();
+            FillProperties const*const pStyle(
-            nPhClr = rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
+                    pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx));
+            if (pStyle)
+            {
+                aBgColor = pStyle->getBestSolidColor();
+                nPhClr = rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
+            }
        }
    if (aBgColor.isUsed())
    {