commit 22ebafe8897239696f46df6f093054d16285004a
author Eike Rathke <erack@redhat.com> Tue Nov 24 22:07:03 2015 +0100
committer Eike Rathke <erack@redhat.com> Tue Nov 24 22:10:13 2015 +0100
tree bd42a2ee934ebe683ce5b71537cf07464484be32
parent 87199d3829257420429057336283c55be6ae7481

Resolves: tdf#95629 import also 0x0D as rich EditCell, not only 0x0A

Change-Id: I58d9d7dcbcd1e6cf5ae51532982d7d3525038984

sc/source/filter/oox/richstring.cxx

diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index b415876..7484bbf 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -375,7 +375,7 @@ bool RichString::extractPlainString( OUString& orString, const oox::xls::Font* p
    if( (maTextPortions.size() == 1) && !maTextPortions.front()->hasFont() && !lclNeedsRichTextFormat( pFirstPortionFont ) )
    {
        orString = maTextPortions.front()->getText();
        return orString.indexOf( '\x0A' ) < 0;
        return orString.indexOf( '\x0A' ) < 0 && orString.indexOf( '\x0D' ) < 0;
    }
    return false;
}