[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source

[Muthu Subramanian]

 oox/source/drawingml/textbodycontext.cxx         |    1 -
 oox/source/drawingml/textcharacterproperties.cxx |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 950de3b92fbab4eee931973bb95170e205b16a4b
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Thu Jan 2 14:03:22 2014 +0530

    Fix compilation problems.

diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index a8b3d64..7bc29a0 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -54,7 +54,6 @@ TextParagraphContext::TextParagraphContext( ContextHandler& rParent, TextParagra
 : ContextHandler( rParent )
 , mrParagraph( rPara )
 {
-    mbEnableTrimSpace = false;
 }
 
 // --------------------------------------------------------------------
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index c531bc1..bc23204 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
-#include <editeng/escapementitem.hxx>
+#include <editeng/escpitem.hxx>
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/core/xmlfilterbase.hxx"