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

[Muthu Subramanian]

 oox/inc/oox/core/contexthandler2.hxx     |    2 ++
 oox/source/drawingml/textbodycontext.cxx |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 134558033eea2fd7c05376c13859cb1d57140321
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Tue Dec 10 17:07:23 2013 +0530

    n#828390: Import new line in text.

diff --git a/oox/inc/oox/core/contexthandler2.hxx b/oox/inc/oox/core/contexthandler2.hxx
index 12ff23b..f6b9d5d 100644
--- a/oox/inc/oox/core/contexthandler2.hxx
+++ b/oox/inc/oox/core/contexthandler2.hxx
@@ -206,6 +206,8 @@ private:
 
     ContextStackRef     mxContextStack;     /// Stack of all processed elements.
     size_t              mnRootStackSize;    /// Stack size on construction time.
+
+protected:
     bool                mbEnableTrimSpace;  /// True = trim whitespace in characters().
 };
 
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 7bc29a0..a8b3d64 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -54,6 +54,7 @@ TextParagraphContext::TextParagraphContext( ContextHandler& rParent, TextParagra
 : ContextHandler( rParent )
 , mrParagraph( rPara )
 {
+    mbEnableTrimSpace = false;
 }
 
 // --------------------------------------------------------------------