summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-12-10 15:24:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-10 20:30:54 +0000
commit3fc6fc2ff7304a0d1bc85bd2e03fb3fbab492c9a (patch)
tree435b34646c8c49ce5293b0bf277ec35818858a2c
parentf6f2ee5bdd9e0d44437bfbd6dd338adea956b2ab (diff)
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
-rw-r--r--sw/source/core/crsr/swcrsr.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 7241157ec028..014a006dac46 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;