patch 1705533

[inkscape.git] / src / sp-string.cpp

diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index d3f59291531ae7579c823316b989199a3666107a..871338ad599ef44c0990f42b462182863cad18c3 100644 (file)
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -73,7 +73,6 @@ static void
 sp_string_class_init(SPStringClass *classname)
 {
     SPObjectClass *sp_object_class;
-    SPItemClass   *item_class;
 
     sp_object_class = (SPObjectClass *) classname;
 
@@ -122,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;
         }
     }
@@ -130,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))