bin/gbuild-to-ide | 2 -
sc/source/ui/docshell/dataprovider.cxx | 43 ++++++++++++---------------------
sc/source/ui/inc/dataprovider.hxx | 5 ---
3 files changed, 17 insertions(+), 33 deletions(-)
New commits:
commit 19eaac83c7559c46f09a3792befe3b527b04138a
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Dec 9 23:01:32 2016 +0100
fix indentation
Change-Id: I5a721b2b55c003c34e24d83b9b5e09a88dde684b
diff --git a/sc/source/ui/docshell/dataprovider.cxx
b/sc/source/ui/docshell/dataprovider.cxx
index 2c9025c..80a6b2b 100644
--- a/sc/source/ui/docshell/dataprovider.cxx
+++ b/sc/source/ui/docshell/dataprovider.cxx
@@ -72,10 +72,10 @@ CSVFetchThread::CSVFetchThread(SvStream *pData):
Thread("ReaderThread"),
mpStream(pData),
mbTerminate(false)
- {
- maConfig.delimiters.push_back(',');
- maConfig.text_qualifier = '"';
- }
+{
+ maConfig.delimiters.push_back(',');
+ maConfig.text_qualifier = '"';
+}
CSVFetchThread::~CSVFetchThread()
{
@@ -101,20 +101,20 @@ void CSVFetchThread::EndThread()
void CSVFetchThread::execute()
{
- LinesType* pLines = new LinesType(10);
+ LinesType* pLines = new LinesType(10);
- // Read & store new lines from stream.
- for (Line & rLine : *pLines)
- {
- rLine.maCells.clear();
- mpStream->ReadLine(rLine.maLine);
- CSVHandler aHdl(rLine, mnColCount);
- orcus::csv_parser<CSVHandler> parser(rLine.maLine.getStr(),
rLine.maLine.getLength(), aHdl, maConfig);
- parser.parse();
- }
+ // Read & store new lines from stream.
+ for (Line & rLine : *pLines)
+ {
+ rLine.maCells.clear();
+ mpStream->ReadLine(rLine.maLine);
+ CSVHandler aHdl(rLine, mnColCount);
+ orcus::csv_parser<CSVHandler> parser(rLine.maLine.getStr(),
rLine.maLine.getLength(), aHdl, maConfig);
+ parser.parse();
+ }
- if (!mpStream->good())
- RequestTerminate();
+ if (!mpStream->good())
+ RequestTerminate();
}
}
commit 10484e95212726619a1a2f94ce99ad3360b88e9b
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Dec 9 23:00:10 2016 +0100
fix compile errors
Change-Id: I840b28f419137d2ead44dc649a14d742055fb3b9
diff --git a/sc/source/ui/docshell/dataprovider.cxx
b/sc/source/ui/docshell/dataprovider.cxx
index b5f3661..2c9025c 100644
--- a/sc/source/ui/docshell/dataprovider.cxx
+++ b/sc/source/ui/docshell/dataprovider.cxx
@@ -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())
diff --git a/sc/source/ui/inc/dataprovider.hxx
b/sc/source/ui/inc/dataprovider.hxx
index 0ffb82c..d0101dc 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/dataprovider.hxx
@@ -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;
commit d575e3a14beef8bdd3517c024b9aab8a17b3ef7b
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Dec 9 22:57:48 2016 +0100
fix copy&paste error in ide-integration script
Change-Id: I4e52851b41e3d5ec4fe4ae5277928bceac3c8283
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 6d549cb..7de2fb4 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -60,7 +60,7 @@ class GbuildTest(GbuildLinkTarget):
def short_name(self):
"""Return the short name of target based n the CppunitTest_* makefile
names"""
- return 'Library %s' % self.name
+ return 'CppunitTest %s' % self.name
def target_name(self):
return 'CppunitTest_%s' % self.test
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
