Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / StdMeshers_I / StdMeshers_ProjectionSource2D_i.cxx

diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
index d716401799e263f943d996f77db60b15ca209025..2c14db45975dbf8c4ae7cccb03c01b599157b3e3 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -161,15 +161,10 @@ void StdMeshers_ProjectionSource2D_i::SetVertexAssociation(GEOM::GEOM_Object_ptr
     TopoDS_Shape v4 = StdMeshers_ObjRefUlils::GeomObjectToShape( targetVertex2 );
     this->GetImpl()->SetVertexAssociation( v1, v2, v3, v4 );
 
-    CORBA::String_var entry;
-    entry = sourceVertex1->GetStudyEntry();
-    myShapeEntries[ SRC_VERTEX1 ] = entry.in();
-    entry = sourceVertex2->GetStudyEntry();
-    myShapeEntries[ SRC_VERTEX2 ] = entry.in();
-    entry = targetVertex1->GetStudyEntry();
-    myShapeEntries[ TGT_VERTEX1 ] = entry.in();
-    entry = targetVertex2->GetStudyEntry();
-    myShapeEntries[ TGT_VERTEX2 ] = entry.in();
+    myShapeEntries[ SRC_VERTEX1 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( sourceVertex1 );
+    myShapeEntries[ SRC_VERTEX2 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( sourceVertex2 );
+    myShapeEntries[ TGT_VERTEX1 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( targetVertex1 );
+    myShapeEntries[ TGT_VERTEX2 ] = StdMeshers_ObjRefUlils::GeomObjectToEntry( targetVertex2 );
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );