[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - sfx2/qa sw/qa

[Michael Stahl (via logerrit)]

 sfx2/qa/complex/sfx2/UndoManager.java |    4 +++-
 sw/qa/extras/layout/layout.cxx        |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 525094ee396a66b1f43500d9d86181edacd2d317
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue May 10 15:22:17 2022 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 10 15:22:17 2022 +0200

    sw: disable forcepoint93-2.rtf, it loops in layout
    
    Change-Id: I09b40521535cbbcfd07595e272cc530afeb22cf6

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 38955273e357..ea4619f9c1bc 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2995,7 +2995,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint92) { 
createDoc("forcepoint92
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint93)
 {
 //fails to load    createDoc("forcepoint93-1.rtf");
-    createDoc("forcepoint93-2.rtf");
+//layout loop    createDoc("forcepoint93-2.rtf");
 }
 
 #if 0 // no createSwWebDoc
commit 53bd4676cf89904c962fa755521c243229db9c1c
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue May 10 13:16:52 2022 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 10 13:17:31 2022 +0200

    sfx2: add config warning in UndoManager complex test
    
    ... and remove obsolete comment, that problem was fixed a decade ago.
    
    Change-Id: I06e122128ff009778da87891739016ecc8975895

diff --git a/sfx2/qa/complex/sfx2/UndoManager.java 
b/sfx2/qa/complex/sfx2/UndoManager.java
index 7e438e852e71..02f4d3055346 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -224,7 +224,9 @@ public class UndoManager
         };
         events.replaceByName( "OnViewCreated", scriptDescriptor );
 
-        // The below doesn't work: event notification is broken in m96, see 
https://bz.apache.org/ooo/show_bug.cgi?id=116313
+        // note: this may be prevented from working by setting
+        // Office::Common::Security::Scripting::AllowedDocumentEventURLs
+        // (checked in SfxEvents_Impl::isScriptURLAllowed())
         m_callbackCalled = false;
         m_currentDocument.getCurrentView().dispatch( ".uno:NewWindow" );
         assertTrue( "triggering an event did not work as expected - basic 
script not called", m_callbackCalled );