Merge master branch into V9_dev.

[modules/geom.git] / src / GEOMImpl / GEOMImpl_ImportDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
index 28e5b89c592a5dbc429544d73b709bed8c2190c6..52a4cf00f2dbc748cc7bcd6d993bb0dae865371c 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -55,7 +55,7 @@ GEOMImpl_ImportDriver::GEOMImpl_ImportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@ -69,14 +69,14 @@ Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_Logbook& log) const
     return 0;
 
   Handle(TColStd_HSequenceOfTransient) aSeq =
-    GEOMImpl_IECallBack::GetCallBack( aFormatName )->Import( GetDocID(), aFormatName, aFileName );
+    GEOMImpl_IECallBack::GetCallBack( aFormatName )->Import( aFormatName, aFileName );
   if( aSeq.IsNull() )
     return 0;
 
   Handle(GEOM_Object) anImported = Handle(GEOM_Object)::DownCast( aSeq->Value(1) );
   TopoDS_Shape aShape = anImported->GetValue();
   aFunction->SetValue( aShape );
-  log.SetTouched(Label());
+  log->SetTouched(Label());
 
   return 1;
 }
@@ -106,5 +106,4 @@ GetCreationInformation(std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ImportDriver,GEOM_BaseDriver);
 IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver);