diff options
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/factory.cxx | 4 | ||||
| -rw-r--r-- | cppuhelper/source/servicemanager.cxx | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 361cbb2c6750..ee08c612e4e1 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -553,7 +553,7 @@ ORegistryFactoryHelper::getPropertySetInfo() IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper() { ::osl::MutexGuard guard( aMutex ); - if (m_property_array_helper.get() == nullptr) + if (m_property_array_helper == nullptr) { beans::Property prop( "ImplementationKey" /* name */, @@ -564,7 +564,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper() m_property_array_helper.reset( new ::cppu::OPropertyArrayHelper( &prop, 1 ) ); } - return *m_property_array_helper.get(); + return *m_property_array_helper; } diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index dd7139af252f..6c64911a5270 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -986,9 +986,8 @@ cppuhelper::ServiceManager::createInstanceWithContext( { std::shared_ptr< Data::Implementation > impl( findServiceImplementation(Context, aServiceSpecifier)); - return impl.get() == nullptr - ? css::uno::Reference< css::uno::XInterface >() - : impl->createInstance(Context, false); + return impl == nullptr ? css::uno::Reference<css::uno::XInterface>() + : impl->createInstance(Context, false); } css::uno::Reference< css::uno::XInterface > @@ -999,9 +998,8 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext( { std::shared_ptr< Data::Implementation > impl( findServiceImplementation(Context, ServiceSpecifier)); - return impl.get() == nullptr - ? css::uno::Reference< css::uno::XInterface >() - : impl->createInstanceWithArguments(Context, false, Arguments); + return impl == nullptr ? css::uno::Reference<css::uno::XInterface>() + : impl->createInstanceWithArguments(Context, false, Arguments); } css::uno::Type cppuhelper::ServiceManager::getElementType() |