X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-string.cpp;h=871338ad599ef44c0990f42b462182863cad18c3;hb=e454b92b3d16b0909892cddef064b745898c924d;hp=ba3df3ef225ef81f469a262f67982ed57eb79c48;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index ba3df3ef2..871338ad5 100644
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -45,8 +45,6 @@ static void sp_string_release(SPObject *object);
 static void sp_string_read_content(SPObject *object);
 static void sp_string_update(SPObject *object, SPCtx *ctx, unsigned flags);
 
-static void sp_string_calculate_dimensions(SPString *string);
-
 static SPObjectClass *string_parent_class;
 
 GType
@@ -75,10 +73,8 @@ static void
 sp_string_class_init(SPStringClass *classname)
 {
     SPObjectClass *sp_object_class;
-    SPItemClass   *item_class;
 
     sp_object_class = (SPObjectClass *) classname;
-    item_class      = (SPItemClass *) classname;
 
     string_parent_class = (SPObjectClass*)g_type_class_ref(SP_TYPE_OBJECT);
 
@@ -125,7 +121,7 @@ sp_string_read_content(SPObject *object)
     if (object->xml_space.value == SP_XML_SPACE_PRESERVE) {
         for ( ; *xml_string ; xml_string = g_utf8_next_char(xml_string) ) {
             gunichar c = g_utf8_get_char(xml_string);
-            if (c == '\n' || c == '\t') c = ' ';
+            if (c == 0xa || c == 0xd || c == '\t') c = ' ';
             string->string += c;
         }
     }
@@ -133,7 +129,7 @@ sp_string_read_content(SPObject *object)
         bool whitespace = false;
         for ( ; *xml_string ; xml_string = g_utf8_next_char(xml_string) ) {
             gunichar c = g_utf8_get_char(xml_string);
-            if (c == '\n') continue;
+            if (c == 0xa || c == 0xd) continue;
             if (c == ' ' || c == '\t') whitespace = true;
             else {
                 if (whitespace && (!string->string.empty() || SP_OBJECT_PREV(object) != NULL))
@@ -157,14 +153,9 @@ sp_string_update(SPObject *object, SPCtx *ctx, unsigned flags)
     if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_MODIFIED_FLAG)) {
         /* Parent style or we ourselves changed, so recalculate */
         flags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B; // won't be "just a transformation" anymore, we're going to recompute "x" and "y" attributes
-        sp_string_calculate_dimensions(SP_STRING(object));
     }
 }
 
-static void
-sp_string_calculate_dimensions(SPString *)
-{
-}
 
 /*
   Local Variables: