summaryrefslogtreecommitdiffstats
path: root/src/text-editing.cpp
diff options
context:
space:
mode:
authorRichard Hughes <cyreve@gmail.com>2008-07-31 18:21:03 +0000
committercyreve <cyreve@users.sourceforge.net>2008-07-31 18:21:03 +0000
commit9e268f3b621446ba8efa8ac984cc2ddcfc159cf7 (patch)
tree66eee0d712b275643c1430613ecade8972040623 /src/text-editing.cpp
parentMake lpe-path_length use TextParamInternal (diff)
downloadinkscape-9e268f3b621446ba8efa8ac984cc2ddcfc159cf7.tar.gz
inkscape-9e268f3b621446ba8efa8ac984cc2ddcfc159cf7.zip
slight tweak to r19493 to ensure that there's no possibility that we might accidentally alter an SPString outside of the flowtext
(bzr r6491)
Diffstat (limited to 'src/text-editing.cpp')
-rw-r--r--src/text-editing.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index d28939774..ffac0e227 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -1669,14 +1669,11 @@ static bool tidy_operator_styled_whitespace(SPObject **item)
for ( ; ; ) { // go up one item in the xml
test_item = SP_OBJECT_PARENT(test_item);
if (is_line_break_object(test_item)) break;
- if (test_item) {
- SPObject *next = SP_OBJECT_NEXT(test_item);
- if (next) {
- test_item = next;
- break;
- }
- } else {
- return false;
+ if (SP_IS_FLOWTEXT(test_item)) return false;
+ SPObject *next = SP_OBJECT_NEXT(test_item);
+ if (next) {
+ test_item = next;
+ break;
}
}
if (is_line_break_object(test_item)) { // no next string, see if there's a prev string