drop unneded variables
Change-Id: Ia494251483b57d747348976674206dd33eb29c7c Reviewed-on: https://gerrit.libreoffice.org/54874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
parent
04a2e5bf89
commit
3fe61a95b9
@ -59,15 +59,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
|
|||||||
// SAFE ->
|
// SAFE ->
|
||||||
::osl::ResettableMutexGuard aLock(m_aLock);
|
::osl::ResettableMutexGuard aLock(m_aLock);
|
||||||
|
|
||||||
OUString sRealHandler = sHandler;
|
|
||||||
|
|
||||||
auto & cache = TheFilterCache::get();
|
auto & cache = TheFilterCache::get();
|
||||||
|
|
||||||
// search handler on cache
|
// search handler on cache
|
||||||
CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sRealHandler);
|
CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sHandler);
|
||||||
|
|
||||||
// create service instance
|
// create service instance
|
||||||
xHandler = m_xContext->getServiceManager()->createInstanceWithContext(sRealHandler, m_xContext);
|
xHandler = m_xContext->getServiceManager()->createInstanceWithContext(sHandler, m_xContext);
|
||||||
|
|
||||||
// initialize filter
|
// initialize filter
|
||||||
css::uno::Reference< css::lang::XInitialization > xInit(xHandler, css::uno::UNO_QUERY);
|
css::uno::Reference< css::lang::XInitialization > xInit(xHandler, css::uno::UNO_QUERY);
|
||||||
|
4
filter/source/config/cache/filterfactory.cxx
vendored
4
filter/source/config/cache/filterfactory.cxx
vendored
@ -76,12 +76,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
|
|||||||
// SAFE ->
|
// SAFE ->
|
||||||
::osl::ResettableMutexGuard aLock(m_aLock);
|
::osl::ResettableMutexGuard aLock(m_aLock);
|
||||||
|
|
||||||
OUString sRealFilter = sFilter;
|
|
||||||
|
|
||||||
auto & cache = TheFilterCache::get();
|
auto & cache = TheFilterCache::get();
|
||||||
|
|
||||||
// search filter on cache
|
// search filter on cache
|
||||||
CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sRealFilter);
|
CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sFilter);
|
||||||
OUString sFilterService;
|
OUString sFilterService;
|
||||||
aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService;
|
aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService;
|
||||||
|
|
||||||
|
@ -56,15 +56,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
|
|||||||
// SAFE ->
|
// SAFE ->
|
||||||
::osl::ResettableMutexGuard aLock(m_aLock);
|
::osl::ResettableMutexGuard aLock(m_aLock);
|
||||||
|
|
||||||
OUString sRealLoader = sLoader;
|
|
||||||
|
|
||||||
auto & cache = TheFilterCache::get();
|
auto & cache = TheFilterCache::get();
|
||||||
|
|
||||||
// search loader on cache
|
// search loader on cache
|
||||||
CacheItem aLoader = cache.getItem(m_eType, sRealLoader);
|
CacheItem aLoader = cache.getItem(m_eType, sLoader);
|
||||||
|
|
||||||
// create service instance
|
// 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
|
// initialize filter
|
||||||
css::uno::Reference< css::lang::XInitialization > xInit(xLoader, css::uno::UNO_QUERY);
|
css::uno::Reference< css::lang::XInitialization > xInit(xLoader, css::uno::UNO_QUERY);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user