[Libreoffice-commits] .: oox/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Aug 21 06:43:03 PDT 2012


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

New commits:
commit 309658bd85fd21daade42be1f1909d944a1e8c20
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Fri Aug 17 16:13:56 2012 +0530

    Reverting superfluous commit 36233b158b5de6c474f06c8c8772f0012b191baa
    
    w.r.t David Tardon's suggestion, table cell now always has
    textbody. commit: 772699ac1f2375c33f0819ebb127555d3178c4e5
    Hence reverting this.

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


More information about the Libreoffice-commits mailing list