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 /ucb | |
| 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 'ucb')
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 0fc6ec64c89a..2920d4461dd2 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -28,7 +28,7 @@ #include <osl/diagnose.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/util/XOfficeInstallationDirectories.hpp> +#include <com/sun/star/util/theOfficeInstallationDirectories.hpp> #include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> #include "hierarchyprovider.hxx" @@ -268,13 +268,7 @@ HierarchyContentProvider::getOfficeInstallationDirectories() { OSL_ENSURE( m_xContext.is(), "No service manager!" ); - m_xContext->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) - >>= m_xOfficeInstDirs; - -// Be silent. singleton only available in an Office environment. -// OSL_ENSURE( m_xOfficeInstDirs.is(), -// "Unable to obtain office directories singleton!" ); + m_xOfficeInstDirs = util::theOfficeInstallationDirectories::get(m_xContext); } } return m_xOfficeInstDirs; |