diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-22 13:08:21 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-23 12:59:11 +0000 |
| commit | 095107f266fa376ea1b8fe4cf263277230f8da52 (patch) | |
| tree | 5641e62c480d0969c82a6e707a2c7efc242dbdd3 | |
| parent | b5592e03a884fd31321517fcc1b8ce2d0b3ee07b (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 7e98436061ff..dc5f97a1b28c 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(); |