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

[Tomaž Vajngerl]

 sw/source/core/crsr/swcrsr.cxx    |    2 +-
 sw/source/uibase/wrtsh/wrtsh4.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8eca4da70506e1e6c2e4b600262cced93aba8c96
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Jul 31 16:54:48 2015 +0900

    tdf#89154 stop at paragraph end when using CTRL+Right (or Left)
    
    Change-Id: I7f6bec0dbf7637b701d4dda7c573b118532b4707
    Reviewed-on: https://gerrit.libreoffice.org/17484
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index db22a27..54016c1 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1294,7 +1294,7 @@ bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
             g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
 
-        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
+        if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
diff --git a/sw/source/uibase/wrtsh/wrtsh4.cxx b/sw/source/uibase/wrtsh/wrtsh4.cxx
index 40c92d1..8d6849d 100644
--- a/sw/source/uibase/wrtsh/wrtsh4.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh4.cxx
@@ -106,7 +106,7 @@ bool SwWrtShell::_PrvWrd()
             Pop( false );
             return bRet;
         }
-        bRet = IsStartWord();
+        bRet = IsStartWord() || IsEndPara();
     }
     Push();
     ClearMark();