Fix self-snapping when dragging the transformation center of a selection containing...

[inkscape.git] / src / sp-missing-glyph.cpp

diff --git a/src/sp-missing-glyph.cpp b/src/sp-missing-glyph.cpp
index d25a5f8126933e384618f4fa9648f9b7bd15f36e..7d5c42763de6633ea7b782313a0d807ff3acabd6 100644 (file)
--- a/src/sp-missing-glyph.cpp
+++ b/src/sp-missing-glyph.cpp
@@ -20,7 +20,6 @@
 #include "attributes.h"
 #include "sp-missing-glyph.h"
 #include "document.h"
-#include "helper-fns.h"
 
 static void sp_missing_glyph_class_init(SPMissingGlyphClass *gc);
 static void sp_missing_glyph_init(SPMissingGlyph *glyph);
@@ -102,47 +101,60 @@ static void sp_missing_glyph_release(SPObject *object)
 static void sp_missing_glyph_set(SPObject *object, unsigned int key, const gchar *value)
 {
     SPMissingGlyph *glyph = SP_MISSING_GLYPH(object);
-    double number;
 
     switch (key) {
         case SP_ATTR_D:
-            if (glyph->d) g_free(glyph->d);
+        {
+            if (glyph->d) {
+                g_free(glyph->d);
+            }
             glyph->d = g_strdup(value);
             object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
-       case SP_ATTR_HORIZ_ADV_X:
-            number = helperfns_read_number(value);
+        }
+        case SP_ATTR_HORIZ_ADV_X:
+        {
+            double number = value ? g_ascii_strtod(value, 0) : 0;
             if (number != glyph->horiz_adv_x){
                 glyph->horiz_adv_x = number;
                 object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
-       case SP_ATTR_VERT_ORIGIN_X:
-            number = helperfns_read_number(value);
+        }
+        case SP_ATTR_VERT_ORIGIN_X:
+        {
+            double number = value ? g_ascii_strtod(value, 0) : 0;
             if (number != glyph->vert_origin_x){
                 glyph->vert_origin_x = number;
                 object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
-       case SP_ATTR_VERT_ORIGIN_Y:
-            number = helperfns_read_number(value);
+        }
+        case SP_ATTR_VERT_ORIGIN_Y:
+        {
+            double number = value ? g_ascii_strtod(value, 0) : 0;
             if (number != glyph->vert_origin_y){
                 glyph->vert_origin_y = number;
                 object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
-       case SP_ATTR_VERT_ADV_Y:
-            number = helperfns_read_number(value);
+        }
+        case SP_ATTR_VERT_ADV_Y:
+        {
+            double number = value ? g_ascii_strtod(value, 0) : 0;
             if (number != glyph->vert_adv_y){
                 glyph->vert_adv_y = number;
                 object->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
-       default:
+        }
+        default:
+        {
             if (((SPObjectClass *) (parent_class))->set) {
                 ((SPObjectClass *) (parent_class))->set(object, key, value);
             }
             break;
+        }
     }
 }