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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbaoptions.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index aa952be731e0..bbddb69c7f62 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -100,7 +100,7 @@ #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/uri/XUriReference.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XRefreshable.hpp> diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index 6969248f3088..16d127fbbda1 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -24,7 +24,7 @@ #include <ooo/vba/word/WdColorIndex.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/thePathSettings.hpp> #include <osl/file.hxx> using namespace ::ooo::vba; @@ -95,7 +95,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) value >>= sNewPath; OUString sNewPathUrl; ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl ); - uno::Reference< util::XPathSettings > xPathSettings = util::PathSettings::create( comphelper::getProcessComponentContext() ); + uno::Reference< util::XPathSettings > xPathSettings = util::thePathSettings::get( comphelper::getProcessComponentContext() ); OUString sOldPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently @@ -110,7 +110,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) uno::Any SwVbaOptions::getValueEvent() { - uno::Reference< util::XPathSettings > xPathSettings = util::PathSettings::create( comphelper::getProcessComponentContext() ); + uno::Reference< util::XPathSettings > xPathSettings = util::thePathSettings::get( comphelper::getProcessComponentContext() ); OUString sPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently |