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-metadata.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-metadata.cpp')
| -rw-r--r-- | src/sp-metadata.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/sp-metadata.cpp b/src/sp-metadata.cpp index 426810c7d..21410d4fd 100644 --- a/src/sp-metadata.cpp +++ b/src/sp-metadata.cpp @@ -188,11 +188,11 @@ sp_metadata_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML: debug("0x%08x",(unsigned int)object); //SPMetadata *metadata = SP_METADATA(object); - if ( repr != SP_OBJECT_REPR(object) ) { + if ( repr != object->getRepr() ) { if (repr) { - repr->mergeFrom(SP_OBJECT_REPR (object), "id"); + repr->mergeFrom(object->getRepr(), "id"); } else { - repr = SP_OBJECT_REPR (object)->duplicate(doc); + repr = object->getRepr()->duplicate(doc); } } @@ -221,4 +221,13 @@ sp_document_metadata (SPDocument *document) } -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : |