diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 20 | ||||
| -rw-r--r-- | sd/source/core/TransitionPreset.cxx | 22 |
2 files changed, 15 insertions, 27 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index bf8fd5027a2a..8eb74eeaabcf 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/presentation/EffectPresetClass.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <unotools/streamwrap.hxx> @@ -316,19 +315,14 @@ void CustomAnimationPresets::importEffects() { try { - // Get service factory - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - DBG_ASSERT( xServiceFactory.is(), "sd::CustomAnimationPresets::import(), got no service manager" ); - if( !xServiceFactory.is() ) - return; - - uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< XMultiServiceFactory > xServiceFactory( + xContext->getServiceManager(), UNO_QUERY_THROW ); - uno::Reference< util::XMacroExpander > xMacroExpander; - if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY ); + uno::Reference< util::XMacroExpander > xMacroExpander( + xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), + UNO_QUERY ); Reference< XMultiServiceFactory > xConfigProvider( xServiceFactory->createInstance("com.sun.star.configuration.ConfigurationProvider" ), diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index dd03514cd5d4..3c77ead958fe 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> #include <vcl/svapp.hxx> @@ -152,19 +151,14 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) try { - // Get service factory - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - DBG_ASSERT( xServiceFactory.is(), "sd::CustomAnimationPresets::import(), got no service manager" ); - if( !xServiceFactory.is() ) - return false; - - uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; - - uno::Reference< util::XMacroExpander > xMacroExpander; - if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY ); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< XMultiServiceFactory > xServiceFactory( + xContext->getServiceManager(), UNO_QUERY_THROW ); + + uno::Reference< util::XMacroExpander > xMacroExpander( + xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), + UNO_QUERY ); // import ui strings Reference< XMultiServiceFactory > xConfigProvider( |