diff options
Diffstat (limited to 'filter/source/config/cache/frameloaderfactory.cxx')
-rw-r--r-- | filter/source/config/cache/frameloaderfactory.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 3627ea93faa1..ee78ebd98979 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -29,8 +29,7 @@ namespace filter::config{ FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : m_xContext(rxContext) { - BaseContainer::init(rxContext , - "com.sun.star.comp.filter.config.FrameLoaderFactory" , + BaseContainer::init("com.sun.star.comp.filter.config.FrameLoaderFactory" , { "com.sun.star.frame.FrameLoaderFactory" }, FilterCache::E_FRAMELOADER ); } @@ -51,7 +50,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI const css::uno::Sequence< css::uno::Any >& lArguments) { // SAFE -> - osl::MutexGuard aLock(m_aMutex); + std::unique_lock aLock(m_aMutex); auto & cache = GetTheFilterCache(); @@ -73,7 +72,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI aLoader >> lConfig; ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector<css::uno::Any> >(lArguments)); - stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); + stlArguments.insert(stlArguments.begin(), css::uno::Any(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); } |