From: isn <isn@opencascade.com>
Date: Fri, 19 Jun 2015 08:19:43 +0000 (+0300)
Subject: Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
X-Git-Tag: v1.4.2~56
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8f204f24e47154e734bbe32bc4cbf661037f6a34;p=modules%2Fhydro.git

Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

Conflicts:
	src/HYDROGUI/HYDROGUI_ObjListBox.cxx
---

8f204f24e47154e734bbe32bc4cbf661037f6a34
diff --cc src/HYDROGUI/HYDROGUI_ObjListBox.cxx
index 3eef3832,f63b7fdf..8547e8fa
--- a/src/HYDROGUI/HYDROGUI_ObjListBox.cxx
+++ b/src/HYDROGUI/HYDROGUI_ObjListBox.cxx
@@@ -121,7 -123,12 +123,8 @@@ void HYDROGUI_ObjListBox::OnExclude(
  {
    QList<QListWidgetItem*> aSelection = myList->selectedItems();
    foreach( QListWidgetItem* anItem, aSelection )
 -  {
 -    int anIndex = myList->row( anItem );
 -    myList->takeItem( anIndex );
 -    mySelection.Remove( anIndex, anIndex );
 -  }
 +    delete anItem;
+   emit selectionChanged();
  }
  
  void HYDROGUI_ObjListBox::Append( const HYDROData_SequenceOfObjects& theObjects )