configure.ac | 2 +-
sfx2/source/view/frmload.cxx | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit d1073b9527bbbddf6d6a13092367269097e9f3d1
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Mar 25 04:59:41 2025 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Mar 25 04:59:41 2025 +0100
Release 24.2.11
Change-Id: If7fe53a7272352aa075780dc9d31ac9f191884d6
diff --git a/configure.ac b/configure.ac
index 5d6c9628168e..5f003b168ca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[24.2.10.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.11.0],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit a5ad31753e96e2268beef8420af31c7127b75a68
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Mar 21 15:48:41 2025 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Mar 25 04:58:30 2025 +0100
tdf#165851 sfx2: fix loading template with expand URL from configuration
Expand trusted URLs from configuration or extension.
(regression from commit 836d73a65180d89a077e36457f1f3aa1698c2058)
Change-Id: I7c2f8a59b44ae62e25ac26eb568f3f80c77a01ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183206
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 7f58a397ccd3..e1f7d1e327de 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XCloseable.hpp>
+#include <comphelper/getexpandeduri.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -417,6 +418,8 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument(
::comphelper::NamedVal
sTemplateURL = SfxObjectFactory::GetStandardTemplate(
sServiceName );
else
sTemplateURL = SfxObjectFactory::GetStandardTemplate(
SfxObjectShell::GetServiceNameFromFactory( sURL ) );
+ // tdf#165851 expand trusted urls from configuration here
+ sTemplateURL = comphelper::getExpandedUri(m_aContext,
sTemplateURL);
}
if ( !sTemplateURL.isEmpty() )
