framework/source/services/substitutepathvars.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 095107f266fa376ea1b8fe4cf263277230f8da52
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Sep 22 13:08:21 2014 +0200
Related fdo#77813: $(workdirurl) was always empty
Regression introduced with cb021fcafba06ccf973f2abe229a4761c0a002de
"fdo#46037:
remove 1 comphelper/configurationhelper in framework."
Change-Id: I07727d93315e0d3d87004ce71708271e90a173a3
(cherry picked from commit 3c6da8e49a96513eda73656f3f6212f980a74b51)
Reviewed-on: https://gerrit.libreoffice.org/11592
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index 7e98436..dc5f97a 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -680,8 +680,7 @@ OUString SubstitutePathVariables::GetWorkPath() const
{
OUString aWorkPath;
css::uno::Reference< css::container::XHierarchicalNameAccess >
xPaths(officecfg::Office::Paths::Paths::get(m_xContext),
css::uno::UNO_QUERY_THROW);
- OUString xWork;
- if (!(xPaths->getByHierarchicalName("['Work']/WritePath") >>= xWork))
+ if (!(xPaths->getByHierarchicalName("['Work']/WritePath") >>= aWorkPath))
// fallback in case config layer does not return an useable work dir
value.
aWorkPath = GetWorkVariableValue();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
