[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - external/postgresql officecfg/registry sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk          |    4 +++-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    6 ++++++
 sfx2/source/doc/objstor.cxx                                |    4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit fc1bb2e5271f4810f7abebaf84eb6d839a3f3e43
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Feb 4 10:36:09 2020 +0100
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed Feb 3 23:59:23 2021 +0100

    Allow opt-out from document events check
    
    Commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 added a warning on load
    when a document binds events to a macro.
    
    This adds an option to restore the old behavior, so that the warning only
    appears when a document actually has Macros.
    
    Change-Id: I5ad398d3d503a0954a746f4cba150f68630b820c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108141
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 2830a61082ba..cf4154524599 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2668,6 +2668,12 @@
           </info>
           <value>false</value>
         </prop>
+        <prop oor:name="CheckDocumentEvents" oor:type="xs:boolean" oor:nillable="false">
+          <info>
+            <desc>Warn on load when a document binds an event to a macro</desc>
+          </info>
+          <value>true</value>
+        </prop>
         <set oor:name="TrustedAuthors" oor:node-type="TrustedAuthor">
           <info>
             <desc>List with trusted authors.</desc>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 4df362520b10..6daa9d5e507d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3591,7 +3591,9 @@ void SfxObjectShell::SetMacroCallsSeenWhileLoading()
 
 bool SfxObjectShell::GetMacroCallsSeenWhileLoading() const
 {
-    return pImpl->m_bMacroCallsSeenWhileLoading;
+    if (officecfg::Office::Common::Security::Scripting::CheckDocumentEvents::get())
+        return pImpl->m_bMacroCallsSeenWhileLoading;
+    return false;
 }
 
 bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference< task::XInteractionHandler >& xHandler )
commit 02c1cd9f93e5b5da469e9d6ff8668f415965ecfc
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed Feb 3 23:23:40 2021 +0100

    postgresql: try to cargo-cult MSBuild arguments
    
    Extremely unclear to me whether these are useful or necessary,
    but the other MSBuild ones have them.
    
    Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index 1e0c7d848047..151b62397dd4 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,9 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
 	$(call gb_ExternalProject_run,build,\
-		MSBFLAGS=/p:Platform=$(if $(filter X86_64,$(CPUNAME)),x64,Win32) \
+		MSBFLAGS="/p:Platform=$(if $(filter X86_64,$(CPUNAME)),x64,Win32) \
+			$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+			$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
 		$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) libpq \
 	,src/tools/msvc)