RE: msevior - r22193 - abiword/trunk/src/text/fmt/xp

Please backport.

-----Original Message-----
From: owner-abisource-cvs-commit@abisource.com on behalf of cvs@abisource.com
Sent: Thu 10/25/2007 9:37 PM
To: abisource-cvs-commit@abisource.com
Subject: msevior - r22193 - abiword/trunk/src/text/fmt/xp
 

Author: msevior
Date: 2007-10-25 13:37:37 +0200 (Thu, 25 Oct 2007)
New Revision: 22193

Modified:
   abiword/trunk/src/text/fmt/xp/fv_View.cpp
   abiword/trunk/src/text/fmt/xp/fv_View_cmd.cpp
Log:

Fix bug 7854, Hyperlink errantly deleted by pressing backspace

Modified: abiword/trunk/src/text/fmt/xp/fv_View.cpp
===================================================================
--- abiword/trunk/src/text/fmt/xp/fv_View.cpp 2007-10-24 16:22:49 UTC (rev 22192)
+++ abiword/trunk/src/text/fmt/xp/fv_View.cpp 2007-10-25 11:37:37 UTC (rev 22193)
@@ -12050,6 +12050,7 @@
         {
           return false;
         }
+
         bres = m_pDoc->getNextStrux(prevSDH,&nextSDH);
         if(!bres)
         {

Modified: abiword/trunk/src/text/fmt/xp/fv_View_cmd.cpp
===================================================================
--- abiword/trunk/src/text/fmt/xp/fv_View_cmd.cpp 2007-10-24 16:22:49 UTC (rev 22192)
+++ abiword/trunk/src/text/fmt/xp/fv_View_cmd.cpp 2007-10-25 11:37:37 UTC (rev 22193)
@@ -4310,23 +4310,31 @@
         PT_DocPosition posEnd = 0;
         getEditableBounds(true, posEnd);
         bool bOK = true;
+ bool bMoved = false;
         while(bOK && !isPointLegal() && (getPoint() < posEnd))
         {
                 bOK = _charMotion(true,1);
+ bMoved = true;
         }
         if(getPoint() > posEnd)
         {
                 setPoint(posEnd);
+ bMoved = true;
         }
 
         bOK = true;
         while(bOK && !isPointLegal() && (getPoint() > 2))
         {
                 bOK = _charMotion(false,1);
+ bMoved = true;
         }
+ if(!bMoved)
+ {
+ bOK = _charMotion(true,1);
+ bOK = _charMotion(false,1);
+ }
 
         setCursorToContext();
-
         _updateInsertionPoint();
         notifyListeners(AV_CHG_ALL);
 }

-----------------------------------------------
To unsubscribe from this list, send a message to
abisource-cvs-commit-request@abisource.com with the word
unsubscribe in the message body.