[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - basic/source sw/qa sw/source

[Michael Stahl]

 basic/source/classes/eventatt.cxx |    6 ++++-
 sw/qa/core/macros-test.cxx        |   43 ++++++++++++++++++++++++++++++++++++++
 sw/source/core/undo/undel.cxx     |    4 +++
 3 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit 28bfba7405b35741a73066386ddb6fc017b32233
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 29 13:38:40 2015 +0100

    tdf#75996: sw: correct bookmark positions when deleting text
    
    The problem is that SwUndoDelete will move the fully selected nodes to
    the UndoNodes but it leaves bookmarks with their SwIndex pointing to the
    deleted nodes.  The SwNodeIndex are corrected by SwNodes::_MoveNodes()
    so they point to a different node than the SwIndex.
    
    This only happens if only one position of the bookmark is inside the
    deletion range; if both are, the bookmark will be deleted by
    SwUndoSaveCntnt::DelCntntIndex().
    
    Also joining the 2 start/end nodes of the selection will accidentally
    correct the bookmarks but only if it happens to delete the end node.
    (and apparently there is also a DeleteRange method that doesn't join)
    
    Change-Id: I91ec362bb833328f8d681fd9458cb915c4efb267
    (cherry picked from commit 370febbf19a5f362394d1c9e69b12dcb218f6501)
    Reviewed-on: https://gerrit.libreoffice.org/14240
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index e2194e5..3101de7 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -43,6 +43,8 @@
 
 #include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
+#include <IDocumentUndoRedo.hxx>
+#include <IDocumentContentOperations.hxx>
 #include "docsh.hxx"
 
 typedef tools::SvRef<SwDocShell> SwDocShellRef;
@@ -66,6 +68,7 @@ public:
 #if !defined MACOSX && !defined WNT
     void testVba();
 #endif
+    void testBookmarkDeleteAndJoin();
     void testFdo55289();
     void testFdo68983();
     CPPUNIT_TEST_SUITE(SwMacrosTest);
@@ -75,6 +78,7 @@ public:
     //CPPUNIT_TEST(testStarBasic);
     CPPUNIT_TEST(testVba);
 #endif
+    CPPUNIT_TEST(testBookmarkDeleteAndJoin);
     CPPUNIT_TEST(testFdo55289);
     CPPUNIT_TEST(testFdo68983);
 
@@ -161,6 +165,45 @@ void SwMacrosTest::testVba()
 }
 #endif
 
+void SwMacrosTest::testBookmarkDeleteAndJoin()
+{
+    SwDoc *const pDoc = new SwDoc;
+    pDoc->GetIDocumentUndoRedo().DoUndo(true); // bug is in SwUndoDelete
+    SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+    SwPaM aPaM(aIdx);
+
+    IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
+    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.InsertString(aPaM, OUString("A"));
+    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.InsertString(aPaM, OUString("A"));
+    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    aPaM.Move(fnMoveBackward, fnGoNode);
+    aPaM.Move(fnMoveBackward, fnGoNode);
+    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.SetMark();
+    aPaM.Move(fnMoveForward, fnGoDoc);
+    IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
+    sw::mark::IMark *pMark =
+            rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::BOOKMARK);
+    CPPUNIT_ASSERT(pMark);
+    // select so pMark start position is on a node that is fully deleted
+    aPaM.Move(fnMoveBackward, fnGoNode);
+    // must leave un-selected content in last node to get the bJoinPrev flag!
+    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Exchange();
+    aPaM.Move(fnMoveBackward, fnGoDoc);
+    // delete
+    rIDCO.DeleteAndJoin(aPaM, false);
+
+    for (IDocumentMarkAccess::const_iterator_t i = rIDMA.getAllMarksBegin(); i != rIDMA.getAllMarksEnd(); ++i)
+    {
+        // problem was that the nContent was pointing at deleted node
+        CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetCntntNode() ==
+            static_cast<const SwCntntNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
+    }
+}
+
 void SwMacrosTest::testFdo55289()
 {
     SwDoc *const pDoc = new SwDoc;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index b486ad8..253ef99 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -153,7 +153,11 @@ SwUndoDelete::SwUndoDelete(
         _DelBookmarks(pStt->nNode, pEnd->nNode);
     }
     else
+    {
         DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+        ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
+        _DelBookmarks(pStt->nNode, pEnd->nNode, nullptr, &pStt->nContent, &pEnd->nContent);
+    }
 
     nSetPos = pHistory ? pHistory->Count() : 0;
 
commit 22671c1545f8bfff660acdf981d6d36bf73ded63
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 27 21:33:31 2015 +0100

    tdf#76174: basic: lock SolarMutex in BasicScriptListener_Impl
    
    ... before calling into BASIC.
    
    Change-Id: I51a59fe5ca9b15ff7ec509c052964523d87a9790
    (cherry picked from commit a4faad707c7fb27884fff5f20e5797b160d4f320)
    Reviewed-on: https://gerrit.libreoffice.org/14237
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 3718e16..2770c0b 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -48,7 +48,7 @@
 #include <basic/basicmanagerrepository.hxx>
 #include <basic/basmgr.hxx>
 
-
+#include <vcl/svapp.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <sbunoobj.hxx>
 #include <basic/sbstar.hxx>
@@ -161,12 +161,16 @@ public:
 // Methods XAllListener
 void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception )
 {
+    SolarMutexGuard g;
+
     firing_impl( aScriptEvent, NULL );
 }
 
 Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
     throw ( InvocationTargetException, RuntimeException, std::exception )
 {
+    SolarMutexGuard g;
+
     Any aRetAny;
     firing_impl( aScriptEvent, &aRetAny );
     return aRetAny;