From db4d07e3a8e74e3da0ffaaa862c035dbc9d10ac6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 5 Jun 2014 21:50:52 +0200 Subject: [PATCH] ...and E_DETECTSERVICE is just as unused Change-Id: I6f7c230e83a58f4889696b98fcd7bf24d0853ce0 --- filter/source/config/cache/basecontainer.cxx | 3 --- filter/source/config/cache/filtercache.cxx | 12 ------------ filter/source/config/cache/filtercache.hxx | 3 +-- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 2d849c86e4be..439018c2afbe 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -104,9 +104,6 @@ void BaseContainer::impl_loadOnDemand() eRequiredState = FilterCache::E_CONTAINS_FILTERS; break; - case FilterCache::E_DETECTSERVICE : - break; - case FilterCache::E_FRAMELOADER : eRequiredState = FilterCache::E_CONTAINS_FRAMELOADERS; break; diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 8517b71ee665..653c6cd87661 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -743,7 +743,6 @@ const CacheItemList& FilterCache::impl_getItemList(EItemType eType) const case E_FILTER : return m_lFilters ; case E_FRAMELOADER : return m_lFrameLoaders ; case E_CONTENTHANDLER : return m_lContentHandlers; - case E_DETECTSERVICE : return m_lDetectServices ; } @@ -763,7 +762,6 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType) case E_FILTER : return m_lFilters ; case E_FRAMELOADER : return m_lFrameLoaders ; case E_CONTENTHANDLER : return m_lContentHandlers; - case E_DETECTSERVICE : return m_lDetectServices ; } @@ -1267,10 +1265,6 @@ void FilterCache::impl_addItem2FlushList( EItemType eType, pList = &m_lChangedContentHandlers; break; - case E_DETECTSERVICE : - pList = &m_lChangedDetectServices; - break; - default : throw css::uno::Exception("unsupported item type", 0); } @@ -1795,12 +1789,6 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType sSet = CFGSET_CONTENTHANDLERS; } break; - - case E_DETECTSERVICE : - { - SAL_WARN( "filter.config", "Cant load detect services on demand. Who use this unsupported feature?"); - } - break; } if (!pList) diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index c54f900fb3be..d9b90118aa6e 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -77,8 +77,7 @@ class FilterCache : public BaseLock E_TYPE , E_FILTER , E_FRAMELOADER , - E_CONTENTHANDLER, - E_DETECTSERVICE + E_CONTENTHANDLER };