diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2017-12-08 21:08:29 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2017-12-09 23:24:37 +0100 |
| commit | c7755e615918c1a0cb3245f75334ba08f69ac226 (patch) | |
| tree | 13ad0a60e05c92296b46c049729fe1d80b6a89d2 /sc | |
| parent | e9bac78922c70ad374ae4ca15d6f2258668697b7 (diff) | |
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>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/inc/orcusfiltersimpl.hxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/dataprovider/csvdataprovider.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/docshell/datastream.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/dataprovider.hxx | 4 |
6 files changed, 0 insertions, 19 deletions
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index b53c8377e1a0..117c4d21e9e8 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 27604fbd7a19..ee69df00b552 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 c19cf038ee7b..465014b0caf4 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 1d61996f7a6e..a6850edec3de 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 f74feb7a7d06..eea81a1f41ae 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 14637a49703f..61d1e112f14f 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; |