r17178 by craig - #9876: Apply patch for char style application, extend to cover all cases

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 3 21:10:57 UTC 2012


Author: craig
Date: Tue Jan  3 21:10:57 2012
New Revision: 17178

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17178
Log:
#9876: Apply patch for char style application, extend to cover all cases

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17178&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Tue Jan  3 21:10:57 2012
@@ -7995,7 +7995,8 @@
 				else
 				{
 					start = qMax(currItem->firstInFrame(), currItem->itemText.cursorPosition());
-					length = (start + 1) < currItem->itemText.length() ? 1 : 0;
+//9876					length = (start + 1) < currItem->itemText.length() ? 1 : 0;
+					length = start < currItem->itemText.length() ? 1 : 0;
 				}
 			}
 			currItem->itemText.applyCharStyle(start, qMax(0, length), newStyle);
@@ -8054,7 +8055,8 @@
 				else
 				{
 					start = qMax(currItem->firstInFrame(), currItem->itemText.cursorPosition());
-					length = (start + 1) < currItem->itemText.length()? 1 : 0;
+//9876					length = (start + 1) < currItem->itemText.length()? 1 : 0;
+					length = start < currItem->itemText.length() ? 1 : 0;
 				}
 			}
 			currItem->itemText.setCharStyle(start, length, newStyle);
@@ -8112,7 +8114,8 @@
 				else
 				{
 					start = qMax(currItem->firstInFrame(), currItem->itemText.cursorPosition());
-					length = (start + 1) < currItem->itemText.length()? 1 : 0;
+//9876					length = (start + 1) < currItem->itemText.length()? 1 : 0;
+					length = start < currItem->itemText.length() ? 1 : 0;
 				}
 			}
 			QString lastParent;




More information about the scribus-commit mailing list