summaryrefslogtreecommitdiffstats
path: root/src/sp-flowtext.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2008-10-11 15:16:23 +0000
committerTed Gould <ted@canonical.com>2008-10-11 15:16:23 +0000
commit2f5eb047d9e05be5e68549ef6b75070d2faa7d2f (patch)
treeca2e94164b6d7aaebfc17196ca46bfc825a7665a /src/sp-flowtext.cpp
parentMerge from trunk. (diff)
downloadinkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz
inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip
Merging from trunk
(bzr r6884)
Diffstat (limited to 'src/sp-flowtext.cpp')
-rw-r--r--src/sp-flowtext.cpp4
1 files changed, 2 insertions, 2 deletions
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;