sc/source/filter/oox/richstring.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 22ebafe8897239696f46df6f093054d16285004a
Author: Eike Rathke <er...@redhat.com>
Date: Tue Nov 24 22:07:03 2015 +0100
Resolves: tdf#95629 import also 0x0D as rich EditCell, not only 0x0A
Change-Id: I58d9d7dcbcd1e6cf5ae51532982d7d3525038984
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
