[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Eike Rathke]

 sc/source/ui/docshell/docsh.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f7d37735bbe1ba2aa11fd5d0b4abee0fe088471a
Author: Eike Rathke <erack at 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
    (cherry picked from commit 129935443cfd9378e1263489fc4bf47aee1f1a46)
    Reviewed-on: https://gerrit.libreoffice.org/20340
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index a93aea4..d0c0836 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1778,11 +1778,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;
 }