← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/sp-skeleton.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sp-skeleton.cpp
48
48
static void sp_skeleton_release(SPObject *object);
49
49
static void sp_skeleton_set(SPObject *object, unsigned int key, gchar const *value);
50
50
static void sp_skeleton_update(SPObject *object, SPCtx *ctx, guint flags);
51
 
static Inkscape::XML::Node *sp_skeleton_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
 
51
static Inkscape::XML::Node *sp_skeleton_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
52
52
 
53
53
static SPObjectClass *skeleton_parent_class;
54
54
 
147
147
{
148
148
    debug("0x%p %s(%u): '%s'",object,
149
149
            sp_attribute_name(key),key,value ? value : "<no value>");
150
 
    SPSkeleton *skeleton = SP_SKELETON(object);
 
150
    //SPSkeleton *skeleton = SP_SKELETON(object);
151
151
 
152
152
    /* See if any parents need this value. */
153
153
    if (((SPObjectClass *) skeleton_parent_class)->set) {
180
180
 * Writes its settings to an incoming repr object, if any.
181
181
 */
182
182
static Inkscape::XML::Node *
183
 
sp_skeleton_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
 
183
sp_skeleton_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
184
184
{
185
185
    debug("0x%p",object);
186
186
    //SPSkeleton *skeleton = SP_SKELETON(object);
191
191
            // is this sane?
192
192
            repr->mergeFrom(SP_OBJECT_REPR(object), "id");
193
193
        } else {
194
 
            repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
 
194
            repr = SP_OBJECT_REPR(object)->duplicate(doc);
195
195
        }
196
196
    }
197
197
 
198
198
    if (((SPObjectClass *) skeleton_parent_class)->write) {
199
 
        ((SPObjectClass *) skeleton_parent_class)->write(object, repr, flags);
 
199
        ((SPObjectClass *) skeleton_parent_class)->write(object, doc, repr, flags);
200
200
    }
201
201
 
202
202
    return repr;