diff options
-rw-r--r-- | filter/source/config/cache/contenthandlerfactory.cxx | 6 | ||||
-rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 4 | ||||
-rw-r--r-- | filter/source/config/cache/frameloaderfactory.cxx | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index afedebfcd06f..ae7b03c7cec9 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -59,15 +59,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - OUString sRealHandler = sHandler; - auto & cache = TheFilterCache::get(); // search handler on cache - CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sRealHandler); + CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sHandler); // create service instance - xHandler = m_xContext->getServiceManager()->createInstanceWithContext(sRealHandler, m_xContext); + xHandler = m_xContext->getServiceManager()->createInstanceWithContext(sHandler, m_xContext); // initialize filter css::uno::Reference< css::lang::XInitialization > xInit(xHandler, css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 0e04d668a1d9..bd22e9e78b87 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -76,12 +76,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - OUString sRealFilter = sFilter; - auto & cache = TheFilterCache::get(); // search filter on cache - CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sRealFilter); + CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sFilter); OUString sFilterService; aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService; diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 2bf7b9a5efd2..abf51d859baf 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -56,15 +56,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - OUString sRealLoader = sLoader; - auto & cache = TheFilterCache::get(); // search loader on cache - CacheItem aLoader = cache.getItem(m_eType, sRealLoader); + CacheItem aLoader = cache.getItem(m_eType, sLoader); // create service instance - css::uno::Reference< css::uno::XInterface > xLoader = m_xContext->getServiceManager()->createInstanceWithContext(sRealLoader, m_xContext); + css::uno::Reference< css::uno::XInterface > xLoader = m_xContext->getServiceManager()->createInstanceWithContext(sLoader, m_xContext); // initialize filter css::uno::Reference< css::lang::XInitialization > xInit(xLoader, css::uno::UNO_QUERY); |