Join modifications from branch OCC_debug_for_3_2_0b1

[modules/superv.git] / src / GraphBase / DataFlowBase_XmlHandler.cxx

diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx
index 8f3a223dd17c00804690b27c5499e3574df4db5d..2c8dcda4946cadd8a745cec44a3c58263ccf6384 100644 (file)
--- a/src/GraphBase/DataFlowBase_XmlHandler.cxx
+++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx
@@ -262,7 +262,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
               int sizedata = aListOfDataFlows[ GraphsNumber ].Datas.size() ;
               aListOfDataFlows[ GraphsNumber ].Datas.resize( sizedata+1 ) ;                
 
-             if ( aLinkValue.type()->kind() == CORBA::tk_double )
+             if ( aLink.aLinkValue.type()->kind() == CORBA::tk_double ) // mkr : PAL12235
                aLink.aLinkValue = *aLinkDoubleValue ;
 
              aListOfDataFlows[ GraphsNumber ].Datas[ sizedata ] = aLink ;               
@@ -1117,8 +1117,9 @@ bool GraphBase::XmlHandler::endElement( const QString&,
           break ;
         case 9 :
           if ( qName == "PyFunc" ) {
-            if ( fieldvalue[depth] == NULLSTRING )
-              return returnfalse( this , "depth5-9" , qName ) ;
+           // mkr : commented for PAL12309 (the function body can contains spaces, tabs, etc.)
+           //if ( fieldvalue[depth] == NULLSTRING )
+            //  return returnfalse( this , "depth5-9" , qName ) ;
             int l = aNode.theListOfPythonFunctions.size() - 1 ;
             SUPERV::ListOfStrings aPythonFunction = *aNode.theListOfPythonFunctions[ l ] ;
             int ll = aPythonFunction.length() ;