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/sp-flowtext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sp-flowtext.cpp')

diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index ec60251fc..dcaa59ea0 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -352,11 +352,11 @@ sp_flowtext_print(SPItem *item, SPPrintContext *ctx)
     NRRect pbox;
     sp_item_invoke_bbox(item, &pbox, Geom::identity(), TRUE);
     NRRect bbox;
-    boost::optional<NR::Rect> bbox_maybe = sp_item_bbox_desktop(item);
+    boost::optional<Geom::Rect> bbox_maybe = sp_item_bbox_desktop(item);
     if (!bbox_maybe) {
         return;
     }
-    bbox = NRRect(*bbox_maybe);
+    bbox = NRRect(from_2geom(*bbox_maybe));
 
     NRRect dbox;
     dbox.x0 = 0.0;
-- 
cgit v1.2.3