online.git: 2 commits - engine/desktop

["Mike Kaganski (via cogerrit)"]

engine/desktop/source/app/app.cxx | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 7948e3d991ffa050e9e9b1a6ad39685be21a55ae
Author: Mike Kaganski <mike.k...@collabora.com>
AuthorDate: Sun Jan 25 09:32:37 2026 +0100
Commit: Mike Kaganski <mike.k...@collabora.com>
CommitDate: Mon May 25 04:50:43 2026 +0000

Some small tidy-up

Avoid variable aBuildID used once.
Move variable aSeeAlso into its scope.
Align a line to its proper indentation level.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198060
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.k...@collabora.com>
Signed-off-by: Mike Kaganski <mike.k...@collabora.com>
Change-Id: I8d39507428eaf22a92c197cf3c6da7d3989297f3
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/1519
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/engine/desktop/source/app/app.cxx b/engine/desktop/source/app/app.cxx
index 6e9640de5f0f..495f1a833558 100644
--- a/engine/desktop/source/app/app.cxx
+++ b/engine/desktop/source/app/app.cxx
@@ -1414,23 +1414,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 9cf5cf94f32aa9a9350dd53735c102b7a6530b92
Author: Mike Kaganski <mike.k...@collabora.com>
AuthorDate: Sun Jan 25 09:28:31 2026 +0100
Commit: Mike Kaganski <mike.k...@collabora.com>
CommitDate: Mon May 25 04:50:30 2026 +0000

Use Updater::getBuildID() instead of manual expansion

The function does exactly what we need.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198059
Reviewed-by: Mike Kaganski <mike.k...@collabora.com>
Tested-by: Jenkins
Signed-off-by: Mike Kaganski <mike.k...@collabora.com>
Change-Id: Ifd22a99e8a116c60f3eceeecfe8cb16db2790819
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/1518
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/engine/desktop/source/app/app.cxx b/engine/desktop/source/app/app.cxx
index 0a63e9338012..6e9640de5f0f 100644
--- a/engine/desktop/source/app/app.cxx
+++ b/engine/desktop/source/app/app.cxx
@@ -1451,8 +1451,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);