diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 14:44:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 13:12:00 +0000 |
| commit | fd8183f7d2458fe474fe36462d2d4c23bc1d37e7 (patch) | |
| tree | 38df17bd7bba2d2f10bb056438dd60d9a6530a37 /sw | |
| parent | 98680db45f51296f536b9f9889f53172fa50ee8f (diff) | |
no point in redeclaring methods with slightly different names
Change-Id: I446ca61415e998d1f325b602cb587815af5ff425
Reviewed-on: https://gerrit.libreoffice.org/18813
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/inc/wrtsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/delete.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/select.cxx | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 31a5c47e92f4..97a1759eaa41 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -3270,12 +3270,12 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell ) // Why not for other Scripts? If TRNSFR_DOCUMENT_WORD is set, we have a word // in the buffer, word in this context means 'something with spaces at beginning // and end'. In this case we definitely want these spaces to be inserted here. - bInWrd = rShell.IsInWrd(); + bInWrd = rShell.IsInWord(); bEndWrd = rShell.IsEndWrd(); bSmart = bInWrd || bEndWrd; if( bSmart ) { - bSttWrd = rShell.IsSttWrd(); + bSttWrd = rShell.IsStartWord(); if( bSmart && !bSttWrd && (bInWrd || bEndWrd) ) rShell.SwEditShell::Insert(' '); } @@ -3415,9 +3415,9 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, rSh.GoNextCrsr(); } - bInWrd = rSh.IsInWrd(); + bInWrd = rSh.IsInWord(); bEndWrd = rSh.IsEndWrd(); - bSttWrd = !bEndWrd && rSh.IsSttWrd(); + bSttWrd = !bEndWrd && rSh.IsStartWord(); bSttPara= rSh.IsSttPara(); Point aSttPt( SwEditWin::GetDDStartPosX(), SwEditWin::GetDDStartPosY() ); diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 16b4836e851f..01db507f1b9c 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -171,8 +171,6 @@ public: inline bool Is_FnDragEQBeginDrag() const; // base requests - bool IsInWrd() { return IsInWord(); } - bool IsSttWrd() { return IsStartWord(); } bool IsEndWrd(); bool IsSttOfPara() const { return IsSttPara(); } bool IsEndOfPara() const { return IsEndPara(); } diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 897d9e7f5f10..36cde06faa6f 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -488,9 +488,9 @@ long SwWrtShell::DelNxtWord() ResetCursorStack(); EnterStdMode(); SetMark(); - if(IsEndWrd() && !IsSttWrd()) + if(IsEndWrd() && !IsStartWord()) _NxtWrdForDelete(); // #i92468# - if(IsSttWrd() || IsEndPara()) + if(IsStartWord() || IsEndPara()) _NxtWrdForDelete(); // #i92468# else _EndWrd(); @@ -512,7 +512,7 @@ long SwWrtShell::DelPrvWord() ResetCursorStack(); EnterStdMode(); SetMark(); - if ( !IsSttWrd() || + if ( !IsStartWord() || !_PrvWrdForDelete() ) // #i92468# { if (IsEndWrd() || IsSttPara()) diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 74617336f80c..5e3acf1583e8 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -63,7 +63,7 @@ void SwWrtShell::Invalidate() bool SwWrtShell::SelNearestWrd() { SwMvContext aMvContext(this); - if( !IsInWrd() && !IsEndWrd() && !IsSttWrd() ) + if( !IsInWord() && !IsEndWrd() && !IsStartWord() ) PrvWrd(); if( IsEndWrd() ) Left(CRSR_SKIP_CELLS, false, 1, false ); |