[Libreoffice-commits] .: 2 commits - config_host.mk.in oox/source

[David Tardon]

 config_host.mk.in                        |    4 ++--
 oox/source/drawingml/table/tablecell.cxx |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 772699ac1f2375c33f0819ebb127555d3178c4e5
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 96fa5b7..c89a4f9 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -44,7 +44,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 )
commit 6eda57693398486d5c887cfcc2a60cd133d110ee
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jul 26 09:07:13 2012 +0200

    i do not see any reason for using ?= here
    
    Change-Id: I39acbfcae047829bed68186917bbb4e851d2ac20

diff --git a/config_host.mk.in b/config_host.mk.in
index b335325..52ec1fc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -110,7 +110,7 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_GCONF=@ENABLE_GCONF@
 export ENABLE_GIO=@ENABLE_GIO@
 export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
-export ENABLE_CORETEXT?=@ENABLE_CORETEXT@
+export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GTK3=@ENABLE_GTK3@
@@ -169,7 +169,7 @@ export GIT_REPO_NAMES=@GIT_REPO_NAMES@
 export GLIB_CFLAGS=@GLIB_CFLAGS@
 export GLIB_LIBS=@GLIB_LIBS@
 export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@
-export GMAKE_PARALLELISM?=@GMAKE_PARALLELISM@
+export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@
 export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
 export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
 @x_GNUCP@ export GNUCOPY=@GNUCP@