diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-08-28 23:32:12 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:20 +0200 |
| commit | 38c8bd997713986cf7053737f480a044b7249cf0 (patch) | |
| tree | ad44e3a732e54c86ca7baf19330eaae2b9aa0a78 /desktop/source | |
| parent | a2a62b3385c01467317922caa34dfda7d66e182b (diff) | |
an URL is not a path
Change-Id: I15a576a4b529d5551b72955212db7f10277747e3
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/app/updater.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 49eb27b4050d..be2be3f0b5dc 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1464,11 +1464,11 @@ int Desktop::Main() #if HAVE_FEATURE_UPDATE_MAR if (officecfg::Office::Update::Update::Enabled::get()) { - OUString aPatchDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/patch/"); - rtl::Bootstrap::expandMacros(aPatchDirPath); + OUString aPatchDirURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/patch/"); + rtl::Bootstrap::expandMacros(aPatchDirURL); osl::DirectoryItem aPatchInfo; - osl::DirectoryItem::get(aPatchDirPath + "/update.info", aPatchInfo); + osl::DirectoryItem::get(aPatchDirURL + "/update.info", aPatchInfo); if (aPatchInfo.is()) { diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index 70879f2b3b30..4e232ae934d5 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx @@ -147,9 +147,9 @@ void CreateValidUpdateDir() OUString aInstallPath = getPathFromURL(aInstallDir); OUString aWorkdirPath = getPathFromURL(aInstallDir + "/updated"); - OUString aPatchDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/patch/"); - rtl::Bootstrap::expandMacros(aPatchDirPath); - OUString aPatchDir = getPathFromURL(aPatchDirPath); + OUString aPatchDirURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/patch/"); + rtl::Bootstrap::expandMacros(aPatchDirURL); + OUString aPatchDir = getPathFromURL(aPatchDirURL); OUString aUpdaterPath = getPathFromURL(aInstallDir + "/program/" + OUString::fromUtf8(pUpdaterName)); |