[Libreoffice-commits] core.git: Changes to 'private/matus/4-1-bookmarks'

[Matúš Kukan]

New branch 'private/matus/4-1-bookmarks' available with the following commits:
commit 7095ebccd57865dbc010607e137605b316d5b20d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Dec 10 12:06:49 2014 +0100

    sw: Unit test for cycle in lcl_CreatePortions
    
    Reviewed on:
    	https://gerrit.libreoffice.org/13413
    Conflicts:
    	sw/qa/extras/uiwriter/uiwriter.cxx
    
    (cherry picked from commit 4a3328a98f00818044694a9b6a0f7cda392273c6)
    
    Conflicts:
    	sw/qa/extras/uiwriter/uiwriter.cxx
    
    Change-Id: I26a8707046d7f30381fb51c41e49f8dee4796ba7

commit 9c6bedf6dcd0e9b4eee9cd7ae70212251ba0f889
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 10 16:08:05 2014 +0100

    sw UNO API: fix infinite loop when building portions of a bookmark range
    
    The problem was that in case the bookmark range points to a number of
    characters in a text node, where neither the start or the end is the paragraph
    start and end, and in case there is an at-char anchored object at the beginning
    of the paragraph, then lcl_CreatePortions() never ended.
    
    It is assumed that the loop in lcl_CreatePortions() will end at some stage, as
    every iteration moves the cursor forward. But this wasn't true in the above
    situation: the first frame was anchored at char pos 0, the range was char
    positions 1..7, and we failed to ignore frames which are anchored before start:
    so position was constantly 1.
    
    Fix the problem by explicitly ignoring frames before the current position, so
    lcl_ExportFrames() properly returns -1 when there are no anchored objects in
    the current range. Testcase is in the next commit.
    
    Change-Id: I73662e09cd09ee7e0ea4575b1150beb40f1ccc3a
    (cherry picked from commit 6d65e30fbaba383cbb9e1db6230a04865897ac8f)

commit 5092d914b9d1b91d5d049c5103f8ba764d06906a
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Dec 11 15:24:40 2014 +0100

    Add undo operation for deleting a bookmark, related fdo#51741
    
    (cherry picked from commit 9338bea6e8dfab8d360fe8ab19dd5d75071bfc2a)
    
    Conflicts:
    	sw/qa/extras/uiwriter/uiwriter.cxx
    	sw/source/core/crsr/bookmrk.cxx
    	sw/source/core/doc/docbm.cxx
    
    Change-Id: I79d8d3c30b6b0b2cc253963fdd50019aec033e12

commit 8e9a5e2292dbb5d74e013491d780682006c1a33e
Author: Renato Ferreira <renato.wolp at gmail.com>
Date:   Sat Nov 15 00:22:57 2014 -0500

    fdo#51741 Mark document as modified on bookmark rename / delete
    
    Deletion: overrided DdeBookmark::DeregisterFromDoc in Bookmark
    Renaming: in MarkManager::renameMark
    Reviewed-on: https://gerrit.libreoffice.org/12436
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit f0c4cd51cb160492d78c2796f71ecd88da25fa59)
    
    Conflicts:
    	sw/source/core/doc/docbm.cxx
    	sw/source/core/inc/bookmrk.hxx
    	sw/source/core/unocore/unobkm.cxx
    
    Change-Id: I378037ea546d0f2dc4ab9e0b0e6f9bf65c8db5b4

commit 9c43f2a57473c7502237d8ba645f46d69505a6e5
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Nov 26 11:58:13 2014 +0100

    Writer: Set document as modified and add undo when renaming bookmarks
    
    (cherry picked from commit c7fa6687e544e7f9702da23aadbd31c1f2e0115e)
    
    Change-Id: Id0d4695b6a7c5eae0493e679345bd41d4687d6d7