diff options
| author | Eike Rathke <erack@redhat.com> | 2015-11-25 00:48:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-11-25 00:57:06 +0100 |
| commit | 7289a140fc68dc898ba2b2357cc960968195f236 (patch) | |
| tree | e5e6ded4e06858717163b43208948bc5800aba23 | |
| parent | d667e3210b12c7ce3b3727e2a0e369a520fbaaa4 (diff) | |
Revert "Resolves: tdf#95629 import also 0x0D as rich EditCell, not only 0x0A"
This reverts commit 22ebafe8897239696f46df6f093054d16285004a.
It seems to break various sc.subsequentcheck targets.
| -rw-r--r-- | sc/source/filter/oox/richstring.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 7484bbfe1b82..b4158764cfb1 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 && orString.indexOf( '\x0D' ) < 0; + return orString.indexOf( '\x0A' ) < 0; } return false; } |