diff options
| author | Muthu Subramanian <sumuthu@collabora.com> | 2013-12-10 16:56:25 +0530 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-02-13 16:59:35 +0100 |
| commit | 4334044106af01290d649ac788a89b81e8a75029 (patch) | |
| tree | 790aa5827f641144982d1c0dc70c903c226eb4b2 | |
| parent | d7aa985411aede915df00881b36cf5914a1cfd22 (diff) | |
fdo#73860 n#828390: New line is dropped while importing text.
(cherry picked from commit 840f4fc4d677740fc4b0ebcb658f4a828e184dad)
Signed-off-by: David Tardon <dtardon@redhat.com>
Change-Id: Id36181f64bd154d271446ef27a124a81af5c8620
| -rw-r--r-- | include/oox/core/contexthandler2.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/textbodycontext.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index d60cf3821916..48edd9a8086a 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 80e5657263b7..ff23c2424446 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; } // -------------------------------------------------------------------- |