0024280: Documentation of TObj_Model::GetFile() is incorrect

Do not throw exception when model was not stored yet

diff --git a/src/TObj/TObj_Model.cxx b/src/TObj/TObj_Model.cxx
index 998a397c7d91703d914503ca3c2fc204ce922d25..82e194b8f6d3ea8a73998bc4fb401182e549822f 100755 (executable)
--- a/src/TObj/TObj_Model.cxx
+++ b/src/TObj/TObj_Model.cxx
@@ -224,13 +224,17 @@ Standard_Boolean TObj_Model::Load (const char* theFile)
 
 Handle(TCollection_HAsciiString) TObj_Model::GetFile() const
 {
-  Handle(TDocStd_Document) aDoc = TDocStd_Document::Get(GetLabel());
-  if ( !aDoc.IsNull() ) {
-    TCollection_AsciiString anOldPath( aDoc->GetPath() );
-    if ( !anOldPath.IsEmpty() )
-      return new TCollection_HAsciiString( anOldPath );
+  Handle(TDocStd_Document) aDoc = GetDocument();
+  if ( aDoc.IsNull()
+   || !aDoc->IsStored())
+  {
+    return Handle(TCollection_HAsciiString)();
   }
-  return 0;
+
+  TCollection_AsciiString aPath (aDoc->GetPath());
+  return !aPath.IsEmpty()
+       ? new TCollection_HAsciiString (aPath)
+       : Handle(TCollection_HAsciiString)();
 }
 
 //=======================================================================