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

[Bjoern Michaelsen]

 sw/source/core/crsr/crsrsh.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 0f6431dd4d9b91e3819abee35ebc946c800f53fd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Mar 7 10:15:55 2014 +0100

    fdo#74854: better loose selection than crashing
    
    - this is just a bandaid
    
    Change-Id: Iebd901a9e88967e00e235f7f8849c48246e950d1
    Reviewed-on: https://gerrit.libreoffice.org/8491
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index b51c3cc..5241423 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1428,6 +1428,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
                 m_pCurCrsr->SwSelPaintRects::Hide();
 
                 CheckTblBoxCntnt();
+                if(!m_pTblCrsr)
+                {
+                    SAL_WARN("sw", "fdo#74854: "
+                        "this should not happen, but better loose the selection "
+                        "rather than crashing");
+                    return;
+                }
             }
 
             SwCrsrMoveState aTmpState( MV_NONE );