From 2f98c06c3de11661d4e440710cabac88be2a46bf Mon Sep 17 00:00:00 2001 From: gbanaszk Date: Tue, 25 Sep 2007 18:49:20 +0000 Subject: [PATCH] Revert back to old is_line_break_object() to fix problems with line breaks in first line of unflowed text. Reason for changing it in the first place was to match line break logic in sp-text.cpp but apparently this wasn't a good call. --- src/text-editing.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/text-editing.cpp b/src/text-editing.cpp index 02fec31d1..193ae7d6e 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -153,6 +153,7 @@ static bool is_line_break_object(SPObject const *object) if (object) { if (SP_IS_TEXT(object) + || (SP_IS_TSPAN(object) && SP_TSPAN(object)->role != SP_TSPAN_ROLE_UNSPECIFIED) || SP_IS_TEXTPATH(object) || SP_IS_FLOWDIV(object) || SP_IS_FLOWPARA(object) @@ -161,13 +162,6 @@ static bool is_line_break_object(SPObject const *object) is_line_break = true; } - - if (SP_IS_TSPAN(object) && SP_TSPAN(object)->role != SP_TSPAN_ROLE_UNSPECIFIED) { - SPObject *prev_object = SP_OBJECT_PREV(object); - if (prev_object && SP_IS_TSPAN(prev_object)) { - is_line_break = true; - } - } } return is_line_break; -- 2.30.2