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

Noel Power noelp at kemper.freedesktop.org
Tue Jul 31 03:50:49 PDT 2012


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

New commits:
commit 0c9b786d4fd37b11cca65beb7444f3bede021ae7
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jul 26 14:17:09 2012 +0200

    rhbz#842552 always create text content
    
    The following line in oox::drawingml::table::TableCell::pushToXCell
    suggests that it is assumed that the cell always contains text:
    
    Reference< text::XText > xText( rxCell, UNO_QUERY_THROW );
    
    So TableCell should always hold a valid TextBody too.
    
    Change-Id: Ic2db7b535c98dd5f2b18941846709a781df4585c

diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index d4bbbcf..f68f766 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -53,7 +53,8 @@ using ::com::sun::star::drawing::LineStyle;
 namespace oox { namespace drawingml { namespace table {
 
 TableCell::TableCell()
-: mnRowSpan ( 1 )
+: mpTextBody( new TextBody() )
+, mnRowSpan ( 1 )
 , mnGridSpan( 1 )
 , mbhMerge( sal_False )
 , mbvMerge( sal_False )


More information about the Libreoffice-commits mailing list