diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
| commit | 945ce419c806c73d70203dec33ececafbe108a92 (patch) | |
| tree | cfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/sp-font.cpp | |
| parent | Merge from trunk (again) (diff) | |
| parent | Extensions. SVG+media fix (see Bug #400356). (diff) | |
| download | inkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip | |
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/sp-font.cpp')
| -rw-r--r-- | src/sp-font.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sp-font.cpp b/src/sp-font.cpp index 64f7bd481..852e6ba5d 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -151,7 +151,7 @@ sp_font_remove_child(SPObject *object, Inkscape::XML::Node *child) static void sp_font_release(SPObject *object) { //SPFont *font = SP_FONT(object); - SP_OBJECT_DOCUMENT(object)->removeResource("font", object); + object->document->removeResource("font", object); if (((SPObjectClass *) parent_class)->release) { ((SPObjectClass *) parent_class)->release(object); @@ -263,7 +263,7 @@ static Inkscape::XML::Node *sp_font_write(SPObject *object, Inkscape::XML::Docum sp_repr_set_svg_double(repr, "vert-origin-y", font->vert_origin_y); sp_repr_set_svg_double(repr, "vert-adv-y", font->vert_adv_y); - if (repr != SP_OBJECT_REPR(object)) { + if (repr != object->getRepr()) { // All the below COPY_ATTR funtions are directly using // the XML Tree while they shouldn't COPY_ATTR(repr, object->getRepr(), "horiz-origin-x"); |