X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-anchor.cpp;h=e57ac8a585ea0c9487fd2f5358c56a603fe4ec06;hb=9dc68827cbd515262ecb8d5ae8547d9e82c72e00;hp=ec1b4e53f38b96113c24654ca681fd8d851f7913;hpb=b45b3ca12c271745b18a142d10a6ac8efd9f79cc;p=inkscape.git

diff --git a/src/sp-anchor.cpp b/src/sp-anchor.cpp
index ec1b4e53f..e57ac8a58 100644
--- a/src/sp-anchor.cpp
+++ b/src/sp-anchor.cpp
@@ -1,10 +1,9 @@
-#define __SP_ANCHOR_C__
-
 /*
  * SVG <a> element implementation
  *
  * Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2001-2002 Lauris Kaplinski
  * Copyright (C) 2001 Ximian, Inc.
@@ -29,7 +28,7 @@
 static void sp_anchor_class_init(SPAnchorClass *ac);
 static void sp_anchor_init(SPAnchor *anchor);
 
-static void sp_anchor_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
+static void sp_anchor_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_anchor_release(SPObject *object);
 static void sp_anchor_set(SPObject *object, unsigned int key, const gchar *value);
 static Inkscape::XML::Node *sp_anchor_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
@@ -83,20 +82,20 @@ static void sp_anchor_init(SPAnchor *anchor)
     anchor->href = NULL;
 }
 
-static void sp_anchor_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
+static void sp_anchor_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
     if (((SPObjectClass *) (parent_class))->build) {
         ((SPObjectClass *) (parent_class))->build(object, document, repr);
     }
 
-    sp_object_read_attr(object, "xlink:type");
-    sp_object_read_attr(object, "xlink:role");
-    sp_object_read_attr(object, "xlink:arcrole");
-    sp_object_read_attr(object, "xlink:title");
-    sp_object_read_attr(object, "xlink:show");
-    sp_object_read_attr(object, "xlink:actuate");
-    sp_object_read_attr(object, "xlink:href");
-    sp_object_read_attr(object, "target");
+    object->readAttr( "xlink:type" );
+    object->readAttr( "xlink:role" );
+    object->readAttr( "xlink:arcrole" );
+    object->readAttr( "xlink:title" );
+    object->readAttr( "xlink:show" );
+    object->readAttr( "xlink:actuate" );
+    object->readAttr( "xlink:href" );
+    object->readAttr( "target" );
 }
 
 static void sp_anchor_release(SPObject *object)
@@ -154,13 +153,15 @@ static Inkscape::XML::Node *sp_anchor_write(SPObject *object, Inkscape::XML::Doc
     repr->setAttribute("xlink:href", anchor->href);
 
     if (repr != SP_OBJECT_REPR(object)) {
-        COPY_ATTR(repr, object->repr, "xlink:type");
-        COPY_ATTR(repr, object->repr, "xlink:role");
-        COPY_ATTR(repr, object->repr, "xlink:arcrole");
-        COPY_ATTR(repr, object->repr, "xlink:title");
-        COPY_ATTR(repr, object->repr, "xlink:show");
-        COPY_ATTR(repr, object->repr, "xlink:actuate");
-        COPY_ATTR(repr, object->repr, "target");
+        // XML Tree being directly used while it shouldn't be in the
+        //  below COPY_ATTR lines
+        COPY_ATTR(repr, object->getRepr(), "xlink:type");
+        COPY_ATTR(repr, object->getRepr(), "xlink:role");
+        COPY_ATTR(repr, object->getRepr(), "xlink:arcrole");
+        COPY_ATTR(repr, object->getRepr(), "xlink:title");
+        COPY_ATTR(repr, object->getRepr(), "xlink:show");
+        COPY_ATTR(repr, object->getRepr(), "xlink:actuate");
+        COPY_ATTR(repr, object->getRepr(), "target");
     }
 
     if (((SPObjectClass *) (parent_class))->write) {