X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Filter_i.cxx;h=2a952d4dbab99f5db5277230f0e4c8e65f026d47;hb=16d4535b347502e1467045dc1a27a5eaad9eebc7;hp=e354fe87289f9c17f56f344d65899fc36b880ac7;hpb=0fc0831670e27a5611b941c52dc152fd63964515;p=modules%2Fsmesh.git

diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx
index e354fe872..2a952d4db 100644
--- a/src/SMESH_I/SMESH_Filter_i.cxx
+++ b/src/SMESH_I/SMESH_Filter_i.cxx
@@ -137,6 +137,8 @@ static TopoDS_Shape getShapeByName( const char* theName )
   {
     SMESH_Gen_i* aSMESHGen     = SMESH_Gen_i::GetSMESHGen();
     SALOMEDS::Study::ListOfSObject_var aList = SMESH_Gen_i::getStudyServant()->FindObjectByName( theName, "GEOM" );
+    if ( aList->length() == 0 )
+      aList = SMESH_Gen_i::getStudyServant()->FindObjectByName( theName, "SHAPERSTUDY" );
     if ( aList->length() > 0 )
     {
       CORBA::Object_var        anObj = aList[ 0 ]->GetObject();
@@ -716,7 +718,7 @@ BadOrientedVolume_i::BadOrientedVolume_i()
 {
   Controls::PredicatePtr control( new Controls::BadOrientedVolume() );
   myFunctorPtr = myPredicatePtr = control;
-};
+}
 
 FunctorType BadOrientedVolume_i::GetFunctorType()
 {
@@ -731,7 +733,7 @@ BareBorderVolume_i::BareBorderVolume_i()
 {
   Controls::PredicatePtr control( new Controls::BareBorderVolume() );
   myFunctorPtr = myPredicatePtr = control;
-};
+}
 
 FunctorType BareBorderVolume_i::GetFunctorType()
 {
@@ -746,7 +748,7 @@ BareBorderFace_i::BareBorderFace_i()
 {
   Controls::PredicatePtr control( new Controls::BareBorderFace() );
   myFunctorPtr = myPredicatePtr = control;
-};
+}
 
 FunctorType BareBorderFace_i::GetFunctorType()
 {
@@ -761,7 +763,7 @@ OverConstrainedVolume_i::OverConstrainedVolume_i()
 {
   Controls::PredicatePtr control( new Controls::OverConstrainedVolume() );
   myFunctorPtr = myPredicatePtr = control;
-};
+}
 
 FunctorType OverConstrainedVolume_i::GetFunctorType()
 {
@@ -776,7 +778,7 @@ OverConstrainedFace_i::OverConstrainedFace_i()
 {
   Controls::PredicatePtr control( new Controls::OverConstrainedFace() );
   myFunctorPtr = myPredicatePtr = control;
-};
+}
 
 FunctorType OverConstrainedFace_i::GetFunctorType()
 {
@@ -841,7 +843,7 @@ void BelongToMeshGroup_i::SetGroupID( const char* theID ) // IOR or StoreName
 std::string BelongToMeshGroup_i::GetGroupID()
 {
   if ( myGroup->_is_nil() )
-    SMESH::SMESH_GroupBase_var( GetGroup() );
+    SMESH::SMESH_GroupBase_var( GetGroup() );  // decref the returned pointer
 
   if ( !myGroup->_is_nil() )
     myID = SMESH_Gen_i::GetORB()->object_to_string( myGroup );
@@ -1635,7 +1637,6 @@ void ConnectedElements_i::SetPoint( CORBA::Double x, CORBA::Double y, CORBA::Dou
 }
 
 void ConnectedElements_i::SetVertex( GEOM::GEOM_Object_ptr vertex )
-  throw (SALOME::SALOME_Exception)
 {
   TopoDS_Shape shape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( vertex );
   if ( shape.IsNull() )
@@ -1657,7 +1658,6 @@ void ConnectedElements_i::SetVertex( GEOM::GEOM_Object_ptr vertex )
 }
 
 void ConnectedElements_i::SetNode ( CORBA::Long nodeID )
-  throw (SALOME::SALOME_Exception)
 {
   if ( nodeID < 1 )
     THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetNode(): nodeID must be > 0",
@@ -1673,7 +1673,6 @@ void ConnectedElements_i::SetNode ( CORBA::Long nodeID )
  */
 void ConnectedElements_i::SetThreshold ( const char*                             threshold,
                                          SMESH::ConnectedElements::ThresholdType type )
-  throw (SALOME::SALOME_Exception)
 {
   if ( !threshold )
     THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetThreshold(): NULL threshold",