summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-11-24 22:07:03 +0100
committerEike Rathke <erack@redhat.com>2015-11-24 22:10:13 +0100
commit22ebafe8897239696f46df6f093054d16285004a (patch)
treebd42a2ee934ebe683ce5b71537cf07464484be32 /sc
parent87199d3829257420429057336283c55be6ae7481 (diff)
Resolves: tdf#95629 import also 0x0D as rich EditCell, not only 0x0A
Change-Id: I58d9d7dcbcd1e6cf5ae51532982d7d3525038984
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/richstring.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index b4158764cfb1..7484bbfe1b82 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;
}