diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-11 15:16:23 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-11 15:16:23 +0000 |
| commit | 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f (patch) | |
| tree | ca2e94164b6d7aaebfc17196ca46bfc825a7665a /src/extension/internal/odf.cpp | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip | |
Merging from trunk
(bzr r6884)
Diffstat (limited to 'src/extension/internal/odf.cpp')
| -rw-r--r-- | src/extension/internal/odf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |