diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-27 09:51:58 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-06 12:03:25 +0100 |
| commit | 094f92bb789ecd24793c5843bfae13e79122fc5a (patch) | |
| tree | e0bcb505f942a7f323cdbc9419eede5723165f5c /framework/source/accelerators/presethandler.cxx | |
| parent | a315454f349469923490e4116806ee19263849b8 (diff) | |
Introduce com.sun.star.util.thePathSettings singleton.
To replace single-instance com.sun.star.util.PathSettings service,
incorrectly converted in 89b0017b22889af6a8afe28b94c06e7095dc8c6f
Keeping util::PathSettings::create in
sc/source/ui/vba/vbaapplication.cxx because for some reason
util::thePathSettings::get does not work in sc_macros_test
while testing sc/qa/extras/testdocuments/Ranges.xls.
Change-Id: I75b68ae56ac5b58f72416070dba100ab3ab70fe8
Diffstat (limited to 'framework/source/accelerators/presethandler.cxx')
| -rw-r--r-- | framework/source/accelerators/presethandler.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index efde565eac25..25006679d1e8 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include <vcl/svapp.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -216,7 +216,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // <- SAFE ---------------------------------- css::uno::Reference< css::util::XPathSettings > xPathSettings = - css::util::PathSettings::create( xContext ); + css::util::thePathSettings::get( xContext ); OUString sShareLayer = xPathSettings->getBasePathShareLayer(); @@ -274,7 +274,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // <- SAFE ---------------------------------- css::uno::Reference< css::util::XPathSettings > xPathSettings = - css::util::PathSettings::create( xContext ); + css::util::thePathSettings::get( xContext ); OUString sUserLayer = xPathSettings->getBasePathUserLayer(); |