Notify save failure by throwing "save_failed".

diff --git a/src/extension/internal/pdf-out.cpp b/src/extension/internal/pdf-out.cpp
index 5cf859161167fcac71e2dfcfed03f09fab4cc2b8..d75be83df2aeb6121ec97e6263049a8aebd90be6 100644 (file)
--- a/src/extension/internal/pdf-out.cpp
+++ b/src/extension/internal/pdf-out.cpp
@@ -38,7 +38,7 @@ PdfOutput::check (Inkscape::Extension::Extension * module)
 }\r
 \r
 \r
-static void\r
+static unsigned int\r
 pdf_print_document_to_file(SPDocument *doc, gchar const *filename)\r
 {\r
     Inkscape::Extension::Print *mod;\r
@@ -62,10 +62,14 @@ pdf_print_document_to_file(SPDocument *doc, gchar const *filename)
     mod->arena = NRArena::create();\r
     mod->dkey = sp_item_display_key_new(1);\r
     mod->root = sp_item_invoke_show(mod->base, mod->arena, mod->dkey, SP_ITEM_SHOW_DISPLAY);\r
+\r
     /* Print document */\r
     ret = mod->begin(doc);\r
-    sp_item_invoke_print(mod->base, &context);\r
-    ret = mod->finish();\r
+    if (ret) {\r
+        sp_item_invoke_print(mod->base, &context);\r
+        ret = mod->finish();\r
+    }\r
+\r
     /* Release arena */\r
     sp_item_invoke_hide(mod->base, mod->dkey);\r
     mod->base = NULL;\r
@@ -78,7 +82,7 @@ pdf_print_document_to_file(SPDocument *doc, gchar const *filename)
     mod->set_param_string("destination", oldoutput);\r
     g_free(oldoutput);\r
 \r
-    return;\r
+    return ret;\r
 }\r
 \r
 \r
@@ -96,6 +100,7 @@ void
 PdfOutput::save (Inkscape::Extension::Output *mod, SPDocument *doc, const gchar *uri)\r
 {\r
     Inkscape::Extension::Extension * ext;\r
+    unsigned int ret;\r
 \r
     ext = Inkscape::Extension::db.get(SP_MODULE_KEY_PRINT_PDF);\r
     if (ext == NULL)\r
@@ -103,9 +108,12 @@ PdfOutput::save (Inkscape::Extension::Output *mod, SPDocument *doc, const gchar
 \r
        gchar * final_name;\r
        final_name = g_strdup_printf("> %s", uri);\r
-       pdf_print_document_to_file(doc, final_name);\r
+       ret = pdf_print_document_to_file(doc, final_name);\r
        g_free(final_name);\r
 \r
+        if (!ret)\r
+            throw Inkscape::Extension::Output::save_failed();\r
+\r
        return;\r
 }\r
 \r

diff --git a/src/extension/internal/pdf.cpp b/src/extension/internal/pdf.cpp
index bd65cd3182d8df11f1ce5028418306f54f3a246c..dde35c39192046ebcb716264e16c0a0fc4eb2e67 100644 (file)
--- a/src/extension/internal/pdf.cpp
+++ b/src/extension/internal/pdf.cpp
@@ -465,7 +465,7 @@ PrintPDF::finish(Inkscape::Extension::Print *mod)
     _stream = 0;\r
     _latin1_encoded_fonts.clear();\r
 \r
-    return 0;\r
+    return 1;\r
 }\r
 \r
 unsigned int\r