diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-28 01:51:45 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-28 15:52:20 +0000 |
| commit | 039261b3f63a8949fd0f20e7cb80d017f26c9f08 (patch) | |
| tree | 069cd3af4db1862d51c277045126737f72bd805b /framework/source/loadenv/loadenv.cxx | |
| parent | 764358a43b83cdae9269af47070e3cb4739c96c0 (diff) | |
orcus is mandatory now
We use it as a json parser, for calc cell styles and tests. Making it
optional is just making the code more complex and introduces more
sources for errors.
Change-Id: I8769628a4ab9519cafc3d43db7c0007e0aa265dc
Reviewed-on: https://gerrit.libreoffice.org/31307
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'framework/source/loadenv/loadenv.cxx')
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 27285125f464..8e1288269ede 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -84,8 +84,6 @@ #include <vcl/svapp.hxx> #include <cppuhelper/implbase.hxx> -#include <config_orcus.h> - const char PROP_TYPES[] = "Types"; const char PROP_NAME[] = "Name"; @@ -653,8 +651,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& namespace { -#if ENABLE_ORCUS - bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescriptor, OUString& rType, OUString& rFilter) { OUString aURL; @@ -712,15 +708,6 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip return false; } -#else - -bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>&, OUString&, OUString&) -{ - return false; -} - -#endif - } void LoadEnv::impl_detectTypeAndFilter() |