diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-10-28 00:12:06 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-08-28 02:03:39 +0200 |
| commit | 6ae1b105e38e537ae3d38186913069a2334bd66f (patch) | |
| tree | 07458a6f4aea61aeafedc252d2de1615c83f6249 /framework | |
| parent | import cell fill color (diff) | |
| download | core-6ae1b105e38e537ae3d38186913069a2334bd66f.tar.gz core-6ae1b105e38e537ae3d38186913069a2334bd66f.zip | |
don't protect the gnumeric filter with the USE_ORCUS flag
Change-Id: Id91c7844879bea589bf97f999fd0c69669dfa7f6
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 3f2db03b00e9..aca4c09eea95 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -666,13 +666,6 @@ namespace { bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescriptor, OUString& rType, OUString& rFilter) { - // depending on the experimental mode - uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); - if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) - { - return false; - } - OUString aURL; sal_Int32 nSize = rDescriptor.getLength(); for (sal_Int32 i = 0; i < nSize; ++i) @@ -688,10 +681,6 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip if (aURL.isEmpty() || aURL.copy(0,8).equalsIgnoreAsciiCase("private:")) return false; - OUString aUseOrcus; - rtl::Bootstrap::get("LIBO_USE_ORCUS", aUseOrcus); - bool bUseOrcus = (aUseOrcus == "YES"); - // TODO : Type must be set to be generic_Text (or any other type that // exists) in order to find a usable loader. Exploit it as a temporary // hack. @@ -703,6 +692,17 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip return true; } + // depending on the experimental mode + uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); + if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) + { + return false; + } + + OUString aUseOrcus; + rtl::Bootstrap::get("LIBO_USE_ORCUS", aUseOrcus); + bool bUseOrcus = (aUseOrcus == "YES"); + if (!bUseOrcus) return false; |