sfx2/source/view/frmload.cxx | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 8c548d46f4eacd615527412a0019d7a46150bee6 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Fri Mar 21 15:48:41 2025 +0100 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Fri Mar 21 17:24:54 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 7ef7c19d2f63..39de317cb4fd 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> @@ -418,6 +419,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() )