[Libreoffice-commits] core.git: sw/source

[Noel Grandin]

 sw/source/uibase/dochdl/swdtflvr.cxx |    8 ++++----
 sw/source/uibase/inc/wrtsh.hxx       |    2 --
 sw/source/uibase/wrtsh/delete.cxx    |    6 +++---
 sw/source/uibase/wrtsh/select.cxx    |    2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit fd8183f7d2458fe474fe36462d2d4c23bc1d37e7
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Wed Sep 23 14:44:58 2015 +0200

    no point in redeclaring methods with slightly different names
    
    Change-Id: I446ca61415e998d1f325b602cb587815af5ff425
    Reviewed-on: https://gerrit.libreoffice.org/18813
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 31a5c47..97a1759 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 16b4836..01db507 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 897d9e7..36cde06 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 7461733..5e3acf1 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 );