sfx2/source/doc/docmacromode.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit ed0f3b16e4899900299e233a5d5cb5be4bf550c7 Author: Mike Kaganski <[email protected]> AuthorDate: Tue Nov 7 10:09:23 2023 +0300 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Nov 13 09:26:39 2023 +0100 getCurrentMacroExecMode returns sal_Int16 And that conforms the IDL definition of css::document::MacroExecMode Change-Id: I78ebfa94eb50552e7f4ecf3d64a0ac0556c56867 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159029 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159264 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index a5b4f87d3e3f..07a7978cc76e 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -111,7 +111,7 @@ namespace sfx2 bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction, bool bHasValidContentSignature ) { - sal_uInt16 nMacroExecutionMode = m_xData->m_rDocumentAccess.getCurrentMacroExecMode(); + sal_Int16 nMacroExecutionMode = m_xData->m_rDocumentAccess.getCurrentMacroExecMode(); if ( SvtSecurityOptions::IsMacroDisabled() ) { commit a922558d29a0a56369484c4ed913198af487238a Author: Mike Kaganski <[email protected]> AuthorDate: Mon Nov 6 21:32:01 2023 +0300 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Nov 13 09:26:29 2023 +0100 Simplify a bit XDocumentDigitalSignatures::isLocationTrusted would remove segments itself, as needed; this change not only simplifies this code, but also potentially allows to define not only trusted directories, but also individuals trusted files (if the UI would be adjusted). Change-Id: I0b0d60946d84a52479fcce5ce49d368cf53283fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159009 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159263 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 4133f9d9b0a1..a5b4f87d3e3f 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -173,9 +173,7 @@ namespace sfx2 Reference< XDocumentDigitalSignatures > xSignatures(DocumentDigitalSignatures::createDefault(::comphelper::getProcessComponentContext())); INetURLObject aURLReferer(sURL); - OUString aLocation; - if ( aURLReferer.removeSegment() ) - aLocation = aURLReferer.GetMainURL( INetURLObject::DecodeMechanism::NONE ); + OUString aLocation = aURLReferer.GetMainURL( INetURLObject::DecodeMechanism::NONE ); if ( !aLocation.isEmpty() && xSignatures->isLocationTrusted( aLocation ) ) {
