merge from trunk (r12337)

(bzr r11668.1.70)

1 files changed, 30 insertions, 0 deletions

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index d94b085a0..cd0001175 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -250,6 +250,36 @@ void SelectionHelper::selectPrev(SPDesktop *dt)
     }
 }
 
+/*
+ * Fixes the current selection, removing locked objects from it
+ */
+void SelectionHelper::fixSelection(SPDesktop *dt) 
+{
+    if(!dt)
+        return;
+
+    Inkscape::Selection *selection = sp_desktop_selection(dt);
+    
+    GSList *items = NULL;
+
+    GSList const *selList = selection->itemList();
+
+    for( GSList const *i = selList; i; i = i->next ) {
+        if( SP_IS_ITEM(i->data) &&
+            !dt->isLayer(SP_ITEM(i->data)) &&
+            (!SP_ITEM(i->data)->isLocked()))
+        {
+            items = g_slist_prepend(items, SP_ITEM(i->data));
+        }
+    }
+
+    selection->setList(items);
+
+    if(items) {
+        g_slist_free(items);
+    }
+}
+
 } // namespace Inkscape