From fb94d616bf9b1dc88c2747994611af1c27730084 Mon Sep 17 00:00:00 2001 From: mkr Date: Tue, 7 Mar 2006 09:29:20 +0000 Subject: [PATCH] Mandriva 2006 porting. --- src/GraphBase/DataFlowBase_XmlHandler.cxx | 7 ++++--- src/GraphBase/DataFlowBase_XmlHandler.hxx | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx index 73c39fd..8f3a223 100644 --- a/src/GraphBase/DataFlowBase_XmlHandler.cxx +++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx @@ -261,9 +261,9 @@ bool GraphBase::XmlHandler::endElement( const QString&, if ( constructor ) { int sizedata = aListOfDataFlows[ GraphsNumber ].Datas.size() ; aListOfDataFlows[ GraphsNumber ].Datas.resize( sizedata+1 ) ; - + if ( aLinkValue.type()->kind() == CORBA::tk_double ) - aLink.aLinkValue = aLinkValue ; + aLink.aLinkValue = *aLinkDoubleValue ; aListOfDataFlows[ GraphsNumber ].Datas[ sizedata ] = aLink ; @@ -786,7 +786,8 @@ bool GraphBase::XmlHandler::endElement( const QString&, sscanf( fieldvalue[depth].c_str() , "%lf" , &d ) ; //aLink.aLinkValue <<= d; aLink.aLinkValue.replace(CORBA::TypeCode::PR_double_tc(), (void*)(&d)); - aLinkValue = aLink.aLinkValue; + aLinkValue.replace(CORBA::TypeCode::PR_double_tc(), (void*)(&d)); + aLinkDoubleValue = new CORBA::Any( aLinkValue ); #if TRACE MESSAGE( d << " (double)" ); #endif diff --git a/src/GraphBase/DataFlowBase_XmlHandler.hxx b/src/GraphBase/DataFlowBase_XmlHandler.hxx index b4f3d9e..a5c628b 100755 --- a/src/GraphBase/DataFlowBase_XmlHandler.hxx +++ b/src/GraphBase/DataFlowBase_XmlHandler.hxx @@ -62,6 +62,7 @@ namespace GraphBase { GraphBase::SLink aLink ; // SALOME_SuperVisionBase::ServicesParameterValue aLinkValue ; CORBA::Any aLinkValue ; + CORBA::Any const *aLinkDoubleValue ; int X ; int Y ; int VXSize ; -- 2.39.2