diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-08 11:02:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:13 +0200 |
| commit | 591ef7844079e93ff627c7e194c04d520d2f1d55 (patch) | |
| tree | 39c16f140ef2eae20f00a6c078d49519d4bd6bdc /sd | |
| parent | 81c967e06e4247dec7ecb9ffec695ba31cb4f057 (diff) | |
fdo#46808, Use singleton util::theMacroExpander new-style constructor
And deprecate the old-style service util::MacroExpander
Change-Id: Ifcefe31a8f8c68c6d44d6ec19616727eb607e1cd
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 7 | ||||
| -rw-r--r-- | sd/source/core/TransitionPreset.cxx | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 3e923eb83387..3cc45984e16e 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -18,7 +18,7 @@ */ #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> +#include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> @@ -303,9 +303,8 @@ void CustomAnimationPresets::importEffects() Reference< XMultiServiceFactory > xServiceFactory( xContext->getServiceManager(), UNO_QUERY_THROW ); - uno::Reference< util::XMacroExpander > xMacroExpander( - xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), - UNO_QUERY ); + uno::Reference< util::XMacroExpander > xMacroExpander = + util::theMacroExpander::get(xContext); Reference< XMultiServiceFactory > xConfigProvider = configuration::theDefaultProvider::get( xContext ); diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 53a09b8a26d6..3c9f408a635d 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> +#include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -148,9 +148,8 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) Reference< XMultiServiceFactory > xServiceFactory( xContext->getServiceManager(), UNO_QUERY_THROW ); - uno::Reference< util::XMacroExpander > xMacroExpander( - xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), - UNO_QUERY ); + uno::Reference< util::XMacroExpander > xMacroExpander = + util::theMacroExpander::get(xContext); // import ui strings Reference< XMultiServiceFactory > xConfigProvider = |