Use cursor-tweak-move.xpm for all object modes and cursor-color.xpm

[inkscape.git] / src / conn-avoid-ref.cpp

diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 34c839c6f04635cf85b4440d1df51a2979672b1f..43c9c0b66cb652c5fa906f50d7d1f5e1c5ca20b2 100644 (file)
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -190,7 +190,7 @@ static Avoid::Polygn avoid_item_poly(SPItem const *item)
     //       by the sp_*_update functions, e.g., text.
     sp_document_ensure_up_to_date(item->document);
     
-    boost::optional<Geom::Rect> rHull = item->getBounds(sp_item_i2doc_affine(item));
+    Geom::OptRect rHull = item->getBounds(sp_item_i2doc_affine(item));
     if (!rHull) {
         return Avoid::newPoly(0);
     }
@@ -199,7 +199,7 @@ static Avoid::Polygn avoid_item_poly(SPItem const *item)
 
     // Add a little buffer around the edge of each object.
     Geom::Rect rExpandedHull = *rHull;
-    rExpandedHull.expandBy(-spacing); 
+    rExpandedHull.expandBy(spacing); 
     poly = Avoid::newPoly(4);
 
     for (unsigned n = 0; n < 4; ++n) {
@@ -253,7 +253,7 @@ void avoid_item_move(Geom::Matrix const */*mp*/, SPItem *moved_item)
 void init_avoided_shape_geometry(SPDesktop *desktop)
 {
     // Don't count this as changes to the document,
-    // it is basically just llate initialisation.
+    // it is basically just late initialisation.
     SPDocument *document = sp_desktop_document(desktop);
     bool saved = sp_document_get_undo_sensitive(document);
     sp_document_set_undo_sensitive(document, false);