summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-05 21:39:58 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-05 22:16:57 +0200
commit936f197887d56260db0442fb510071b4583c05a2 (patch)
tree2a66d182bc2dd8ab418917c5298efd8180f55950 /filter
parent570a719abf01e57d6f150c8f6fbe17d9110f9eb5 (diff)
E_CONTAINS_DETECTSERVICES does nothing
...ever since its inception in 16ac8733020a726c5b5b955f20709f9c2894c140 and 9b79c1d48c0b562d1fc7d0427caf98f43590a837 "INTEGRATION: CWS filtercfg." Change-Id: I34422a1c5641802bfb15720f5bfa8ca16fb54aab
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/cache/basecontainer.cxx1
-rw-r--r--filter/source/config/cache/filtercache.hxx7
2 files changed, 3 insertions, 5 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 2a1c938fb64b..2d849c86e4be 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -105,7 +105,6 @@ void BaseContainer::impl_loadOnDemand()
break;
case FilterCache::E_DETECTSERVICE :
- eRequiredState = FilterCache::E_CONTAINS_DETECTSERVICES;
break;
case FilterCache::E_FRAMELOADER :
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index c7aa95ffa913..c54f900fb3be 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -102,10 +102,9 @@ class FilterCache : public BaseLock
E_CONTAINS_STANDARD = 1,
E_CONTAINS_TYPES = 2,
E_CONTAINS_FILTERS = 4,
- E_CONTAINS_DETECTSERVICES = 8,
- E_CONTAINS_FRAMELOADERS = 16,
- E_CONTAINS_CONTENTHANDLERS = 32,
- E_CONTAINS_ALL = 63 // must be a combination of all excepting E_CONTAINS_NOTHING! Please update if items will be added or removed ...
+ E_CONTAINS_FRAMELOADERS = 8,
+ E_CONTAINS_CONTENTHANDLERS = 16,
+ E_CONTAINS_ALL = 31 // must be a combination of all excepting E_CONTAINS_NOTHING! Please update if items will be added or removed ...
};