Added reinterpret_cast to work around a difference of opinion between gcc versions.

[inkscape.git] / src / extension / output.cpp

diff --git a/src/extension/output.cpp b/src/extension/output.cpp
index e4a7bc5fc8d02137a2b90648b1ec58a9f725ca42..742e938de20307e62f3d74763f4a34a2dec4f486 100644 (file)
--- a/src/extension/output.cpp
+++ b/src/extension/output.cpp
@@ -49,10 +49,13 @@ Output::Output (Inkscape::XML::Node * in_repr, Implementation::Implementation *
         child_repr = sp_repr_children(repr);
 
         while (child_repr != NULL) {
-            if (!strcmp(child_repr->name(), "output")) {
+            if (!strcmp(child_repr->name(), INKSCAPE_EXTENSION_NS "output")) {
                 child_repr = sp_repr_children(child_repr);
                 while (child_repr != NULL) {
                     char const * chname = child_repr->name();
+                                       if (!strncmp(chname, INKSCAPE_EXTENSION_NS_NC, strlen(INKSCAPE_EXTENSION_NS_NC))) {
+                                               chname += strlen(INKSCAPE_EXTENSION_NS);
+                                       }
                     if (chname[0] == '_') /* Allow _ for translation of tags */
                         chname++;
                     if (!strcmp(chname, "extension")) {
@@ -197,25 +200,25 @@ Output::prefs (void)
     \return  None
        \brief   Save a document as a file
        \param   doc  Document to save
-       \param   uri  File to save the document as
+       \param   filename  File to save the document as
 
        This function does a little of the dirty work involved in saving
        a document so that the implementation only has to worry about geting
        bits on the disk.
 
-       The big thing that it does is remove and readd the fields that are
+       The big thing that it does is remove and read the fields that are
        only used at runtime and shouldn't be saved.  One that may surprise
        people is the output extension.  This is not saved so that the IDs
        could be changed, and old files will still work properly.
 */
 void
-Output::save (SPDocument * doc, const gchar * uri)
+Output::save(SPDocument *doc, gchar const *filename)
 {
         try {
-            imp->save(this, doc, uri);
+            imp->save(this, doc, filename);
         }
         catch (...) {
-            throw;
+            throw Inkscape::Extension::Output::save_failed();
         }
 
        return;