Merging from trunk

[inkscape.git] / src / extension / internal / odf.cpp

diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 01690628964480c352f800d5e9c811d49831bd6a..a74e17a1073fc58dd13618e000d37cda004ba31f 100644 (file)
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -964,10 +964,10 @@ static Geom::Matrix getODFTransform(const SPItem *item)
  */
 static boost::optional<Geom::Rect> getODFBoundingBox(const SPItem *item)
 {
-    boost::optional<NR::Rect> bbox_temp = sp_item_bbox_desktop((SPItem *)item);
+    boost::optional<Geom::Rect> bbox_temp = sp_item_bbox_desktop((SPItem *)item);
     boost::optional<Geom::Rect> bbox;
     if (bbox_temp) {
-        bbox = to_2geom(*bbox_temp);
+        bbox = *bbox_temp;
         double doc_height    = sp_document_height(SP_ACTIVE_DOCUMENT);
         Geom::Matrix doc2dt_tf = Geom::Matrix(Geom::Scale(1.0, -1.0));
         doc2dt_tf            = doc2dt_tf * Geom::Matrix(Geom::Translate(0, doc_height));