[Libreoffice-commits] core.git: desktop/source

[Markus Mohrhard]

 desktop/source/app/updater.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9cdeee3a7740b4f1f28611f4db3bd5d8326c71ce
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 12 07:05:02 2017 +0200

    use the shared path code
    
    Change-Id: I046b8f497b78c4067abbf22180edb1b210020f4e
    Reviewed-on: https://gerrit.libreoffice.org/38684
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 4dc2d961f07a..fbb48d137811 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -209,12 +209,9 @@ struct update_info
 
 void update()
 {
-    OUString aLibExecDirURL( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER );
-    rtl::Bootstrap::expandMacros(aLibExecDirURL);
-
     utl::TempFile aTempDir(nullptr, true);
     OUString aTempDirURL = aTempDir.GetURL();
-    CopyUpdaterToTempDir(aLibExecDirURL, aTempDirURL);
+    CopyUpdaterToTempDir(Updater::getExecutableDirURL(), aTempDirURL);
 
     OUString aTempDirPath = getPathFromURL(aTempDirURL);
     OString aPath = OUStringToOString(aTempDirPath + "/" + OUString::fromUtf8(pUpdaterName), RTL_TEXTENCODING_UTF8);