diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2025-03-21 15:48:41 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2025-03-21 17:52:33 +0100 |
| commit | 2719fecb93603d9bc8e24e3af3faa05b80d33292 (patch) | |
| tree | 3810b033c355c7f3f5080a84bea2808e138117ef | |
| parent | 6d2fd9f859a2fdb8e6b6b32dc9f36589e0645cb0 (diff) | |
tdf#165851 sfx2: fix loading template with expand URL from configuration
cib-6.4-33
Expand trusted URLs from configuration or extension.
(regression from commit 836d73a65180d89a077e36457f1f3aa1698c2058)
Change-Id: I7c2f8a59b44ae62e25ac26eb568f3f80c77a01ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183207
Tested-by: allotropia jenkins <jenkins@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | sfx2/source/view/frmload.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index b16d9b471048..133b04002d61 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -52,6 +52,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> @@ -424,6 +425,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() ) |