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 /unotools | |
| parent | fdo#69358: Avoid discontinuity in the gradient of window bar and toolbar (diff) | |
| download | core-094f92bb789ecd24793c5843bfae13e79122fc5a.tar.gz core-094f92bb789ecd24793c5843bfae13e79122fc5a.zip | |
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 'unotools')
| -rw-r--r-- | unotools/source/config/pathoptions.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index c7a1276133ad..c7beb4c7cba4 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> #include <com/sun/star/util/theMacroExpander.hpp> @@ -410,7 +410,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); // Create necessary services - Reference< XPathSettings > xPathSettings = PathSettings::create(xContext); + Reference< XPathSettings > xPathSettings = thePathSettings::get(xContext); m_xPathSettings.set( xPathSettings, UNO_QUERY_THROW ); m_xSubstVariables.set( PathSubstitution::create(xContext) ); m_xMacroExpander = theMacroExpander::get(xContext); |