From 2359e000c2a33474dbdd418063a342dfff183dde Mon Sep 17 00:00:00 2001 From: mpv Date: Tue, 14 Jun 2005 06:57:38 +0000 Subject: [PATCH] Patches from Paul for Debian --- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 6ff28f176..eebc5a86b 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -182,19 +182,30 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape (GEOM::GEOM_Object_ptr theS //Set a not done flag GetOperations()->SetNotDone(); - if (theShape == NULL) return 0; + if (theShape == NULL) + { + theDescription = CORBA::string_dup("null"); + return 0; + } //Get the reference shape Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject (theShape->GetStudyID(), theShape->GetEntry()); - if (aShape.IsNull()) return 0; + if (aShape.IsNull()) + { + theDescription = CORBA::string_dup("null2"); + return 0; + } // Get shape parameters TCollection_AsciiString aDump; - if (GetOperations()->CheckShape(aShape, aDump)) return 1; - - theDescription = CORBA::string_dup(aDump.ToCString()); + if (GetOperations()->CheckShape(aShape, aDump)) + { + theDescription = CORBA::string_dup(aDump.ToCString()); + return 1; + } + theDescription = CORBA::string_dup("checkShape 0"); return 0; } -- 2.39.2