diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-13 08:31:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-04 10:13:19 +0200 |
| commit | fb0f7c2415321a3bcae00802b98ae76144ea4e79 (patch) | |
| tree | 36dad4567ce8bddb82dc0b78a8eead16fdaaa825 /sfx2 | |
| parent | 57dbe20c2bfa0cf5ced0826f61a130414c948f83 (diff) | |
fdo#46808, convert singleton util::theOfficeInstallationDirectories
.. to new-style UNO.
And deprecate old service in favour of singleton.
Change-Id: I67244097c22af02530214d7c529dd0d32f5964c1
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index d85ca00f72f5..c25faa6a9811 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/util/theMacroExpander.hpp> +#include <com/sun/star/util/theOfficeInstallationDirectories.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/document/XTypeDetection.hpp> @@ -2830,15 +2831,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs() uno::Reference< XComponentContext > xCtx( comphelper::getComponentContext( mxFactory ) ); - xCtx->getValueByName( - rtl::OUString( - "/singletons/" - "com.sun.star.util.theOfficeInstallationDirectories" ) ) - >>= mxOfficeInstDirs; - - OSL_ENSURE( mxOfficeInstDirs.is(), - "Unable to obtain office installation directory " - "singleton!" ); + mxOfficeInstDirs = theOfficeInstallationDirectories::get(xCtx); } } } |