From 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 11 Oct 2008 11:16:23 -0400
Subject: Merging from trunk

(bzr r6884)
---
 src/extension/internal/odf.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/extension/internal/odf.cpp')

diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 016906289..a74e17a10 100644
--- 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));
-- 
cgit v1.2.3