Remove __ORCUS_STATIC_LIB defines.
Since orcus is now integrated as dynamic shared libraries, we don't
need these defines (in theory).
Change-Id: I33ea2e862ecc23becf5d01173d3fb31c03797159
Reviewed-on: https://gerrit.libreoffice.org/46166
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index b53c837..117c4d21 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -23,9 +23,6 @@
#include <cppunit/Asserter.h>
#include <cppunit/AdditionalMessage.h>
#if defined(_WIN32)
#define __ORCUS_STATIC_LIB
#endif
#include <orcus/csv_parser.hpp>
#include <fstream>
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx
index 27604fb..ee69df0 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -12,7 +12,6 @@
#include <orcusfilters.hxx>
#define __ORCUS_STATIC_LIB
#include <orcus/xml_namespace.hpp>
class ScOrcusFiltersImpl : public ScOrcusFilters
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index c19cf03..465014b 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -24,7 +24,6 @@
#include <rtl/strbuf.hxx>
#include <editeng/borderline.hxx>
#define __ORCUS_STATIC_LIB
#include <orcus/spreadsheet/import_interface.hpp>
#include <memory>
@@ -182,7 +181,6 @@ public:
virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
};
diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx b/sc/source/ui/dataprovider/csvdataprovider.cxx
index 1d61996..a6850ede 100644
--- a/sc/source/ui/dataprovider/csvdataprovider.cxx
+++ b/sc/source/ui/dataprovider/csvdataprovider.cxx
@@ -11,11 +11,6 @@
#include <datatransformation.hxx>
#include <stringutil.hxx>
#if defined(_WIN32)
#if !defined __ORCUS_STATIC_LIB // avoid -Werror,-Wunused-macros
#define __ORCUS_STATIC_LIB
#endif
#endif
#include <orcus/csv_parser.hpp>
namespace {
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index f74feb7..eea81a1 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -29,10 +29,6 @@
#include <officecfg/Office/Calc.hxx>
#if defined(_WIN32)
#define __ORCUS_STATIC_LIB
#endif
#include <orcus/csv_parser.hpp>
#include <queue>
diff --git a/sc/source/ui/inc/dataprovider.hxx b/sc/source/ui/inc/dataprovider.hxx
index 14637a4..61d1e11 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/dataprovider.hxx
@@ -33,10 +33,6 @@
#include <officecfg/Office/Calc.hxx>
#if defined(_WIN32)
#define __ORCUS_STATIC_LIB
#endif
#include <orcus/csv_parser.hpp>
class SvStream;
