[Libreoffice-commits] .: oox/source

[David Tardon]

Hi,

On Tue, Aug 07, 2012 at 03:42:11AM -0700, Muthu Subramanian wrote:
>  oox/source/drawingml/table/tablecell.cxx |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> New commits:
> commit 36233b158b5de6c474f06c8c8772f0012b191baa
> Author: Muthu Subramanian <sumuthu at suse.com>
> Date:   Tue Aug 7 16:14:13 2012 +0530
> 
>     n#774167: Crash fix.
> 
> diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
> index c89a4f9..7675c10 100644
> --- a/oox/source/drawingml/table/tablecell.cxx
> +++ b/oox/source/drawingml/table/tablecell.cxx
> @@ -358,7 +358,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 );
>  }
>  
>  } } }

This test is superfluous after commit
772699ac1f2375c33f0819ebb127555d3178c4e5 (that is already in 3.6.1),
because a TableCell always has a TextBody now.

D.