summaryrefslogtreecommitdiff
path: root/sc/source/ui/dataprovider
diff options
context:
space:
mode:
authorKohei Yoshida <kohei@libreoffice.org>2023-01-17 17:10:07 -0500
committerKohei Yoshida <kohei@libreoffice.org>2023-01-26 02:27:57 +0000
commit516bc904e94971b61e4b13af632bf321b0a4a640 (patch)
treefc48af7d2c5e719930c70de6da0ea9bb471bff1f /sc/source/ui/dataprovider
parentdf470d9658c202a990b9c75e2a8d6e3fd7a06dfd (diff)
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 <kohei@libreoffice.org>
Diffstat (limited to 'sc/source/ui/dataprovider')
-rw-r--r--sc/source/ui/dataprovider/csvdataprovider.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx b/sc/source/ui/dataprovider/csvdataprovider.cxx
index f864cdcf79a4..c6e4c15dee6b 100644
--- a/sc/source/ui/dataprovider/csvdataprovider.cxx
+++ b/sc/source/ui/dataprovider/csvdataprovider.cxx
@@ -41,19 +41,19 @@ public:
mnCol = 0;
}
- void cell(const char* p, size_t n, bool /*transient*/)
+ void cell(std::string_view s, bool /*transient*/)
{
if (mnCol > mpDoc->MaxCol())
return;
double mfValue = 0.0;
- if (ScStringUtil::parseSimpleNumber(p, n, '.', ',', mfValue))
+ if (ScStringUtil::parseSimpleNumber(s.data(), s.size(), '.', ',', mfValue))
{
mpDoc->SetValue(mnCol, mnRow, 0, mfValue);
}
else
{
- OString aStr(p, n);
+ OString aStr(s.data(), s.size());
mpDoc->SetString(mnCol, mnRow, 0, OStringToOUString(aStr, RTL_TEXTENCODING_UTF8));
}
@@ -107,7 +107,7 @@ void CSVFetchThread::execute()
return;
CSVHandler aHdl(&mrDocument);
- orcus::csv_parser<CSVHandler> parser(aBuffer.getStr(), aBuffer.getLength(), aHdl, maConfig);
+ orcus::csv_parser<CSVHandler> parser(aBuffer, aHdl, maConfig);
parser.parse();
for (const auto& itr : maDataTransformations)