diff --git a/src/sp-metadata.cpp b/src/sp-metadata.cpp
index 1b9be018898f5d5b7107d20b2880394a0f8161d6..426810c7d9b607c275c904d272e56895641bac5d 100644 (file)
--- a/src/sp-metadata.cpp
+++ b/src/sp-metadata.cpp
static void sp_metadata_class_init (SPMetadataClass *klass);
static void sp_metadata_init (SPMetadata *metadata);
-static void sp_metadata_build (SPObject * object, Document * document, Inkscape::XML::Node * repr);
+static void sp_metadata_build (SPObject * object, SPDocument * document, Inkscape::XML::Node * repr);
static void sp_metadata_release (SPObject *object);
static void sp_metadata_set (SPObject *object, unsigned int key, const gchar *value);
static void sp_metadata_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_metadata_build (SPObject *object, Document *document, Inkscape::XML::Node *repr)
+sp_metadata_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
using Inkscape::XML::NodeSiblingIterator;
@@ -188,8 +188,7 @@ sp_metadata_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML:
debug("0x%08x",(unsigned int)object);
//SPMetadata *metadata = SP_METADATA(object);
- // only create a repr when we're writing out an Inkscape SVG
- if ( flags & SP_OBJECT_WRITE_EXT && repr != SP_OBJECT_REPR(object) ) {
+ if ( repr != SP_OBJECT_REPR(object) ) {
if (repr) {
repr->mergeFrom(SP_OBJECT_REPR (object), "id");
} else {
@@ -197,8 +196,9 @@ sp_metadata_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML:
}
}
- if (((SPObjectClass *) metadata_parent_class)->write)
+ if (((SPObjectClass *) metadata_parent_class)->write) {
((SPObjectClass *) metadata_parent_class)->write(object, doc, repr, flags);
+ }
return repr;
}
@@ -207,7 +207,7 @@ sp_metadata_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML:
* \brief Retrieves the metadata object associated with a document
*/
SPMetadata *
-sp_document_metadata (Document *document)
+sp_document_metadata (SPDocument *document)
{
SPObject *nv;