diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-05 22:40:31 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-05 22:40:31 +0000 |
| commit | 900577c7e71534ec32dcb4e0677a509a6e517b12 (patch) | |
| tree | 8d5b4c6201b0728bff338e89106d1a8c5a0b7fef /src/extension/internal | |
| parent | codedread's patch for bug 254850 (fixes handling of description field in Obje... (diff) | |
| download | inkscape-900577c7e71534ec32dcb4e0677a509a6e517b12.tar.gz inkscape-900577c7e71534ec32dcb4e0677a509a6e517b12.zip | |
NR::Maybe => boost::optional
(bzr r6569)
Diffstat (limited to 'src/extension/internal')
| -rw-r--r-- | src/extension/internal/cairo-renderer.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/grid.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/odf.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index e7620f319..48fe3bec2 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -409,7 +409,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); // Get the bounding box of the selection - //NR::Maybe<NR::Rect> _bbox = item->getBounds(from_2geom(sp_item_i2d_affine(item))); + //boost::optional<NR::Rect> _bbox = item->getBounds(from_2geom(sp_item_i2d_affine(item))); // NRRect bbox = item->getBounds(from_2geom(sp_item_i2d_affine(item))); NRRect bbox(item->getBounds(from_2geom(sp_item_i2d_affine(item)))); diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index 534d4bcda..e206b2a68 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -86,7 +86,7 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc NR::Point(sp_document_width(doc), sp_document_height(doc))); } else { - NR::Maybe<NR::Rect> bounds = selection->bounds(); + boost::optional<NR::Rect> bounds = selection->bounds(); if (bounds) { bounding_area = *bounds; } diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 02c3626bf..959070b50 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -962,9 +962,9 @@ static NR::Matrix getODFTransform(const SPItem *item) * Get the bounding box of an item, as mapped onto * an ODF document, in cm. */ -static NR::Maybe<NR::Rect> getODFBoundingBox(const SPItem *item) +static boost::optional<NR::Rect> getODFBoundingBox(const SPItem *item) { - NR::Maybe<NR::Rect> bbox = sp_item_bbox_desktop((SPItem *)item); + boost::optional<NR::Rect> bbox = sp_item_bbox_desktop((SPItem *)item); if (bbox) { double doc_height = sp_document_height(SP_ACTIVE_DOCUMENT); NR::Matrix doc2dt_tf = NR::Matrix(NR::scale(1.0, -1.0)); @@ -1864,7 +1864,7 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, NR::Matrix tf = getODFTransform(item); //### Get ODF bounding box params for item - NR::Maybe<NR::Rect> bbox = getODFBoundingBox(item); + boost::optional<NR::Rect> bbox = getODFBoundingBox(item); if (!bbox) { return true; } |
