Kaydet (Commit) fd8183f7 authored tarafından Noel Grandin's avatar Noel Grandin

no point in redeclaring methods with slightly different names

Change-Id: I446ca61415e998d1f325b602cb587815af5ff425
Reviewed-on: https://gerrit.libreoffice.org/18813Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 98680db4
......@@ -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() );
......
......@@ -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(); }
......
......@@ -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())
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment