update to trunk

(bzr r13708.1.11)

2 files changed, 12 insertions, 7 deletions

diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index d1511ba84..f6790687c 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -169,14 +169,14 @@ CairoPsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar con
 
     bool new_areaPage  = true;
     try {
-        new_areaPage = (strcmp(ext->get_param_optiongroup("area"), "page") == 0);
+        new_areaPage = (strcmp(mod->get_param_optiongroup("area"), "page") == 0);
     } catch(...) {}
 
     bool new_areaDrawing  = !new_areaPage;
 
     float bleedmargin_px = 0.;
     try {
-        bleedmargin_px = ext->get_param_float("bleed");
+        bleedmargin_px = mod->get_param_float("bleed");
     } catch(...) {}
 
     const gchar *new_exportId = NULL;
@@ -221,7 +221,7 @@ CairoEpsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar co
     Inkscape::Extension::Extension * ext;
     unsigned int ret;
 
-    ext = Inkscape::Extension::db.get(SP_MODULE_KEY_PRINT_CAIRO_PS);
+    ext = Inkscape::Extension::db.get(SP_MODULE_KEY_PRINT_CAIRO_EPS);
     if (ext == NULL)
         return;
 
@@ -258,14 +258,14 @@ CairoEpsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar co
 
     bool new_areaPage  = true;
     try {
-        new_areaPage = (strcmp(ext->get_param_optiongroup("area"), "page") == 0);
+        new_areaPage = (strcmp(mod->get_param_optiongroup("area"), "page") == 0);
     } catch(...) {}
 
     bool new_areaDrawing  = !new_areaPage;
 
     float bleedmargin_px = 0.;
     try {
-        bleedmargin_px = ext->get_param_float("bleed");
+        bleedmargin_px = mod->get_param_float("bleed");
     } catch(...) {}
 
     const gchar *new_exportId = NULL;
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 3b95e599d..7e02de3c1 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -35,6 +35,7 @@
 #include "preferences.h"
 #include "style.h"
 #include "sp-symbol.h"
+#include "sp-root.h"
 #include "sp-use.h"
 #include "sp-use-reference.h"
 #include "sp-shape.h"
@@ -562,13 +563,17 @@ void SPUse::update(SPCtx *ctx, unsigned flags) {
         this->height.computed = this->height.value * ictx->viewport.height();
     }
 
-    cctx.viewport = Geom::Rect::from_xywh(0, 0, this->width.computed, this->height.computed);
-    cctx.i2vp = Geom::identity();
     childflags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B;
 
     if (this->child) {
         sp_object_ref(this->child);
 
+        // viewport is only changed if referencing a symbol or svg element
+        if( SP_IS_SYMBOL(this->child) || SP_IS_ROOT(this->child) ) {
+            cctx.viewport = Geom::Rect::from_xywh(0, 0, this->width.computed, this->height.computed);
+            cctx.i2vp = Geom::identity();
+        }
+        
         if (childflags || (this->child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             SPItem const *chi = dynamic_cast<SPItem const *>(child);
             g_assert(chi != NULL);