[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - framework/source

[Stephan Bergmann]

 framework/source/services/substitutepathvars.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fa15216b2ffc70304d6bbc0f37e9c5b8cf4cff56
Author: Stephan Bergmann <sbergman at 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/11591
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index deed622..0a02705 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -821,8 +821,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();