From 516bc904e94971b61e4b13af632bf321b0a4a640 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 17 Jan 2023 17:10:07 -0500 Subject: Upgrade mdds and orcus to 2.1.0 and 0.18.0, respectively Change-Id: I288b5b54bd07d951bcc68afda7514bde730193dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146107 Tested-by: Jenkins Reviewed-by: Kohei Yoshida --- sc/source/ui/docshell/datastream.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/source/ui/docshell') diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 4bcbbaf9978c..edd3aeaf26cd 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -66,21 +66,21 @@ public: static void begin_row() {} static void end_row() {} - void cell(const char* p, size_t n, bool /*transient*/) + void cell(std::string_view s, bool /*transient*/) { if (mnCols >= mnColCount) return; DataStream::Cell aCell; - if (ScStringUtil::parseSimpleNumber(p, n, '.', ',', aCell.mfValue)) + if (ScStringUtil::parseSimpleNumber(s.data(), s.size(), '.', ',', aCell.mfValue)) { aCell.mbValue = true; } else { aCell.mbValue = false; - aCell.maStr.Pos = std::distance(mpLineHead, p); - aCell.maStr.Size = n; + aCell.maStr.Pos = std::distance(mpLineHead, s.data()); + aCell.maStr.Size = s.size(); } mrLine.maCells.push_back(aCell); @@ -199,7 +199,7 @@ private: rLine.maCells.clear(); mpStream->ReadLine(rLine.maLine); CSVHandler aHdl(rLine, mnColCount); - orcus::csv_parser parser(rLine.maLine.getStr(), rLine.maLine.getLength(), aHdl, maConfig); + orcus::csv_parser parser(rLine.maLine.getStr(), aHdl, maConfig); parser.parse(); } -- cgit