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

[Caolán McNamara]

 sw/source/core/undo/undobj.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd083e392651a2c381ab1fe8b9a1f2a1ec534354
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 3 15:39:30 2015 +0100

    Resolves: tdf#90138 don't try to save a marks OtherPos if it doesn't have one
    
    Change-Id: I522a236015c91c0744b3018d3d4e4d6c65ea19ab
    (cherry picked from commit 4fe5b44b15647542b1550deaeee43ec3d1e57591)
    Reviewed-on: https://gerrit.libreoffice.org/15141
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 78697dc..2134e04 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -783,7 +783,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                         if ( *pStt < rAnnotationEndPos && rAnnotationEndPos <= *pEnd )
                         {
                             bSavePos = true;
-                            bSaveOtherPos = true;
+                            bSaveOtherPos = pBkmk->IsExpanded(); //tdf#90138, only save the other pos if there is one
                         }
                     }
                 }