index edbe42dac48f1d157314e5d868ab971323d64348..a7828d3fc115e0bcb291b6e2fea29603c46b68d7 100644 (file)
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
* Ted Gould <ted@gould.cx>
* Johan Engelen <johan@shouraizou.nl>
*
* Ted Gould <ted@gould.cx>
* Johan Engelen <johan@shouraizou.nl>
*
- * Copyright (C) 2006-2007 Johan Engelen
+ * Copyright (C) 2006-2007 Johan Engelen
* Copyright (C) 2002-2004 Ted Gould
*
* Released under GNU GPL, read the file 'COPYING' for more information
* Copyright (C) 2002-2004 Ted Gould
*
* Released under GNU GPL, read the file 'COPYING' for more information
#include "print.h"
#include "implementation/script.h"
#include "implementation/xslt.h"
#include "print.h"
#include "implementation/script.h"
#include "implementation/xslt.h"
+#include "xml/rebase-hrefs.h"
/* #include "implementation/plugin.h" */
namespace Inkscape {
/* #include "implementation/plugin.h" */
namespace Inkscape {
SPDocument *doc = imod->open(filename);
if (!doc) {
SPDocument *doc = imod->open(filename);
if (!doc) {
- return NULL;
+ throw Input::open_failed();
}
if (last_chance_svg) {
}
if (last_chance_svg) {
- /* We can't call sp_ui_error_dialog because we may be
+ /* We can't call sp_ui_error_dialog because we may be
running from the console, in which case calling sp_ui
routines will cause a segfault. See bug 1000350 - bryce */
// sp_ui_error_dialog(_("Format autodetect failed. The file is being opened as SVG."));
running from the console, in which case calling sp_ui
routines will cause a segfault. See bug 1000350 - bryce */
// sp_ui_error_dialog(_("Format autodetect failed. The file is being opened as SVG."));
@@ -250,50 +251,49 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension,
bool saved_modified = false;
gchar *saved_output_extension = NULL;
gchar *saved_dataloss = NULL;
bool saved_modified = false;
gchar *saved_output_extension = NULL;
gchar *saved_dataloss = NULL;
- gchar *saved_uri = NULL;
if (!official) {
saved_modified = doc->isModifiedSinceSave();
saved_output_extension = g_strdup(repr->attribute("inkscape:output_extension"));
saved_dataloss = g_strdup(repr->attribute("inkscape:dataloss"));
if (!official) {
saved_modified = doc->isModifiedSinceSave();
saved_output_extension = g_strdup(repr->attribute("inkscape:output_extension"));
saved_dataloss = g_strdup(repr->attribute("inkscape:dataloss"));
- saved_uri = g_strdup(doc->uri);
- }
+ } else {
+ /* The document is changing name/uri. */
+ sp_document_change_uri_and_hrefs(doc, fileName);
+ }
- // update attributes:
- bool saved = sp_document_get_undo_sensitive(doc);
- sp_document_set_undo_sensitive (doc, false);
+ // Update attributes:
{
{
- // save the filename for next use
- sp_document_set_uri(doc, fileName);
- // also save the extension for next use
- repr->setAttribute("inkscape:output_extension", omod->get_id());
- // set the "dataloss" attribute if the chosen extension is lossy
- repr->setAttribute("inkscape:dataloss", NULL);
- if ( omod->causes_dataloss() ) {
- repr->setAttribute("inkscape:dataloss", "true");
+ bool const saved = sp_document_get_undo_sensitive(doc);
+ sp_document_set_undo_sensitive(doc, false);
+ {
+ // also save the extension for next use
+ repr->setAttribute("inkscape:output_extension", omod->get_id());
+ // set the "dataloss" attribute if the chosen extension is lossy
+ repr->setAttribute("inkscape:dataloss", NULL);
+ if (omod->causes_dataloss()) {
+ repr->setAttribute("inkscape:dataloss", "true");
+ }
}
}
+ sp_document_set_undo_sensitive(doc, saved);
+ doc->setModifiedSinceSave(false);
}
}
- sp_document_set_undo_sensitive (doc, saved);
- doc->setModifiedSinceSave(false);
omod->save(doc, fileName);
omod->save(doc, fileName);
-
- // if it is an unofficial save, set the modified attributes back to what they were
+
+ // If it is an unofficial save, set the modified attributes back to what they were.
if ( !official) {
if ( !official) {
- saved = sp_document_get_undo_sensitive(doc);
- sp_document_set_undo_sensitive (doc, false);
+ bool const saved = sp_document_get_undo_sensitive(doc);
+ sp_document_set_undo_sensitive(doc, false);
{
repr->setAttribute("inkscape:output_extension", saved_output_extension);
repr->setAttribute("inkscape:dataloss", saved_dataloss);
{
repr->setAttribute("inkscape:output_extension", saved_output_extension);
repr->setAttribute("inkscape:dataloss", saved_dataloss);
- sp_document_set_uri(doc, saved_uri);
}
}
- sp_document_set_undo_sensitive (doc, saved);
+ sp_document_set_undo_sensitive(doc, saved);
doc->setModifiedSinceSave(saved_modified);
g_free(saved_output_extension);
g_free(saved_dataloss);
doc->setModifiedSinceSave(saved_modified);
g_free(saved_output_extension);
g_free(saved_dataloss);
- g_free(saved_uri);
}
}
-
+
g_free(fileName);
return;
}
g_free(fileName);
return;
}
Inkscape::XML::Node *repr = doc->root();
Inkscape::XML::Node *repr = doc->root();
- /* sp_repr_print(repr); */
-
if (strcmp(repr->name(), INKSCAPE_EXTENSION_NS "inkscape-extension")) {
g_warning("Extension definition started with <%s> instead of <" INKSCAPE_EXTENSION_NS "inkscape-extension>. Extension will not be created. See http://wiki.inkscape.org/wiki/index.php/Extensions for reference.\n", repr->name());
return NULL;
if (strcmp(repr->name(), INKSCAPE_EXTENSION_NS "inkscape-extension")) {
g_warning("Extension definition started with <%s> instead of <" INKSCAPE_EXTENSION_NS "inkscape-extension>. Extension will not be created. See http://wiki.inkscape.org/wiki/index.php/Extensions for reference.\n", repr->name());
return NULL;