Kaydet (Commit) 10484e95 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix compile errors

Change-Id: I840b28f419137d2ead44dc649a14d742055fb3b9
üst d575e3a1
......@@ -7,16 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <dataprovider.hxx>
#include <config_orcus.h>
#include "officecfg/Office/Calc.hxx"
#include <stringutil.hxx>
#if ENABLE_ORCUS
#if defined(_WIN32)
#define __ORCUS_STATIC_LIB
#endif
#include <orcus/csv_parser.hpp>
#endif
namespace sc {
......@@ -33,8 +30,6 @@ Cell::Cell(const Cell& r) : mbValue(r.mbValue)
}
}
#if ENABLE_ORCUS
class CSVHandler
{
Line& mrLine;
......@@ -73,17 +68,13 @@ public:
}
};
#endif
CSVFetchThread::CSVFetchThread(SvStream *pData):
Thread("ReaderThread"),
mpStream(pData),
mbTerminate(false)
{
#if ENABLE_ORCUS
maConfig.delimiters.push_back(',');
maConfig.text_qualifier = '"';
#endif
}
CSVFetchThread::~CSVFetchThread()
......@@ -117,11 +108,9 @@ void CSVFetchThread::execute()
{
rLine.maCells.clear();
mpStream->ReadLine(rLine.maLine);
#if ENABLE_ORCUS
CSVHandler aHdl(rLine, mnColCount);
orcus::csv_parser<CSVHandler> parser(rLine.maLine.getStr(), rLine.maLine.getLength(), aHdl, maConfig);
parser.parse();
#endif
}
if (!mpStream->good())
......
......@@ -18,15 +18,12 @@
#include <osl/conditn.hxx>
#include <queue>
#include <config_orcus.h>
#include "officecfg/Office/Calc.hxx"
#if ENABLE_ORCUS
#if defined(_WIN32)
#define __ORCUS_STATIC_LIB
#endif
#include <orcus/csv_parser.hpp>
#endif
namespace sc {
......@@ -66,9 +63,7 @@ class CSVFetchThread : public salhelper::Thread
bool mbTerminate;
osl::Mutex maMtxTerminate;
#if ENABLE_ORCUS
orcus::csv::parser_config maConfig;
#endif
virtual void execute() override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment