diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-04 10:53:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 10:16:12 +0100 |
| commit | 7e189aa4b752efcc5a4ac275c48810c7314a871e (patch) | |
| tree | c2aa40c9de7517eb7082485cb013405a880ddd36 /sw | |
| parent | LOK: add LOK_CALLBACK_CURSOR_VISIBLE (diff) | |
| download | core-7e189aa4b752efcc5a4ac275c48810c7314a871e.tar.gz core-7e189aa4b752efcc5a4ac275c48810c7314a871e.zip | |
Use SwCrsrShell::SelTblBox()
The only user of SwCrsrShell::SelectCell() can actually use SelTblBox()
instead.
Change-Id: I286a3d8c25834dd08897f0cfc37a3ec31a89ce7a
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/crsrsh.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/crsr/crstrvl1.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 2 |
4 files changed, 4 insertions, 12 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 1fdef4b9a96f..13489ce684b4 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -157,8 +157,7 @@ public: SCROLLWIN = (1 << 1), ///< scroll window CHKRANGE = (1 << 2), ///< check overlapping PaMs NOCALRECT = (1 << 3), ///< don't recalculate CharRect - READONLY = (1 << 4), ///< make visible in spite of Readonly - SELECTCELL = (1 << 5) ///< Create table cursor even if we don't span over multiple cells. + READONLY = (1 << 4) ///< make visible in spite of Readonly }; private: @@ -730,8 +729,6 @@ public: bool GoStartSentence(); bool GoEndSentence(); bool SelectWord( const Point* pPt = 0 ); - /// Creates table cursor even if we don't span over multiple cells. - void SelectCell(); bool ExpandToSentenceBorders(); // get position from current cursor diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index ce7dc5ceed2d..982a2ac99bbb 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1417,11 +1417,11 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd ) // If the current cursor is in a table and point/mark in different boxes, // then the table mode is active (also if it is already active: m_pTblCrsr) SwPaM* pTstCrsr = getShellCrsr( true ); - if( ( pTstCrsr->HasMark() || eFlags & SwCrsrShell::SELECTCELL ) && !m_pBlockCrsr && + if( pTstCrsr->HasMark() && !m_pBlockCrsr && mpDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) && ( m_pTblCrsr || pTstCrsr->GetNode( true ).StartOfSectionNode() != - pTstCrsr->GetNode( false ).StartOfSectionNode() || eFlags & SwCrsrShell::SELECTCELL ) && !mbSelectAll) + pTstCrsr->GetNode( false ).StartOfSectionNode() ) && !mbSelectAll) { SwShellCrsr* pITmpCrsr = getShellCrsr( true ); Point aTmpPt( pITmpCrsr->GetPtPos() ); diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx index d39e89ccf75b..699302a7e4e1 100644 --- a/sw/source/core/crsr/crstrvl1.cxx +++ b/sw/source/core/crsr/crstrvl1.cxx @@ -81,11 +81,6 @@ bool SwCrsrShell::SelectWord( const Point* pPt ) return m_pCurCrsr->SelectWord( this, pPt ); } -void SwCrsrShell::SelectCell() -{ - UpdateCrsr(SwCrsrShell::SELECTCELL); -} - bool SwCrsrShell::ExpandToSentenceBorders() { return m_pCurCrsr->ExpandToSentenceBorders(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 981b5380074c..7dc3c0c1938e 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -3414,7 +3414,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // Double click did not select any word: try to // select the current cell in case we are in a // table. - rSh.SelectCell(); + rSh.SelTblBox(); } g_bHoldSelection = true; return; |