[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source

[Michael Stahl]

 oox/source/drawingml/table/tablecell.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6e91a401501ada01b3e9b814a5c9fa398b3f74bb
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Tue Aug 7 16:14:13 2012 +0530

    n#774167: Crash fix.
    (cherry picked from commit 36233b158b5de6c474f06c8c8772f0012b191baa)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index f68f766..af0105c 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -367,7 +367,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
     PropertySet( xPropSet ).setProperties( aPropMap );
 
-    getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle );
+    if( getTextBody() )
+        getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle );
 }
 
 } } }