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

[Oliver-Rainer Wittmann]

 sw/source/core/crsr/swcrsr.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 33cbbd3a3a969b8ffd1e0155d5c84da8e1a2f863
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue Dec 10 15:24:52 2013 +0000

    Related: #i33737# correction: assure the selections does not...
    
    start/end inside a table while end/start of the selection is outside the table
    
    (cherry picked from commit 382814ccb30bfe71f093e55e23802447caca235d)
    
    Conflicts:
    	sw/source/core/crsr/swcrsr.cxx
    
    Change-Id: Ibcbd9b18538ce04abfae11e75b30d6897a62e268
    (cherry picked from commit 3fc6fc2ff7304a0d1bc85bd2e03fb3fbab492c9a)

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index dcd81fb..d27ebca 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -448,10 +448,9 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
         }
     }
 
+    const SwTableNode* pPtNd = GetPoint()->nNode.GetNode().FindTableNode();
+    const SwTableNode* pMrkNd = GetMark()->nNode.GetNode().FindTableNode();
     // both in no or in same table node
-    const SwTableNode* pPtNd = pNd->FindTableNode();
-    const SwTableNode* pMrkNd = pNd->FindTableNode();
-    // beide in keinem oder beide im gleichen TableNode
     if( ( !pMrkNd && !pPtNd ) || pPtNd == pMrkNd )
         return sal_False;