Update to trunk and fix issues

(bzr r13090.1.67)

11 files changed, 533 insertions, 499 deletions

diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index 9bc30a592..759c704f0 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -130,6 +130,7 @@ set(extension_SRC
 	internal/latex-pstricks-out.h
 	internal/latex-pstricks.h
 	internal/latex-text-renderer.h
+	internal/metafile-inout.h
 	internal/metafile-print.h
 	internal/odf.h
 	internal/pdf-input-cairo.h
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index d63ec7485..588efb521 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -262,6 +262,18 @@ Extension::check (void)
 
     const char * inx_failure = _("  This is caused by an improper .inx file for this extension."
                                  "  An improper .inx file could have been caused by a faulty installation of Inkscape.");
+
+    // No need to include Windows only extensions
+    // See LP bug #1307554 for details - https://bugs.launchpad.net/inkscape/+bug/1307554
+#ifndef WIN32
+    const char* win_ext[] = {"com.vaxxine.print.win32"};
+    std::vector<std::string> v (win_ext, win_ext + sizeof(win_ext)/sizeof(win_ext[0]));
+    std::string ext_id(id);
+    if (std::find(v.begin(), v.end(), ext_id) != v.end()) {
+        printFailure(Glib::ustring(_("the extension is designed for Windows only.")) + inx_failure);
+        retval = false;
+    }
+#endif
     if (id == NULL) {
         printFailure(Glib::ustring(_("an ID was not defined for it.")) + inx_failure);
         retval = false;
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 9d679982a..fb323cd78 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -29,7 +29,7 @@ namespace Gtk {
 }
 
 class SPDocument;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index eae3bfb5a..6455e7555 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -33,9 +33,8 @@
 #include <stdint.h>
 #include <libuemf/symbol_convert.h>
 
-#include "sp-root.h"
+#include "sp-root.h" // even though it is included indirectly by wmf-inout.h
 #include "sp-path.h"
-#include "style.h"
 #include "print.h"
 #include "extension/system.h"
 #include "extension/print.h"
@@ -45,12 +44,8 @@
 #include "display/drawing.h"
 #include "display/drawing-item.h"
 #include "clear-n_.h"
-#include "document.h"
-#include "util/units.h"
-#include "shape-editor.h"
-#include "sp-namedview.h"
-#include "document-undo.h"
-#include "inkscape.h"
+#include "util/units.h" // even though it is included indirectly by wmf-inout.h
+#include "inkscape.h" // even though it is included indirectly by wmf-inout.h
 
 #include "emf-print.h"
 #include "emf-inout.h"
@@ -273,54 +268,54 @@ uint32_t Emf::add_hatch(PEMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
         if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
         d->hatches.strings[d->hatches.count++]=strdup(hpathname);
 
-        *(d->defs) += "\n";
+        d->defs += "\n";
         switch(hatchType){
             case U_HS_HORIZONTAL:
-                *(d->defs) += "   <path id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 6 0\" style=\"fill:none;stroke:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 6 0\" style=\"fill:none;stroke:#";
+                d->defs += tmpcolor;
+                d->defs += "\" />\n";
                 break;
             case U_HS_VERTICAL:
-                *(d->defs) += "   <path id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 0 6\" style=\"fill:none;stroke:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 0 6\" style=\"fill:none;stroke:#";
+                d->defs += tmpcolor;
+                d->defs += "\" />\n";
                 break;
             case U_HS_FDIAGONAL:
-                *(d->defs) += "   <line  id=\"sub";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
+                d->defs += "   <line  id=\"sub";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
                 break;
             case U_HS_BDIAGONAL:
-                *(d->defs) += "   <line  id=\"sub";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
+                d->defs += "   <line  id=\"sub";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
                 break;
             case U_HS_CROSS:
-                *(d->defs) += "   <path   id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 6 0 M 0 0 0 6\" style=\"fill:none;stroke:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path   id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 6 0 M 0 0 0 6\" style=\"fill:none;stroke:#";
+                d->defs += tmpcolor;
+                d->defs += "\" />\n";
                  break;
             case U_HS_DIAGCROSS:
-                *(d->defs) += "   <line   id=\"subfd";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
-                *(d->defs) += "   <line   id=\"subbd";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
+                d->defs += "   <line   id=\"subfd";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
+                d->defs += "   <line   id=\"subbd";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
                 break;
             case U_HS_SOLIDCLR:
             case U_HS_DITHEREDCLR:
@@ -329,12 +324,12 @@ uint32_t Emf::add_hatch(PEMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
             case U_HS_SOLIDBKCLR:
             case U_HS_DITHEREDBKCLR:
             default:
-                *(d->defs) += "   <path   id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 6 0 6 6 0 6 z\" style=\"fill:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += ";stroke:none";
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path   id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 6 0 6 6 0 6 z\" style=\"fill:#";
+                d->defs += tmpcolor;
+                d->defs += ";stroke:none";
+                d->defs += "\" />\n";
                 break;
         }
     }
@@ -396,12 +391,12 @@ uint32_t Emf::add_hatch(PEMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
         if(!idx){  // add it if not already present
             if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
             d->hatches.strings[d->hatches.count++]=strdup(hatchname);
-            *(d->defs) += "\n";
-            *(d->defs) += "   <pattern id=\"";
-            *(d->defs) += hatchname;
-            *(d->defs) += "\"  xlink:href=\"#EMFhbasepattern\">\n";
-            *(d->defs) += refpath;
-            *(d->defs) += "   </pattern>\n";
+            d->defs += "\n";
+            d->defs += "   <pattern id=\"";
+            d->defs += hatchname;
+            d->defs += "\"  xlink:href=\"#EMFhbasepattern\">\n";
+            d->defs += refpath;
+            d->defs += "   </pattern>\n";
             idx = d->hatches.count;
         }
     }
@@ -414,12 +409,12 @@ uint32_t Emf::add_hatch(PEMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
             if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
             d->hatches.strings[d->hatches.count++]=strdup(hbkname);
 
-            *(d->defs) += "\n";
-            *(d->defs) += "   <rect id=\"";
-            *(d->defs) += hbkname;
-            *(d->defs) += "\" x=\"0\" y=\"0\" width=\"6\" height=\"6\" fill=\"#";
-            *(d->defs) += bkcolor;
-            *(d->defs) += "\" />\n";
+            d->defs += "\n";
+            d->defs += "   <rect id=\"";
+            d->defs += hbkname;
+            d->defs += "\" x=\"0\" y=\"0\" width=\"6\" height=\"6\" fill=\"#";
+            d->defs += bkcolor;
+            d->defs += "\" />\n";
         }
 
         // this is the pattern, its name will show up in Inkscape's pattern selector
@@ -428,15 +423,15 @@ uint32_t Emf::add_hatch(PEMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
         if(!idx){  // add it if not already present
             if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
             d->hatches.strings[d->hatches.count++]=strdup(hatchname);
-            *(d->defs) += "\n";
-            *(d->defs) += "   <pattern id=\"";
-            *(d->defs) += hatchname;
-            *(d->defs) += "\"  xlink:href=\"#EMFhbasepattern\">\n";
-            *(d->defs) += "      <use xlink:href=\"#";
-            *(d->defs) += hbkname;
-            *(d->defs) += "\" />\n";
-            *(d->defs) += refpath;
-            *(d->defs) += "   </pattern>\n";
+            d->defs += "\n";
+            d->defs += "   <pattern id=\"";
+            d->defs += hatchname;
+            d->defs += "\"  xlink:href=\"#EMFhbasepattern\">\n";
+            d->defs += "      <use xlink:href=\"#";
+            d->defs += hbkname;
+            d->defs += "\" />\n";
+            d->defs += refpath;
+            d->defs += "   </pattern>\n";
             idx = d->hatches.count;
         }
     }
@@ -544,35 +539,35 @@ uint32_t Emf::add_image(PEMF_CALLBACK_DATA d,  void *pEmr, uint32_t cbBits, uint
         sprintf(imagename,"EMFimage%d",idx++);
         sprintf(xywh," x=\"0\" y=\"0\" width=\"%d\" height=\"%d\" ",width,height); // reuse this buffer
 
-        *(d->defs) += "\n";
-        *(d->defs) += "   <image id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "\"\n      ";
-        *(d->defs) += xywh;
-        *(d->defs) += "\n";
-        if(dibparams == U_BI_JPEG){    *(d->defs) += "       xlink:href=\"data:image/jpeg;base64,"; }
-        else {                         *(d->defs) += "       xlink:href=\"data:image/png;base64,";  }
-        *(d->defs) += base64String;
-        *(d->defs) += "\"\n";
-        *(d->defs) += "    preserveAspectRatio=\"none\"\n";
-        *(d->defs) += "    />\n";
-
-
-        *(d->defs) += "\n";
-        *(d->defs) += "   <pattern id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "_ref\"\n      ";
-        *(d->defs) += xywh;
-        *(d->defs) += "\n       patternUnits=\"userSpaceOnUse\"";
-        *(d->defs) += " >\n";
-        *(d->defs) += "      <use id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "_ign\" ";
-        *(d->defs) += " xlink:href=\"#";
-        *(d->defs) += imagename;
-        *(d->defs) += "\" />\n";
-        *(d->defs) += "    ";
-        *(d->defs) += "   </pattern>\n";
+        d->defs += "\n";
+        d->defs += "   <image id=\"";
+        d->defs += imagename;
+        d->defs += "\"\n      ";
+        d->defs += xywh;
+        d->defs += "\n";
+        if(dibparams == U_BI_JPEG){    d->defs += "       xlink:href=\"data:image/jpeg;base64,"; }
+        else {                         d->defs += "       xlink:href=\"data:image/png;base64,";  }
+        d->defs += base64String;
+        d->defs += "\"\n";
+        d->defs += "    preserveAspectRatio=\"none\"\n";
+        d->defs += "    />\n";
+
+
+        d->defs += "\n";
+        d->defs += "   <pattern id=\"";
+        d->defs += imagename;
+        d->defs += "_ref\"\n      ";
+        d->defs += xywh;
+        d->defs += "\n       patternUnits=\"userSpaceOnUse\"";
+        d->defs += " >\n";
+        d->defs += "      <use id=\"";
+        d->defs += imagename;
+        d->defs += "_ign\" ";
+        d->defs += " xlink:href=\"#";
+        d->defs += imagename;
+        d->defs += "\" />\n";
+        d->defs += "    ";
+        d->defs += "   </pattern>\n";
     }
     g_free(base64String);//wait until this point to free because it might be a duplicate image
 
@@ -596,17 +591,17 @@ uint32_t Emf::add_image(PEMF_CALLBACK_DATA d,  void *pEmr, uint32_t cbBits, uint
             d->images.strings[d->images.count++]=strdup(base64String);
             sprintf(imrotname,"EMFimage%d",idx++);
 
-            *(d->defs) += "\n";
-            *(d->defs) += "   <pattern\n";
-            *(d->defs) += "       id=\"";
-            *(d->defs) += imrotname;
-            *(d->defs) += "_ref\"\n";
-            *(d->defs) += "       xlink:href=\"#";
-            *(d->defs) += imagename;
-            *(d->defs) += "_ref\"\n";
-            *(d->defs) += "       patternTransform=";
-            *(d->defs) += current_matrix(d, 0.0, 0.0, 0); //j use offset 0,0
-            *(d->defs) += " />\n";
+            d->defs += "\n";
+            d->defs += "   <pattern\n";
+            d->defs += "       id=\"";
+            d->defs += imrotname;
+            d->defs += "_ref\"\n";
+            d->defs += "       xlink:href=\"#";
+            d->defs += imagename;
+            d->defs += "_ref\"\n";
+            d->defs += "       patternTransform=";
+            d->defs += current_matrix(d, 0.0, 0.0, 0); //j use offset 0,0
+            d->defs += " />\n";
         }
         g_free(base64String);
     }
@@ -716,7 +711,7 @@ uint32_t Emf::add_gradient(PEMF_CALLBACK_DATA d, uint32_t gradientType, U_TRIVER
         stmp << tmpcolor2;
         stmp << ";stop-opacity:1\" />\n";
         stmp << "   </linearGradient>\n";
-        *(d->defs) += stmp.str().c_str();
+        d->defs += stmp.str().c_str();
     }
 
     return(idx-1);
@@ -811,8 +806,8 @@ Emf::output_style(PEMF_CALLBACK_DATA d, int iType)
 
 
 //    tmp_id << "\n\tid=\"" << (d->id++) << "\"";
-//    *(d->outsvg) += tmp_id.str().c_str();
-    *(d->outsvg) += "\n\tstyle=\"";
+//    d->outsvg += tmp_id.str().c_str();
+    d->outsvg += "\n\tstyle=\"";
     if (iType == U_EMR_STROKEPATH || !d->dc[d->level].fill_set) {
         tmp_style << "fill:none;";
     } else {
@@ -936,7 +931,7 @@ Emf::output_style(PEMF_CALLBACK_DATA d, int iType)
         tmp_style << "\n\tclip-path=\"url(#clipEmfPath" << d->id << ")\" ";
     clipset = false;
 
-    *(d->outsvg) += tmp_style.str().c_str();
+    d->outsvg += tmp_style.str().c_str();
 }
 
 
@@ -1104,14 +1099,11 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
                 if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level==0 || (d->level>0 && d->dc[d->level].style.stroke_dasharray.values!=d->dc[d->level-1].style.stroke_dasharray.values)))
                     d->dc[d->level].style.stroke_dasharray.values.clear();
                 for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) {
-                    int cur_level = d->level;
-                    d->level = d->emf_obj[index].level;
 //  Doing it this way typically results in a pattern that is tiny, better to assume the array
 //  is the same scale as for dot/dash below, that is, no scaling should be applied
 //                    double dash_length = pix_to_abs_size( d, pEmr->elp.elpStyleEntry[i] );
                     double dash_length = pEmr->elp.elpStyleEntry[i];
-                    d->level = cur_level;
-                    d->dc[d->level].style.stroke_dasharray.values[i] = dash_length;
+                    d->dc[d->level].style.stroke_dasharray.values.push_back(dash_length);
                 }
                 d->dc[d->level].style.stroke_dasharray.set = 1;
             } else {
@@ -1525,8 +1517,8 @@ void Emf::common_image_extraction(PEMF_CALLBACK_DATA d, void *pEmr,
     tmp_image << " preserveAspectRatio=\"none\"\n";
     tmp_image <<  "/> \n";
 
-    *(d->outsvg) += tmp_image.str().c_str();
-    *(d->path) = "";
+    d->outsvg += tmp_image.str().c_str();
+    d->path = "";
 }
 
 /**
@@ -1595,7 +1587,7 @@ int Emf::myEnhMetaFileProc(char *contents, unsigned int length, PEMF_CALLBACK_DA
         TR_layout_2_svg(d->tri);
         SVGOStringStream ts;
         ts << d->tri->out;
-        *(d->outsvg) += ts.str().c_str();
+        d->outsvg += ts.str().c_str();
         d->tri = trinfo_clear(d->tri);
     }
     if(d->dc[d->level].dirty){  //Apply the delayed background changes, clear the flag
@@ -1652,7 +1644,7 @@ std::cout << "BEFORE DRAW"
         )
     ){
 // std::cout << "PATH DRAW at TOP" << std::endl;
-        *(d->outsvg) += "   <path ";     // this is the ONLY place <path should be used!!!  One exception, gradientfill.
+        d->outsvg += "   <path ";     // this is the ONLY place <path should be used!!!  One exception, gradientfill.
         if(d->drawtype){                 // explicit draw type EMR record
             output_style(d, d->drawtype);
         }
@@ -1662,11 +1654,11 @@ std::cout << "BEFORE DRAW"
         else {
             output_style(d, U_EMR_STROKEPATH);
         }
-        *(d->outsvg) += "\n\t";
-        *(d->outsvg) += "\n\td=\"";      // this is the ONLY place d=" should be used!!!!  One exception, gradientfill.
-        *(d->outsvg) += *(d->path);
-        *(d->outsvg) += " \" /> \n";
-        *(d->path) = "";
+        d->outsvg += "\n\t";
+        d->outsvg += "\n\td=\"";      // this is the ONLY place d=" should be used!!!!  One exception, gradientfill.
+        d->outsvg += d->path;
+        d->outsvg += " \" /> \n";
+        d->path = "";
         // reset the flags
         d->mask = 0;
         d->drawtype = 0;
@@ -1679,12 +1671,12 @@ std::cout << "BEFORE DRAW"
         {
             dbg_str << "<!-- U_EMR_HEADER -->\n";
 
-            *(d->outdef) += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
+            d->outdef += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 
             if (d->pDesc) {
-                *(d->outdef) += "<!-- ";
-                *(d->outdef) += d->pDesc;
-                *(d->outdef) += " -->\n";
+                d->outdef += "<!-- ";
+                d->outdef += d->pDesc;
+                d->outdef += " -->\n";
             }
 
             PU_EMRHEADER pEmr = (PU_EMRHEADER) lpEMFR;
@@ -1745,8 +1737,8 @@ std::cout << "BEFORE DRAW"
             tmp_outdef <<
                 "  width=\"" << d->MMX << "mm\"\n" <<
                 "  height=\"" << d->MMY << "mm\">\n";
-            *(d->outdef) += tmp_outdef.str().c_str();
-            *(d->outdef) += "<defs>";                           // temporary end of header
+            d->outdef += tmp_outdef.str().c_str();
+            d->outdef += "<defs>";                           // temporary end of header
 
             // d->defs holds any defines which are read in.
 
@@ -2015,7 +2007,7 @@ std::cout << "BEFORE DRAW"
             dbg_str << "<!-- U_EMR_EOF -->\n";
 
             tmp_outsvg << "</svg>\n";
-            *(d->outsvg) = *(d->outdef) + *(d->defs) + *(d->outsvg);
+            d->outsvg = d->outdef + d->defs + d->outsvg;
             OK=0;
             break;
         }
@@ -2167,8 +2159,8 @@ std::cout << "BEFORE DRAW"
             tmp_rectangle << "\n   transform=" << current_matrix(d, dx, dy, 1); // calculate appropriate offset
             tmp_rectangle << "/>\n</clipPath>";
 
-            *(d->outdef) += tmp_rectangle.str().c_str();
-            *(d->path) = "";
+            d->outdef += tmp_rectangle.str().c_str();
+            d->path = "";
             break;
         }
         case U_EMR_SCALEVIEWPORTEXTEX:   dbg_str << "<!-- U_EMR_SCALEVIEWPORTEXTEX -->\n"; break;
@@ -2453,12 +2445,12 @@ std::cout << "BEFORE DRAW"
 
             d->mask |= emr_mask;
 
-            *(d->outsvg) += "   <ellipse ";
+            d->outsvg += "   <ellipse ";
             output_style(d, lpEMFR->iType);  //
-            *(d->outsvg) += "\n\t";
-            *(d->outsvg) += tmp_ellipse.str().c_str();
-            *(d->outsvg) += "/> \n";
-            *(d->path) = "";
+            d->outsvg += "\n\t";
+            d->outsvg += tmp_ellipse.str().c_str();
+            d->outsvg += "/> \n";
+            d->path = "";
             break;
         }
         case U_EMR_RECTANGLE:
@@ -2679,7 +2671,7 @@ std::cout << "BEFORE DRAW"
             // The next line should never be needed, should have been handled before main switch
             // qualifier added because EMF's encountered where moveto preceded beginpath followed by lineto
             if(d->mask & U_DRAW_VISIBLE){
-               *(d->path) = "";
+               d->path = "";
             }
             d->mask |= emr_mask;
             break;
@@ -2739,7 +2731,7 @@ std::cout << "BEFORE DRAW"
         case U_EMR_ABORTPATH:
         {
             dbg_str << "<!-- U_EMR_ABORTPATH -->\n";
-            *(d->path) = "";
+            d->path = "";
             d->drawtype = 0;
             break;
         }
@@ -3048,7 +3040,7 @@ std::cout << "BEFORE DRAW"
                     TR_layout_analyze(d->tri);
                     TR_layout_2_svg(d->tri);
                     ts << d->tri->out;
-                    *(d->outsvg) += ts.str().c_str();
+                    d->outsvg += ts.str().c_str();
                     d->tri = trinfo_clear(d->tri);
                     (void) trinfo_load_textrec(d->tri, &tsp, tsp.ori,TR_EMFBOT); // ignore return status, it must work
                 }
@@ -3292,7 +3284,7 @@ std::cout << "BEFORE DRAW"
                      tmp_rectangle << d->gradients.strings[fill_idx];
                      tmp_rectangle << ");\"\n/>\n";
                  }
-                 *(d->outsvg) += tmp_rectangle.str().c_str();
+                 d->outsvg += tmp_rectangle.str().c_str();
             }
             else if(pEmr->ulMode == U_GRADIENT_FILL_TRIANGLE){
                  SVGOStringStream tmp_triangle;
@@ -3310,9 +3302,9 @@ std::cout << "BEFORE DRAW"
                      tmp_triangle << tmpcolor;
                      tmp_triangle << ";\"\n/>\n";
                  }
-                 *(d->outsvg) += tmp_triangle.str().c_str();
+                 d->outsvg += tmp_triangle.str().c_str();
             }
-            *(d->path) = "";            
+            d->path = "";            
             // if it is anything else the record is bogus, so ignore it
             break;
         }
@@ -3325,13 +3317,13 @@ std::cout << "BEFORE DRAW"
             break;
     }  //end of switch
 // When testing, uncomment the following to place a comment for each processed EMR record in the SVG
-//    *(d->outsvg) += dbg_str.str().c_str();
-    *(d->outsvg) += tmp_outsvg.str().c_str();
-    *(d->path) += tmp_path.str().c_str();
+//    d->outsvg += dbg_str.str().c_str();
+    d->outsvg += tmp_outsvg.str().c_str();
+    d->path += tmp_path.str().c_str();
 
     }  //end of while
 // When testing, uncomment the following to show the final SVG derived from the EMF
-// std::cout << *(d->outsvg) << std::endl;
+// std::cout << d->outsvg << std::endl;
     (void) emr_properties(U_EMR_INVALID);  // force the release of the lookup table memory, returned value is irrelevant
 
     return 1;
@@ -3349,61 +3341,20 @@ Emf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 {
     EMF_CALLBACK_DATA d;
 
-//    memset(&d, 0, sizeof(d));
-    memset(&d, 0, sizeof(EMF_CALLBACK_DATA));
-
-    for(int i = 0; i < EMF_MAX_DC+1; i++){  // be sure all values and pointers are empty to start with
-        memset(&(d.dc[i]),0,sizeof(EMF_DEVICE_CONTEXT));
-    }
-
-    d.dc[0].worldTransform.eM11 = 1.0;
-    d.dc[0].worldTransform.eM12 = 0.0;
-    d.dc[0].worldTransform.eM21 = 0.0;
-    d.dc[0].worldTransform.eM22 = 1.0;
-    d.dc[0].worldTransform.eDx  = 0.0;
-    d.dc[0].worldTransform.eDy  = 0.0;
-    d.dc[0].font_name = strdup("Arial");  // Default font, EMF spec says device can pick whatever it wants
-    d.dc[0].textColor           = U_RGB(0, 0, 0);        // default foreground color (black)
-    d.dc[0].bkColor             = U_RGB(255, 255, 255);  // default background color (white)
-    d.dc[0].bkMode              = U_TRANSPARENT;
-    d.dc[0].dirty               = 0;
-
     if (uri == NULL) {
         return NULL;
     }
 
-    d.outsvg            = new Glib::ustring("");
-    d.path              = new Glib::ustring("");
-    d.outdef            = new Glib::ustring("");
-    d.defs              = new Glib::ustring("");
-    d.mask              = 0;
-    d.drawtype          = 0;
-    d.arcdir            = U_AD_COUNTERCLOCKWISE;
-    d.dwRop2            = U_R2_COPYPEN;
-    d.dwRop3            = 0;
-    d.E2IdirY           = 1.0;
-    d.D2PscaleX         = 1.0;
-    d.D2PscaleY         = 1.0;
-    d.hatches.size      = 0;
-    d.hatches.count     = 0;
-    d.hatches.strings   = NULL;
-    d.images.size       = 0;
-    d.images.count      = 0;
-    d.images.strings    = NULL;
-    d.gradients.size    = 0;
-    d.gradients.count   = 0;
-    d.gradients.strings = NULL;
-
     // set up the size default for patterns in defs.  This might not be referenced if there are no patterns defined in the drawing.
 
-    *(d.defs) += "\n";
-    *(d.defs) += "   <pattern id=\"EMFhbasepattern\"     \n";
-    *(d.defs) += "        patternUnits=\"userSpaceOnUse\"\n";
-    *(d.defs) += "        width=\"6\"                    \n";
-    *(d.defs) += "        height=\"6\"                   \n";
-    *(d.defs) += "        x=\"0\"                        \n";
-    *(d.defs) += "        y=\"0\">                       \n";
-    *(d.defs) += "   </pattern>                          \n";
+    d.defs += "\n";
+    d.defs += "   <pattern id=\"EMFhbasepattern\"     \n";
+    d.defs += "        patternUnits=\"userSpaceOnUse\"\n";
+    d.defs += "        width=\"6\"                    \n";
+    d.defs += "        height=\"6\"                   \n";
+    d.defs += "        x=\"0\"                        \n";
+    d.defs += "        y=\"0\">                       \n";
+    d.defs += "   </pattern>                          \n";
 
 
     size_t length;
@@ -3425,12 +3376,8 @@ Emf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 
 //    std::cout << "SVG Output: " << std::endl << *(d.outsvg) << std::endl;
 
-    SPDocument *doc = SPDocument::createNewDocFromMem(d.outsvg->c_str(), strlen(d.outsvg->c_str()), TRUE);
+    SPDocument *doc = SPDocument::createNewDocFromMem(d.outsvg.c_str(), strlen(d.outsvg.c_str()), TRUE);
 
-    delete d.outsvg;
-    delete d.path;
-    delete d.outdef;
-    delete d.defs;
     free_emf_strings(d.hatches);
     free_emf_strings(d.images);
     free_emf_strings(d.gradients);
@@ -3450,39 +3397,7 @@ Emf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 
     d.tri = trinfo_release_except_FC(d.tri);
 
-    // Set viewBox if it doesn't exist
-    if (doc && !doc->getRoot()->viewBox_set) {
-        bool saved = Inkscape::DocumentUndo::getUndoSensitive(doc);
-        Inkscape::DocumentUndo::setUndoSensitive(doc, false);
-        
-        doc->ensureUpToDate();
-        
-        // Set document unit
-        Inkscape::XML::Node *repr = sp_document_namedview(doc, 0)->getRepr();
-        Inkscape::SVGOStringStream os;
-        Inkscape::Util::Unit const* doc_unit = doc->getWidth().unit;
-        os << doc_unit->abbr;
-        repr->setAttribute("inkscape:document-units", os.str().c_str());
-
-        // Set viewBox
-        doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc_unit), doc->getHeight().value(doc_unit)));
-        doc->ensureUpToDate();
-
-        // Scale and translate objects
-        double scale = Inkscape::Util::Quantity::convert(1, "px", doc_unit);
-        ShapeEditor::blockSetItem(true);
-        double dh;
-        if(SP_ACTIVE_DOCUMENT){ // for file menu open or import, or paste from clipboard
-            dh = SP_ACTIVE_DOCUMENT->getHeight().value("px");
-        }
-        else { // for open via --file on command line
-            dh = doc->getHeight().value("px");
-        }
-        doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(0, dh));
-        ShapeEditor::blockSetItem(false);
-
-        Inkscape::DocumentUndo::setUndoSensitive(doc, saved);
-    }
+    setViewBoxIfMissing(doc);
 
     return doc;
 }
diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h
index a97cb0a54..f15db5518 100644
--- a/src/extension/internal/emf-inout.h
+++ b/src/extension/internal/emf-inout.h
@@ -27,20 +27,59 @@ namespace Internal {
 #define DIRTY_FILL   0x02
 #define DIRTY_STROKE 0x04
 
-typedef struct {
+typedef struct emf_object {
+    emf_object() :
+        type(0),
+        level(0),
+        lpEMFR(NULL)
+    {};
     int type;
     int level;
     char *lpEMFR;
 } EMF_OBJECT, *PEMF_OBJECT;
 
-typedef struct {
+typedef struct emf_strings {
+    emf_strings() :
+        size(0),
+        count(0),
+        strings(NULL)
+    {};
     int size;         // number of slots allocated in strings
     int count;        // number of slots used in strings
     char **strings;   // place to store strings
 } EMF_STRINGS, *PEMF_STRINGS;
 
 typedef struct emf_device_context {
-    struct SPStyle  style;
+    emf_device_context() :
+        // SPStyle: class with constructor
+        font_name(NULL),
+        stroke_set(false), stroke_mode(0), stroke_idx(0), stroke_recidx(0),
+        fill_set(false),   fill_mode(0),   fill_idx(0),   fill_recidx(0),
+        dirty(0),
+        // sizeWnd, sizeView, winorg, vieworg,
+        ScaleInX(0), ScaleInY(0),
+        ScaleOutX(0), ScaleOutY(0),
+        bkMode(U_TRANSPARENT),
+        // bkColor, textColor
+        textAlign(0)
+        // worldTransform, cur
+    {
+        font_name = strdup("Arial"); // Default font, EMF spec says device can pick whatever it wants
+        sizeWnd  = sizel_set( 0.0, 0.0 );
+        sizeView = sizel_set( 0.0, 0.0 );
+        winorg  = point32_set( 0.0, 0.0 );
+        vieworg = point32_set( 0.0, 0.0 );
+        bkColor = U_RGB(255, 255, 255); // default foreground color (white)
+        textColor = U_RGB(0, 0, 0);     // default foreground color (black)
+        worldTransform.eM11 = 1.0;
+        worldTransform.eM12 = 0.0;
+        worldTransform.eM21 = 0.0;
+        worldTransform.eM22 = 1.0;
+        worldTransform.eDx = 0.0;
+        worldTransform.eDy = 0.0;
+        cur = point32_set( 0, 0 );
+    };        
+    SPStyle         style;
     char           *font_name;
     bool            stroke_set;
     int             stroke_mode;  // enumeration from drawmode, not used if fill_set is not True
@@ -67,11 +106,34 @@ typedef struct emf_device_context {
 
 #define EMF_MAX_DC 128
 
-typedef struct {
-    Glib::ustring *outsvg;
-    Glib::ustring *path;
-    Glib::ustring *outdef;
-    Glib::ustring *defs;
+typedef struct emf_callback_data {
+
+    emf_callback_data() :
+        // dc: array, structure w/ constructor
+        level(0),
+        E2IdirY(1.0),
+        D2PscaleX(1.0), D2PscaleY(1.0),
+        MM100InX(0), MM100InY(0),
+        PixelsInX(0), PixelsInY(0),
+        PixelsOutX(0), PixelsOutY(0),
+        ulCornerInX(0), ulCornerInY(0),
+        ulCornerOutX(0), ulCornerOutY(0),
+        mask(0),
+        arcdir(U_AD_COUNTERCLOCKWISE),
+        dwRop2(U_R2_COPYPEN), dwRop3(0),
+        MMX(0),MMY(0),
+        id(0), drawtype(0),
+        pDesc(NULL),
+        // hatches, images, gradients,  struct w/ constructor
+        tri(NULL),
+        n_obj(0)
+        // emf_obj;
+    {};
+
+    Glib::ustring outsvg;
+    Glib::ustring path;
+    Glib::ustring outdef;
+    Glib::ustring defs;
 
     EMF_DEVICE_CONTEXT dc[EMF_MAX_DC+1]; // FIXME: This should be dynamic..
     int level;
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index f4f7f08cb..8b80fec1c 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -1869,7 +1869,7 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
             _lookup_ppt_fontfix("Convert To Wingdings", params);
             break;
         default:  //also CVTNON
-            _lookup_ppt_fontfix(style->text->font_family.value, params);
+            _lookup_ppt_fontfix(style->font_family.value, params);
             break;
         }
         if (params.f2 != 0 || params.f3 != 0) {
@@ -1897,7 +1897,7 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
         // of the special fonts.
         uint16_t *wfacename;
         if (!newfont) {
-            wfacename = U_Utf8ToUtf16le(style->text->font_family.value, 0, NULL);
+            wfacename = U_Utf8ToUtf16le(style->font_family.value, 0, NULL);
         } else {
             wfacename = U_Utf8ToUtf16le(FontName(newfont), 0, NULL);
         }
diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp
index 1d419a6a0..53bb86d24 100644
--- a/src/extension/internal/metafile-inout.cpp
+++ b/src/extension/internal/metafile-inout.cpp
@@ -17,6 +17,7 @@
 #include <glib.h>
 #include <glibmm/miscutils.h>
 
+#include "sp-root.h"
 #include "display/curve.h"
 #include "extension/internal/metafile-inout.h" // picks up PNG
 #include "extension/print.h"
@@ -27,6 +28,13 @@
 #include "sp-pattern.h"
 #include "sp-radial-gradient.h"
 #include "style.h"
+#include "document.h"
+#include "util/units.h"
+#include "shape-editor.h"
+#include "sp-namedview.h"
+#include "document-undo.h"
+#include "inkscape.h"
+#include "preferences.h"
 
 namespace Inkscape {
 namespace Extension {
@@ -193,6 +201,61 @@ gchar *Metafile::bad_image_png(void){
     return(gstring);
 }
 
+/*  If the viewBox is missing, set one 
+*/
+void Metafile::setViewBoxIfMissing(SPDocument *doc) {
+
+    if (doc && !doc->getRoot()->viewBox_set) {
+        bool saved = Inkscape::DocumentUndo::getUndoSensitive(doc);
+        Inkscape::DocumentUndo::setUndoSensitive(doc, false);
+        
+        doc->ensureUpToDate();
+        
+        // Set document unit
+        Inkscape::XML::Node *repr = sp_document_namedview(doc, 0)->getRepr();
+        Inkscape::SVGOStringStream os;
+        Inkscape::Util::Unit const* doc_unit = doc->getWidth().unit;
+        os << doc_unit->abbr;
+        repr->setAttribute("inkscape:document-units", os.str().c_str());
+
+        // Set viewBox
+        doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc_unit), doc->getHeight().value(doc_unit)));
+        doc->ensureUpToDate();
+
+        // Scale and translate objects
+        double scale = Inkscape::Util::Quantity::convert(1, "px", doc_unit);
+        ShapeEditor::blockSetItem(true);
+        double dh;
+        if(SP_ACTIVE_DOCUMENT){ // for file menu open or import, or paste from clipboard
+            dh = SP_ACTIVE_DOCUMENT->getHeight().value("px");
+        }
+        else { // for open via --file on command line
+            dh = doc->getHeight().value("px");
+        }
+
+        // These should not affect input, but they do, so set them to a neutral state
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        bool transform_stroke      = prefs->getBool("/options/transform/stroke", true);
+        bool transform_rectcorners = prefs->getBool("/options/transform/rectcorners", true);
+        bool transform_pattern     = prefs->getBool("/options/transform/pattern", true);
+        bool transform_gradient    = prefs->getBool("/options/transform/gradient", true);
+        prefs->setBool("/options/transform/stroke", true);
+        prefs->setBool("/options/transform/rectcorners", true);
+        prefs->setBool("/options/transform/pattern", true);
+        prefs->setBool("/options/transform/gradient", true);
+        
+        doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(0, dh));
+        ShapeEditor::blockSetItem(false);
+
+        // restore options
+        prefs->setBool("/options/transform/stroke",      transform_stroke);
+        prefs->setBool("/options/transform/rectcorners", transform_rectcorners);
+        prefs->setBool("/options/transform/pattern",     transform_pattern);
+        prefs->setBool("/options/transform/gradient",    transform_gradient);
+
+        Inkscape::DocumentUndo::setUndoSensitive(doc, saved);
+    }
+}
 
 
 } // namespace Internal
diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h
index 968773a3a..2f7001cf2 100644
--- a/src/extension/internal/metafile-inout.h
+++ b/src/extension/internal/metafile-inout.h
@@ -71,6 +71,7 @@ protected:
     static void        my_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length);
     static void        toPNG(PMEMPNG accum, int width, int height, const char *px);
     static gchar      *bad_image_png(void);
+    static void        setViewBoxIfMissing(SPDocument *doc);
 
 
 private:
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index ef95dbe45..5d7fc29d0 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -33,9 +33,8 @@
 #include <stdint.h>
 #include <libuemf/symbol_convert.h>
 
-#include "sp-root.h"
+#include "sp-root.h" // even though it is included indirectly by wmf-inout.h
 #include "sp-path.h"
-#include "style.h"
 #include "print.h"
 #include "extension/system.h"
 #include "extension/print.h"
@@ -44,13 +43,9 @@
 #include "extension/output.h"
 #include "display/drawing.h"
 #include "display/drawing-item.h"
-#include "util/units.h"
 #include "clear-n_.h"
-#include "document.h"
-#include "shape-editor.h"
-#include "sp-namedview.h"
-#include "document-undo.h"
-#include "inkscape.h"
+#include "util/units.h" // even though it is included indirectly by wmf-inout.h
+#include "inkscape.h" // even though it is included indirectly by wmf-inout.h
 
 
 #include "wmf-inout.h"
@@ -251,54 +246,54 @@ uint32_t Wmf::add_hatch(PWMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
         if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
         d->hatches.strings[d->hatches.count++]=strdup(hpathname);
 
-        *(d->defs) += "\n";
+        d->defs += "\n";
         switch(hatchType){
             case U_HS_HORIZONTAL:
-                *(d->defs) += "   <path id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 6 0\" style=\"fill:none;stroke:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 6 0\" style=\"fill:none;stroke:#";
+                d->defs += tmpcolor;
+                d->defs += "\" />\n";
                 break;
             case U_HS_VERTICAL:
-                *(d->defs) += "   <path id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 0 6\" style=\"fill:none;stroke:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 0 6\" style=\"fill:none;stroke:#";
+                d->defs += tmpcolor;
+                d->defs += "\" />\n";
                 break;
             case U_HS_FDIAGONAL:
-                *(d->defs) += "   <line  id=\"sub";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
+                d->defs += "   <line  id=\"sub";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
                 break;
             case U_HS_BDIAGONAL:
-                *(d->defs) += "   <line  id=\"sub";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
+                d->defs += "   <line  id=\"sub";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
                 break;
             case U_HS_CROSS:
-                *(d->defs) += "   <path   id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 6 0 M 0 0 0 6\" style=\"fill:none;stroke:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path   id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 6 0 M 0 0 0 6\" style=\"fill:none;stroke:#";
+                d->defs += tmpcolor;
+                d->defs += "\" />\n";
                  break;
             case U_HS_DIAGCROSS:
-                *(d->defs) += "   <line   id=\"subfd";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
-                *(d->defs) += "   <line   id=\"subbd";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += "\"/>\n";
+                d->defs += "   <line   id=\"subfd";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"-1\" x2=\"7\" y2=\"7\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
+                d->defs += "   <line   id=\"subbd";
+                d->defs += hpathname;
+                d->defs += "\" x1=\"-1\" y1=\"7\" x2=\"7\" y2=\"-1\" stroke=\"#";
+                d->defs += tmpcolor;
+                d->defs += "\"/>\n";
                 break;
             case U_HS_SOLIDCLR:
             case U_HS_DITHEREDCLR:
@@ -307,12 +302,12 @@ uint32_t Wmf::add_hatch(PWMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
             case U_HS_SOLIDBKCLR:
             case U_HS_DITHEREDBKCLR:
             default:
-                *(d->defs) += "   <path   id=\"";
-                *(d->defs) += hpathname;
-                *(d->defs) += "\" d=\"M 0 0 6 0 6 6 0 6 z\" style=\"fill:#";
-                *(d->defs) += tmpcolor;
-                *(d->defs) += ";stroke:none";
-                *(d->defs) += "\" />\n";
+                d->defs += "   <path   id=\"";
+                d->defs += hpathname;
+                d->defs += "\" d=\"M 0 0 6 0 6 6 0 6 z\" style=\"fill:#";
+                d->defs += tmpcolor;
+                d->defs += ";stroke:none";
+                d->defs += "\" />\n";
                 break;
         }
     }
@@ -374,12 +369,12 @@ uint32_t Wmf::add_hatch(PWMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
         if(!idx){  // add it if not already present
             if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
             d->hatches.strings[d->hatches.count++]=strdup(hatchname);
-            *(d->defs) += "\n";
-            *(d->defs) += "   <pattern id=\"";
-            *(d->defs) += hatchname;
-            *(d->defs) += "\"  xlink:href=\"#WMFhbasepattern\">\n";
-            *(d->defs) += refpath;
-            *(d->defs) += "   </pattern>\n";
+            d->defs += "\n";
+            d->defs += "   <pattern id=\"";
+            d->defs += hatchname;
+            d->defs += "\"  xlink:href=\"#WMFhbasepattern\">\n";
+            d->defs += refpath;
+            d->defs += "   </pattern>\n";
             idx = d->hatches.count;
         }
     }
@@ -392,12 +387,12 @@ uint32_t Wmf::add_hatch(PWMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
             if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
             d->hatches.strings[d->hatches.count++]=strdup(hbkname);
 
-            *(d->defs) += "\n";
-            *(d->defs) += "   <rect id=\"";
-            *(d->defs) += hbkname;
-            *(d->defs) += "\" x=\"0\" y=\"0\" width=\"6\" height=\"6\" fill=\"#";
-            *(d->defs) += bkcolor;
-            *(d->defs) += "\" />\n";
+            d->defs += "\n";
+            d->defs += "   <rect id=\"";
+            d->defs += hbkname;
+            d->defs += "\" x=\"0\" y=\"0\" width=\"6\" height=\"6\" fill=\"#";
+            d->defs += bkcolor;
+            d->defs += "\" />\n";
         }
 
         // this is the pattern, its name will show up in Inkscape's pattern selector
@@ -406,15 +401,15 @@ uint32_t Wmf::add_hatch(PWMF_CALLBACK_DATA d, uint32_t hatchType, U_COLORREF hat
         if(!idx){  // add it if not already present
             if(d->hatches.count == d->hatches.size){  enlarge_hatches(d); }
             d->hatches.strings[d->hatches.count++]=strdup(hatchname);
-            *(d->defs) += "\n";
-            *(d->defs) += "   <pattern id=\"";
-            *(d->defs) += hatchname;
-            *(d->defs) += "\"  xlink:href=\"#WMFhbasepattern\">\n";
-            *(d->defs) += "      <use xlink:href=\"#";
-            *(d->defs) += hbkname;
-            *(d->defs) += "\" />\n";
-            *(d->defs) += refpath;
-            *(d->defs) += "   </pattern>\n";
+            d->defs += "\n";
+            d->defs += "   <pattern id=\"";
+            d->defs += hatchname;
+            d->defs += "\"  xlink:href=\"#WMFhbasepattern\">\n";
+            d->defs += "      <use xlink:href=\"#";
+            d->defs += hbkname;
+            d->defs += "\" />\n";
+            d->defs += refpath;
+            d->defs += "   </pattern>\n";
             idx = d->hatches.count;
         }
     }
@@ -503,35 +498,35 @@ uint32_t Wmf::add_dib_image(PWMF_CALLBACK_DATA d, const char *dib, uint32_t iUsa
         sprintf(imagename,"WMFimage%d",idx++);
         sprintf(xywh," x=\"0\" y=\"0\" width=\"%d\" height=\"%d\" ",width,height); // reuse this buffer
 
-        *(d->defs) += "\n";
-        *(d->defs) += "   <image id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "\"\n      ";
-        *(d->defs) += xywh;
-        *(d->defs) += "\n";
-        if(dibparams == U_BI_JPEG){    *(d->defs) += "       xlink:href=\"data:image/jpeg;base64,"; }
-        else {                         *(d->defs) += "       xlink:href=\"data:image/png;base64,";  }
-        *(d->defs) += base64String;
-        *(d->defs) += "\"\n";
-        *(d->defs) += " preserveAspectRatio=\"none\"\n";
-        *(d->defs) += "   />\n";
-
-
-        *(d->defs) += "\n";
-        *(d->defs) += "   <pattern id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "_ref\"\n      ";
-        *(d->defs) += xywh;
-        *(d->defs) += "\n       patternUnits=\"userSpaceOnUse\"";
-        *(d->defs) += " >\n";
-        *(d->defs) += "      <use id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "_ign\" ";
-        *(d->defs) += " xlink:href=\"#";
-        *(d->defs) += imagename;
-        *(d->defs) += "\" />\n";
-        *(d->defs) += "    ";
-        *(d->defs) += "   </pattern>\n";
+        d->defs += "\n";
+        d->defs += "   <image id=\"";
+        d->defs += imagename;
+        d->defs += "\"\n      ";
+        d->defs += xywh;
+        d->defs += "\n";
+        if(dibparams == U_BI_JPEG){    d->defs += "       xlink:href=\"data:image/jpeg;base64,"; }
+        else {                         d->defs += "       xlink:href=\"data:image/png;base64,";  }
+        d->defs += base64String;
+        d->defs += "\"\n";
+        d->defs += " preserveAspectRatio=\"none\"\n";
+        d->defs += "   />\n";
+
+
+        d->defs += "\n";
+        d->defs += "   <pattern id=\"";
+        d->defs += imagename;
+        d->defs += "_ref\"\n      ";
+        d->defs += xywh;
+        d->defs += "\n       patternUnits=\"userSpaceOnUse\"";
+        d->defs += " >\n";
+        d->defs += "      <use id=\"";
+        d->defs += imagename;
+        d->defs += "_ign\" ";
+        d->defs += " xlink:href=\"#";
+        d->defs += imagename;
+        d->defs += "\" />\n";
+        d->defs += "    ";
+        d->defs += "   </pattern>\n";
     }
     g_free(base64String); //wait until this point to free because it might be a duplicate image
     return(idx-1);
@@ -599,33 +594,33 @@ uint32_t Wmf::add_bm16_image(PWMF_CALLBACK_DATA d, U_BITMAP16 Bm16, const char *
         sprintf(imagename,"WMFimage%d",idx++);
         sprintf(xywh," x=\"0\" y=\"0\" width=\"%d\" height=\"%d\" ",width,height); // reuse this buffer
 
-        *(d->defs) += "\n";
-        *(d->defs) += "   <image id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "\"\n      ";
-        *(d->defs) += xywh;
-        *(d->defs) += "\n";
-        *(d->defs) += "       xlink:href=\"data:image/png;base64,";
-        *(d->defs) += base64String;
-        *(d->defs) += "\"\n";
-        *(d->defs) += " preserveAspectRatio=\"none\"\n";
-        *(d->defs) += "   />\n";
-
-
-        *(d->defs) += "\n";
-        *(d->defs) += "   <pattern id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "_ref\"\n      ";
-        *(d->defs) += xywh;
-        *(d->defs) += "\n       patternUnits=\"userSpaceOnUse\"";
-        *(d->defs) += " >\n";
-        *(d->defs) += "      <use id=\"";
-        *(d->defs) += imagename;
-        *(d->defs) += "_ign\" ";
-        *(d->defs) += " xlink:href=\"#";
-        *(d->defs) += imagename;
-        *(d->defs) += "\" />\n";
-        *(d->defs) += "   </pattern>\n";
+        d->defs += "\n";
+        d->defs += "   <image id=\"";
+        d->defs += imagename;
+        d->defs += "\"\n      ";
+        d->defs += xywh;
+        d->defs += "\n";
+        d->defs += "       xlink:href=\"data:image/png;base64,";
+        d->defs += base64String;
+        d->defs += "\"\n";
+        d->defs += " preserveAspectRatio=\"none\"\n";
+        d->defs += "   />\n";
+
+
+        d->defs += "\n";
+        d->defs += "   <pattern id=\"";
+        d->defs += imagename;
+        d->defs += "_ref\"\n      ";
+        d->defs += xywh;
+        d->defs += "\n       patternUnits=\"userSpaceOnUse\"";
+        d->defs += " >\n";
+        d->defs += "      <use id=\"";
+        d->defs += imagename;
+        d->defs += "_ign\" ";
+        d->defs += " xlink:href=\"#";
+        d->defs += imagename;
+        d->defs += "\" />\n";
+        d->defs += "   </pattern>\n";
     }
     g_free(base64String); //wait until this point to free because it might be a duplicate image
     return(idx-1);
@@ -714,8 +709,8 @@ Wmf::output_style(PWMF_CALLBACK_DATA d)
 
 
 //    tmp_id << "\n\tid=\"" << (d->id++) << "\"";
-//    *(d->outsvg) += tmp_id.str().c_str();
-    *(d->outsvg) += "\n\tstyle=\"";
+//    d->outsvg += tmp_id.str().c_str();
+    d->outsvg += "\n\tstyle=\"";
     if (!d->dc[d->level].fill_set ||  ( d->mask & U_DRAW_NOFILL)) { // nofill are lines and arcs
         tmp_style << "fill:none;";
     } else {
@@ -842,7 +837,7 @@ Wmf::output_style(PWMF_CALLBACK_DATA d)
         tmp_style << "\n\tclip-path=\"url(#clipWmfPath" << d->id << ")\" ";
     clipset = false;
 
-    *(d->outsvg) += tmp_style.str().c_str();
+    d->outsvg += tmp_style.str().c_str();
 }
 
 
@@ -1326,8 +1321,8 @@ void Wmf::common_dib_to_image(PWMF_CALLBACK_DATA d, const char *dib,
     tmp_image << " preserveAspectRatio=\"none\"\n";
     tmp_image << "/> \n";
 
-    *(d->outsvg) += tmp_image.str().c_str();
-    *(d->path) = "";
+    d->outsvg += tmp_image.str().c_str();
+    d->path = "";
 }
 
 /**
@@ -1418,8 +1413,8 @@ void Wmf::common_bm16_to_image(PWMF_CALLBACK_DATA d, U_BITMAP16 Bm16, const char
     tmp_image << " preserveAspectRatio=\"none\"\n";
     tmp_image << "/> \n";
 
-    *(d->outsvg) += tmp_image.str().c_str();
-    *(d->path) = "";
+    d->outsvg += tmp_image.str().c_str();
+    d->path = "";
 }
 
 /**
@@ -1579,7 +1574,7 @@ int Wmf::myMetaFileProc(const char *contents, unsigned int length, PWMF_CALLBACK
         d->dc[0].style.stroke_width.value =  pix_to_abs_size( d, 1 ); // This could not be set until the size of the WMF was known
         dbg_str << "<!-- U_WMR_HEADER -->\n";
 
-        *(d->outdef) += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
+        d->outdef += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 
         SVGOStringStream tmp_outdef;
         tmp_outdef << "<svg\n";
@@ -1592,8 +1587,8 @@ int Wmf::myMetaFileProc(const char *contents, unsigned int length, PWMF_CALLBACK
         tmp_outdef <<
             "  width=\"" << Inkscape::Util::Quantity::convert(d->PixelsOutX, "px", "mm") << "mm\"\n" <<
             "  height=\"" << Inkscape::Util::Quantity::convert(d->PixelsOutY, "px", "mm")  << "mm\">\n";
-        *(d->outdef) += tmp_outdef.str().c_str();
-        *(d->outdef) += "<defs>";                           // temporary end of header
+        d->outdef += tmp_outdef.str().c_str();
+        d->outdef += "<defs>";                           // temporary end of header
 
         // d->defs holds any defines which are read in.
 
@@ -1636,7 +1631,7 @@ int Wmf::myMetaFileProc(const char *contents, unsigned int length, PWMF_CALLBACK
         TR_layout_2_svg(d->tri);
         SVGOStringStream ts;
         ts << d->tri->out;
-        *(d->outsvg) += ts.str().c_str();
+        d->outsvg += ts.str().c_str();
         d->tri = trinfo_clear(d->tri);
     }
     if(d->dc[d->level].dirty){  //Apply the delayed background changes, clear the flag
@@ -1688,13 +1683,13 @@ std::cout << "BEFORE DRAW"
         )
     ){
 //  std::cout << "PATH DRAW at TOP <<+++++++++++++++++++++++++++++++++++++" << std::endl;
-        *(d->outsvg) += "   <path ";    // this is the ONLY place <path should be used!!!!
+        d->outsvg += "   <path ";    // this is the ONLY place <path should be used!!!!
         output_style(d);
-        *(d->outsvg) += "\n\t";
-        *(d->outsvg) += "\n\td=\"";      // this is the ONLY place d=" should be used!!!!
-        *(d->outsvg) += *(d->path);
-        *(d->outsvg) += " \" /> \n";
-        *(d->path) = ""; //reset the path
+        d->outsvg += "\n\t";
+        d->outsvg += "\n\td=\"";      // this is the ONLY place d=" should be used!!!!
+        d->outsvg += d->path;
+        d->outsvg += " \" /> \n";
+        d->path = ""; //reset the path
         // reset the flags
         d->mask = 0;
         d->drawtype = 0;
@@ -1706,7 +1701,7 @@ std::cout << "BEFORE DRAW"
         {
             dbg_str << "<!-- U_WMR_EOF -->\n";
 
-            *(d->outsvg) = *(d->outdef) + *(d->defs) + "\n</defs>\n\n" + *(d->outsvg) + "</svg>\n";
+            d->outsvg = d->outdef + d->defs + "\n</defs>\n\n" + d->outsvg + "</svg>\n";
             OK=0;
             break;
         }
@@ -1944,8 +1939,8 @@ std::cout << "BEFORE DRAW"
             tmp_rectangle << "\n   height=\"" << dh << "\" />";
             tmp_rectangle << "\n</clipPath>";
 
-            *(d->outdef) += tmp_rectangle.str().c_str();
-            *(d->path) = "";
+            d->outdef += tmp_rectangle.str().c_str();
+            d->path = "";
             break;
         }
         case U_WMR_ARC:
@@ -1992,12 +1987,12 @@ std::cout << "BEFORE DRAW"
 
             d->mask |= wmr_mask;
 
-            *(d->outsvg) += "   <ellipse ";
+            d->outsvg += "   <ellipse ";
             output_style(d);
-            *(d->outsvg) += "\n\t";
-            *(d->outsvg) += tmp_ellipse.str().c_str();
-            *(d->outsvg) += "/> \n";
-            *(d->path) = "";
+            d->outsvg += "\n\t";
+            d->outsvg += tmp_ellipse.str().c_str();
+            d->outsvg += "/> \n";
+            d->path = "";
             break;
         }
         case U_WMR_FLOODFILL:             dbg_str << "<!-- U_WMR_EXTFLOODFILL -->\n";         break;
@@ -2503,7 +2498,7 @@ std::cout << "BEFORE DRAW"
                     TR_layout_analyze(d->tri);
                     TR_layout_2_svg(d->tri);
                     ts << d->tri->out;
-                    *(d->outsvg) += ts.str().c_str();
+                    d->outsvg += ts.str().c_str();
                     d->tri = trinfo_clear(d->tri);
                     (void) trinfo_load_textrec(d->tri, &tsp, tsp.ori,TR_EMFBOT); // ignore return status, it must work
                 }
@@ -2910,13 +2905,13 @@ std::cout << "BEFORE DRAW"
             break;
     }  //end of switch
 // When testing, uncomment the following to place a comment for each processed WMR record in the SVG
-//    *(d->outsvg) += dbg_str.str().c_str();
-    *(d->path)   += tmp_path.str().c_str();
+//    d->outsvg += dbg_str.str().c_str();
+    d->path   += tmp_path.str().c_str();
     if(!nSize){ OK=0; std::cout << "nSize == 0, oops!!!" << std::endl; }     // There was some problem with this record, it is not safe to continue
 
     }  //end of while
 // When testing, uncomment the following to show the final SVG derived from the WMF
-// std::cout << *(d->outsvg) << std::endl;
+// std::cout << d->outsvg << std::endl;
     (void) U_wmr_properties(U_WMR_INVALID);  // force the release of the lookup table memory, returned value is irrelevant
 
     return 1;
@@ -2935,70 +2930,36 @@ Wmf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 
     WMF_CALLBACK_DATA d;
 
-    memset(&d, 0, sizeof(WMF_CALLBACK_DATA));
-
-    for(int i = 0; i < WMF_MAX_DC+1; i++){  // be sure all values and pointers are empty to start with
-        memset(&(d.dc[i]),0,sizeof(WMF_DEVICE_CONTEXT));
-    }
-    // set default drawing objects, these are active if no object has been selected
-    d.dc[0].active_pen                         = -1;  // -1 when the default is used instead of a selected object
-    d.dc[0].active_brush                       = -1;
-    d.dc[0].active_font                        = -1;
-    // Default font, WMF spec says device can pick whatever it wants.  WMF files that do not specify a font are unlikely to look very good!
-    d.dc[0].font_name = strdup("Arial");
+    // Default font, WMF spec says device can pick whatever it wants. 
+    // WMF files that do not specify a  font are unlikely to look very good!
     d.dc[0].style.font_size.computed           = 16.0;
     d.dc[0].style.font_weight.value            = SP_CSS_FONT_WEIGHT_400;
     d.dc[0].style.font_style.value             = SP_CSS_FONT_STYLE_NORMAL;
     d.dc[0].style.text_decoration_line.underline    = 0;
     d.dc[0].style.text_decoration_line.line_through = 0;
     d.dc[0].style.baseline_shift.value         = 0;
-    d.dc[0].textColor                          = U_RGB(0, 0, 0);        // default foreground color (black)
-    d.dc[0].bkColor                            = U_RGB(255, 255, 255);  // default background color (white)
-    d.dc[0].bkMode                             = U_TRANSPARENT;
-    d.dc[0].dirty                              = 0;
+
     // Default pen, WMF files that do not specify a pen are unlikely to look very good!
     d.dc[0].style.stroke_dasharray.set         = 0;
     d.dc[0].style.stroke_linecap.computed      = 2; // U_PS_ENDCAP_SQUARE;
     d.dc[0].style.stroke_linejoin.computed     = 0; // U_PS_JOIN_MITER;
-    d.dc[0].stroke_set                         = true;
     d.dc[0].style.stroke_width.value           = 1.0; // will be reset to something reasonable once WMF draying size is known
     d.dc[0].style.stroke.value.color.set( 0, 0, 0 );
-    // Default brush = none, WMF files that do not specify a brush are unlikely to look very good!
-    d.dc[0].fill_set                           = false;
 
     if (uri == NULL) {
         return NULL;
     }
 
-    d.outsvg            = new Glib::ustring("");
-    d.path              = new Glib::ustring("");
-    d.outdef            = new Glib::ustring("");
-    d.defs              = new Glib::ustring("");
-    d.mask              = 0;
-    d.drawtype          = 0;
-    d.arcdir            = U_AD_COUNTERCLOCKWISE;
-    d.dwRop2            = U_R2_COPYPEN;
-    d.dwRop3            = 0;
-    d.E2IdirY           = 1.0;
-    d.D2PscaleX         = 1.0;
-    d.D2PscaleY         = 1.0;
-    d.hatches.size      = 0;
-    d.hatches.count     = 0;
-    d.hatches.strings   = NULL;
-    d.images.size       = 0;
-    d.images.count      = 0;
-    d.images.strings    = NULL;
-
     // set up the size default for patterns in defs.  This might not be referenced if there are no patterns defined in the drawing.
 
-    *(d.defs) += "\n";
-    *(d.defs) += "   <pattern id=\"WMFhbasepattern\"     \n";
-    *(d.defs) += "        patternUnits=\"userSpaceOnUse\"\n";
-    *(d.defs) += "        width=\"6\"                    \n";
-    *(d.defs) += "        height=\"6\"                   \n";
-    *(d.defs) += "        x=\"0\"                        \n";
-    *(d.defs) += "        y=\"0\">                       \n";
-    *(d.defs) += "   </pattern>                          \n";
+    d.defs += "\n";
+    d.defs += "   <pattern id=\"WMFhbasepattern\"     \n";
+    d.defs += "        patternUnits=\"userSpaceOnUse\"\n";
+    d.defs += "        width=\"6\"                    \n";
+    d.defs += "        height=\"6\"                   \n";
+    d.defs += "        x=\"0\"                        \n";
+    d.defs += "        y=\"0\">                       \n";
+    d.defs += "   </pattern>                          \n";
 
 
     size_t length;
@@ -3016,12 +2977,8 @@ Wmf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 
 //    std::cout << "SVG Output: " << std::endl << *(d.outsvg) << std::endl;
 
-    SPDocument *doc = SPDocument::createNewDocFromMem(d.outsvg->c_str(), strlen(d.outsvg->c_str()), TRUE);
+    SPDocument *doc = SPDocument::createNewDocFromMem(d.outsvg.c_str(), strlen(d.outsvg.c_str()), TRUE);
 
-    delete d.outsvg;
-    delete d.path;
-    delete d.outdef;
-    delete d.defs;
     free_wmf_strings(d.hatches);
     free_wmf_strings(d.images);
 
@@ -3040,39 +2997,7 @@ Wmf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 
     d.tri = trinfo_release_except_FC(d.tri);
 
-    // Set viewBox if it doesn't exist
-    if (doc && !doc->getRoot()->viewBox_set) {
-        bool saved = Inkscape::DocumentUndo::getUndoSensitive(doc);
-        Inkscape::DocumentUndo::setUndoSensitive(doc, false);
-        
-        doc->ensureUpToDate();
-        
-        // Set document unit
-        Inkscape::XML::Node *repr = sp_document_namedview(doc, 0)->getRepr();
-        Inkscape::SVGOStringStream os;
-        Inkscape::Util::Unit const* doc_unit = doc->getWidth().unit;
-        os << doc_unit->abbr;
-        repr->setAttribute("inkscape:document-units", os.str().c_str());
-        
-        // Set viewBox
-        doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc_unit), doc->getHeight().value(doc_unit)));
-        doc->ensureUpToDate();
-
-        // Scale and translate objects
-        double scale = Inkscape::Util::Quantity::convert(1, "px", doc_unit);
-        ShapeEditor::blockSetItem(true);
-        double dh;
-        if(SP_ACTIVE_DOCUMENT){ // for file menu open or import, or paste from clipboard
-            dh = SP_ACTIVE_DOCUMENT->getHeight().value("px");
-        }
-        else { // for open via --file on command line
-            dh = doc->getHeight().value("px");
-        }
-        doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(0, dh));
-        ShapeEditor::blockSetItem(false);
-
-        Inkscape::DocumentUndo::setUndoSensitive(doc, saved);
-    }
+    setViewBoxIfMissing(doc);
 
     return doc;
 }
diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h
index 3d23ca749..6006479c7 100644
--- a/src/extension/internal/wmf-inout.h
+++ b/src/extension/internal/wmf-inout.h
@@ -26,20 +26,54 @@ namespace Internal {
 #define DIRTY_FILL   0x02
 #define DIRTY_STROKE 0x04 // not used currently
 
-typedef struct {
+typedef struct wmf_object {
+    wmf_object() :
+        type(0),
+        level(0),
+        record(NULL)
+    {};
     int type;
     int level;
     char *record;
 } WMF_OBJECT, *PWMF_OBJECT;
 
-typedef struct {
+typedef struct wmf_strings {
+    wmf_strings() :
+        size(0),
+        count(0),
+        strings(NULL)
+    {};
     int size;         // number of slots allocated in strings
     int count;        // number of slots used in strings
     char **strings;   // place to store strings
 } WMF_STRINGS, *PWMF_STRINGS;
 
 typedef struct wmf_device_context {
-    struct SPStyle  style;
+    wmf_device_context() :
+        // SPStyle: class with constructor
+        font_name(NULL),
+        stroke_set(false), stroke_mode(0), stroke_idx(0), stroke_recidx(0),
+        fill_set(false),   fill_mode(0),   fill_idx(0),   fill_recidx(0),
+        dirty(0),
+        active_pen(-1), active_brush(-1), active_font(-1),  // -1 when the default is used
+        // sizeWnd, sizeView, winorg, vieworg,
+        ScaleInX(0), ScaleInY(0),
+        ScaleOutX(0), ScaleOutY(0),
+        bkMode(U_TRANSPARENT),
+        // bkColor, textColor
+        textAlign(0)
+        // worldTransform, cur
+    {
+        font_name = strdup("Arial"); // Default font, WMF spec says device can pick whatever it wants
+        sizeWnd = point16_set( 0.0, 0.0 );
+        sizeView = point16_set( 0.0, 0.0 );
+        winorg = point16_set( 0.0, 0.0 );
+        vieworg = point16_set( 0.0, 0.0 );
+        bkColor = U_RGB(255, 255, 255); // default foreground color (white)
+        textColor = U_RGB(0, 0, 0);     // default foreground color (black)
+        cur = point16_set( 0.0, 0.0 );
+    };
+    SPStyle         style;
     char           *font_name;
     bool            stroke_set;
     int             stroke_mode;  // enumeration from drawmode, not used if fill_set is not True
@@ -74,11 +108,32 @@ typedef struct wmf_device_context {
 // this fixes it, so some confusion between this struct and the one in emf-inout???
 //typedef struct wmf_callback_data {
 // as does this
-typedef struct {
-    Glib::ustring *outsvg;
-    Glib::ustring *path;
-    Glib::ustring *outdef;
-    Glib::ustring *defs;
+typedef struct wmf_callback_data {
+
+    wmf_callback_data() :
+        // dc: array, structure w/ constructor
+        level(0),
+        E2IdirY(1.0),
+        D2PscaleX(1.0), D2PscaleY(1.0),
+        PixelsInX(0), PixelsInY(0),
+        PixelsOutX(0), PixelsOutY(0),
+        ulCornerInX(0), ulCornerInY(0),
+        ulCornerOutX(0), ulCornerOutY(0),
+        mask(0),
+        arcdir(U_AD_COUNTERCLOCKWISE),
+        dwRop2(U_R2_COPYPEN), dwRop3(0),
+        id(0), drawtype(0),
+        // hatches, images, gradients,  struct w/ constructor
+        tri(NULL),
+        n_obj(0),
+        low_water(0)
+        //wmf_obj
+    {};
+
+    Glib::ustring outsvg;
+    Glib::ustring path;
+    Glib::ustring outdef;
+    Glib::ustring defs;
 
     WMF_DEVICE_CONTEXT dc[WMF_MAX_DC+1]; // FIXME: This should be dynamic..
     int level;
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index 5a552ad83..55ad5da5f 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -1387,7 +1387,7 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
             _lookup_ppt_fontfix("Convert To Wingdings", params);
             break;
         default:  //also CVTNON
-            _lookup_ppt_fontfix(style->text->font_family.value, params);
+            _lookup_ppt_fontfix(style->font_family.value, params);
             break;
         }
         if (params.f2 != 0 || params.f3 != 0) {
@@ -1416,7 +1416,7 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te
         // of the special fonts.
         char *facename;
         if (!newfont) {
-            facename = U_Utf8ToLatin1(style->text->font_family.value, 0, NULL);
+            facename = U_Utf8ToLatin1(style->font_family.value, 0, NULL);
         } else {
             facename = U_Utf8ToLatin1(FontName(newfont), 0, NULL);
         }