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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optpath.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 42a15602e84a..f04babaa0d56 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -242,7 +242,7 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XFlushable.hpp> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d4f5361285aa..1d5349db7e27 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -90,7 +90,7 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include "dlgname.hxx" @@ -4927,7 +4927,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, graphic::GraphicProvider::create( xComponentContext ) ); uno::Reference< css::util::XPathSettings > xPathSettings = - css::util::PathSettings::create( xComponentContext ); + css::util::thePathSettings::get( xComponentContext ); OUString aDirectory = xPathSettings->getUserConfig(); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index af138e308674..5aa07b462a18 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include <officecfg/Office/Common.hxx> #include "optHeaderTabListbox.hxx" #include <vcl/help.hxx> @@ -722,7 +722,7 @@ void SvxPathTabPage::GetPathList( if ( !pImpl->m_xPathSettings.is() ) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); - pImpl->m_xPathSettings = css::util::PathSettings::create( xContext ); + pImpl->m_xPathSettings = css::util::thePathSettings::get( xContext ); } // load internal paths @@ -791,7 +791,7 @@ void SvxPathTabPage::SetPathList( if ( !pImpl->m_xPathSettings.is() ) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); - pImpl->m_xPathSettings = css::util::PathSettings::create( xContext ); + pImpl->m_xPathSettings = css::util::thePathSettings::get( xContext ); } // save user paths |