desktop/source/app/app.cxx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
New commits: commit 9b5b99a8ff7439ccf73c40a9bd523e24f8c08903 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Jan 25 09:32:37 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Jan 25 11:41:55 2026 +0100 Some small tidy-up Change-Id: I36c149bfc024f522f70dd486c5ff0197ee45bdc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198060 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cab6bdcf27ad..d430ded3edc5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1448,23 +1448,21 @@ int Desktop::Main() || std::getenv("LIBO_UPDATER_TEST_RUNNING"); if (bUpdateRunning) { - OUString aSeeAlso = officecfg::Office::Update::Update::SeeAlso::get(); OUString aOldBuildID = officecfg::Office::Update::Update::OldBuildID::get(); - - OUString aBuildID = Updater::getBuildID(); - if (aOldBuildID == aBuildID) + if (aOldBuildID == Updater::getBuildID()) { Updater::log("Old and new Build ID are the same. No Updating took place."); } else { + OUString aSeeAlso = officecfg::Office::Update::Update::SeeAlso::get(); if (!aSeeAlso.isEmpty()) { SAL_INFO("desktop.updater", "See also: " << aSeeAlso); - Reference< css::system::XSystemShellExecute > xSystemShell( - SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); + Reference<css::system::XSystemShellExecute> xSystemShell( + SystemShellExecute::create(::comphelper::getProcessComponentContext())); - xSystemShell->execute( aSeeAlso, OUString(), SystemShellExecuteFlags::URIS_ONLY ); + xSystemShell->execute(aSeeAlso, OUString(), SystemShellExecuteFlags::URIS_ONLY); } } commit bddf848aec924cd4ab5dd4ebee69c4148f1f6e3a Author: Mike Kaganski <[email protected]> AuthorDate: Sun Jan 25 09:28:31 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Jan 25 11:41:45 2026 +0100 Use Updater::getBuildID() instead of manual expansion Change-Id: Ib97920bfb56ee28a6c9ffade8fc84440724c68eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198059 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 1fc90d160e75..cab6bdcf27ad 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1485,8 +1485,7 @@ int Desktop::Main() if (aUpdateFile.is() || std::getenv("LIBO_UPDATER_TEST_UPDATE")) { - OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}"); - rtl::Bootstrap::expandMacros(aBuildID); + OUString aBuildID(Updater::getBuildID()); std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Office::Update::Update::OldBuildID::set(aBuildID, batch);
