[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/oox oox/source

[Muthu Subramanian]

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

New commits:
commit 4334044106af01290d649ac788a89b81e8a75029
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Tue Dec 10 16:56:25 2013 +0530

    fdo#73860 n#828390: New line is dropped while importing text.
    
    (cherry picked from commit 840f4fc4d677740fc4b0ebcb658f4a828e184dad)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    
    Change-Id: Id36181f64bd154d271446ef27a124a81af5c8620

diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index d60cf38..48edd9a 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/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 80e5657..ff23c24 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -52,6 +52,7 @@ TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, Text
 : ContextHandler2( rParent )
 , mrParagraph( rPara )
 {
+    mbEnableTrimSpace = false;
 }
 
 // --------------------------------------------------------------------