sc/source/ui/docshell/docsh.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 129935443cfd9378e1263489fc4bf47aee1f1a46 Author: Eike Rathke <er...@redhat.com> Date: Tue Dec 1 21:24:27 2015 +0100 Resolves: tdf#95629 quote CSV also if cell contains embedded '\r' CR Change-Id: I37fb62a53338a7edcac1c72153eefcee6096e6f9 diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 5181bcc..562254d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1785,11 +1785,12 @@ sal_Int32 getTextSepPos( const StrT& rStr, const ScImportOptions& rAsciiOpt, const SepCharT& rTextSep, const SepCharT& rFieldSep, bool& rNeedQuotes) { // #i116636# quotes are needed if text delimiter (quote), field delimiter, - // or LF is in the cell text. + // or LF or CR is in the cell text. sal_Int32 nPos = rStr.indexOf(rTextSep); rNeedQuotes = rAsciiOpt.bQuoteAllText || (nPos >= 0) || (rStr.indexOf(rFieldSep) >= 0) || - (rStr.indexOf('\n') >= 0); + (rStr.indexOf('\n') >= 0) || + (rStr.indexOf('\r') >= 0); return nPos; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits