From 1779c0f954a15d4b0721a51d13a89c723670b560 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 17 Feb 2009 12:10:20 +0000 Subject: [PATCH] Merge from BR_V5_DEV 17Feb09 --- src/GEOM/GEOM_Engine.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 67658d480..e8a25f375 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -712,9 +712,7 @@ void ProcessFunction(Handle(GEOM_Function)& theFunction, { if (theFunction.IsNull()) return; - // not to process twice if (theProcessed.Contains(theFunction->GetEntry())) return; - theProcessed.Add(theFunction->GetEntry()); // pass functions, that depends on nonexisting ones bool doNotProcess = false; @@ -753,6 +751,7 @@ void ProcessFunction(Handle(GEOM_Function)& theFunction, theIgnoreObjs.insert(anObjEntry.ToCString()); return; } + theProcessed.Add(theFunction->GetEntry()); TCollection_AsciiString aDescr = theFunction->GetDescription(); if(aDescr.Length() == 0) return; @@ -928,6 +927,8 @@ void ReplaceVariables(TCollection_AsciiString& theCommand, aStartPos++; if( aCommand.Value( aEndPos-1 ) == C_SQR_BRACKET ) aEndPos--; + if ( aStartPos == aEndPos ) + continue; // PAL20889: for "[]" if(MYDEBUG) cout<<"aStartPos = "<