NR::Maybe => boost::optional

[inkscape.git] / src / sp-item-group.cpp

diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 9e6333f97dcc14c42bbd9e6caa845c75341008b4..186b766635f1115ee63e0817401f4fd83af249c5 100644 (file)
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -696,12 +696,12 @@ void CGroup::onModified(guint flags) {
 
 void CGroup::calculateBBox(NRRect *bbox, NR::Matrix const &transform, unsigned const flags) {
 
-    NR::Maybe<NR::Rect> dummy_bbox = NR::Nothing();
+    boost::optional<NR::Rect> dummy_bbox;
 
     GSList *l = _group->childList(false, SPObject::ActionBBox);
     while (l) {
         SPObject *o = SP_OBJECT (l->data);
-        if (SP_IS_ITEM(o)) {
+        if (SP_IS_ITEM(o) && !SP_ITEM(o)->isHidden()) {
             SPItem *child = SP_ITEM(o);
             NR::Matrix const ct(child->transform * transform);
             sp_item_invoke_bbox_full(child, &dummy_bbox, ct, flags, FALSE);