diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-29 13:50:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-29 14:46:59 +0300 |
| commit | e66fe457ff73520877820ef0c5d35ecffda73105 (patch) | |
| tree | 2ac36a1c20ebf968120f7f9704306d5428d72b2e /sw/source/uibase/wrtsh | |
| parent | 74f6d0df265a389f9e0668f322cec183451af2ff (diff) | |
Get rid of a pointless indirect function pointer variable
Sure, lots of them left. And actually, I don't know, maybe there is
some deeper reason why such are used in the sw coding style. Feel
free to revert these commits.
Change-Id: I5a1c31fe32b3bdf6d40489d029be165c38a8ba05
Diffstat (limited to 'sw/source/uibase/wrtsh')
| -rw-r--r-- | sw/source/uibase/wrtsh/move.cxx | 12 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/select.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index 7125044c7d13..f71b3ecd61b2 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -204,7 +204,7 @@ bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable, SttSelect(); } // Table cell ? - if ( !bBoxSelection && (MoveSection( fnSectionCurr, fnSectionStart) + if ( !bBoxSelection && (MoveSection( GoCurrSection, fnSectionStart) || bDontMoveRegion)) { if ( pMoveTable ) @@ -239,14 +239,14 @@ bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable, const FrameTypeFlags nFrameType = GetFrameType(nullptr,false); if ( FrameTypeFlags::FLY_ANY & nFrameType ) { - if( MoveSection( fnSectionCurr, fnSectionStart ) ) + if( MoveSection( GoCurrSection, fnSectionStart ) ) return true; else if ( FrameTypeFlags::FLY_FREE & nFrameType || bDontMoveRegion ) return false; } if(( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FOOTNOTE ) & nFrameType ) { - if ( MoveSection( fnSectionCurr, fnSectionStart ) ) + if ( MoveSection( GoCurrSection, fnSectionStart ) ) return true; else if ( bKeepArea ) return true; @@ -263,7 +263,7 @@ bool SwWrtShell::GoEnd(bool bKeepArea, bool *pMoveTable) if ( IsCursorInTable() ) { - if ( MoveSection( fnSectionCurr, fnSectionEnd ) || + if ( MoveSection( GoCurrSection, fnSectionEnd ) || MoveTable( fnTableCurr, fnTableEnd ) ) return true; } @@ -272,14 +272,14 @@ bool SwWrtShell::GoEnd(bool bKeepArea, bool *pMoveTable) const FrameTypeFlags nFrameType = GetFrameType(nullptr,false); if ( FrameTypeFlags::FLY_ANY & nFrameType ) { - if ( MoveSection( fnSectionCurr, fnSectionEnd ) ) + if ( MoveSection( GoCurrSection, fnSectionEnd ) ) return true; else if ( FrameTypeFlags::FLY_FREE & nFrameType ) return false; } if(( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FOOTNOTE ) & nFrameType ) { - if ( MoveSection( fnSectionCurr, fnSectionEnd) ) + if ( MoveSection( GoCurrSection, fnSectionEnd) ) return true; else if ( bKeepArea ) return true; diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 4defb8b64f99..90e5c98b0f0b 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -147,9 +147,9 @@ long SwWrtShell::SelAll() pEndPos.reset(new SwPosition( *pTmpCursor->GetMark() )); } Push(); - bool bIsFullSel = !MoveSection( fnSectionCurr, fnSectionStart); + bool bIsFullSel = !MoveSection( GoCurrSection, fnSectionStart); SwapPam(); - bIsFullSel &= !MoveSection( fnSectionCurr, fnSectionEnd); + bIsFullSel &= !MoveSection( GoCurrSection, fnSectionEnd); Pop(false); GoStart(true, &bMoveTable, false, !bIsFullSel); } |