Fixes pointed by Tav

3 files changed, 19 insertions, 22 deletions

diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index a22a33e40..25228fe89 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -1095,17 +1095,16 @@ Emf::select_pen(PEMF_CALLBACK_DATA d, int index)
         case U_PS_DASHDOT:
         case U_PS_DASHDOTDOT:
         {
-            SPILength spilength;
-            spilength.read("1");
+            SPILength spilength("temp", 1);
             int penstyle = (pEmr->lopn.lopnStyle & U_PS_STYLE_MASK);
             if (!d->dc[d->level].style.stroke_dasharray.values.empty() &&
                 (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
                                                        d->dc[d->level - 1].style.stroke_dasharray)))
                 d->dc[d->level].style.stroke_dasharray.values.clear();
             if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
-                spilength.read("3");
+                spilength.setDouble(3);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
-                spilength.read("1");
+                spilength.setDouble(1);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
@@ -1190,13 +1189,9 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
                     (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
                                                            d->dc[d->level - 1].style.stroke_dasharray)))
                     d->dc[d->level].style.stroke_dasharray.values.clear();
-                SPILength spilength;
                 for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) {
                     double dash_length = pix_to_abs_size( d, pEmr->elp.elpStyleEntry[i] );
-                    Inkscape::CSSOStringStream osarray;
-                    osarray << dash_length;
-                    spilength.read(osarray.str().c_str());
-                    d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
+                    d->dc[d->level].style.stroke_dasharray.values.push_back(SPILength("temp", dash_length));
                 }
                 d->dc[d->level].style.stroke_dasharray.set = 1;
             } else {
@@ -1215,23 +1210,23 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
                 (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
                                                        d->dc[d->level - 1].style.stroke_dasharray)))
                 d->dc[d->level].style.stroke_dasharray.values.clear();
-            SPILength spilength;
+            SPILength spilength("temp");
             if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
-                spilength.read("3");
+                spilength.setDouble(3);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
-                spilength.read("2");
+                spilength.setDouble(2);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
-                spilength.read("1");
+                spilength.setDouble(1);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
-                spilength.read("2");
+                spilength.setDouble(2);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DASHDOTDOT) {
-                spilength.read("1");
+                spilength.setDouble(1);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
-                spilength.read("2");
+                spilength.setDouble(2);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
 
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 1f8d4668d..3bc6b1b3d 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -985,16 +985,15 @@ Wmf::select_pen(PWMF_CALLBACK_DATA d, int index)
         case U_PS_DASHDOTDOT:
         {
             int penstyle = (up.Style & U_PS_STYLE_MASK);
-            SPILength spilength;
-            spilength.read("1");
+            SPILength spilength("temp", 1);
             if (!d->dc[d->level].style.stroke_dasharray.values.empty() &&
                 (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
                                                        d->dc[d->level - 1].style.stroke_dasharray)))
                 d->dc[d->level].style.stroke_dasharray.values.clear();
             if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
-                spilength.read("3");
+                spilength.setDouble(3);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
-                spilength.read("1");
+                spilength.setDouble(1);
                 d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index 917aded32..3f6df1162 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -605,8 +605,11 @@ int PrintWmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
                 for (i=0;i<n_dash;i++) {
                     int mark = style->stroke_dasharray.values[i].value;
                     if (mark > mark_long) {
-                        mark_long = mark; }
-                  if (mark<mark_short) { mark_short = mark; }
+                        mark_long = mark; 
+                    }
+                    if (mark<mark_short) { 
+                        mark_short = mark;
+                    }
                 }
                 if(mark_long == mark_short){  // only one mark size
                    penstyle = U_PS_DOT;