Merge from V6_main_20120808 08Aug12

[modules/yacs.git] / src / runtime / XMLCppConv.cxx

diff --git a/src/runtime/XMLCppConv.cxx b/src/runtime/XMLCppConv.cxx
index f9994d33ef4f97ca170c1ff59ce337f373ced815..b8cd7dbcd0fac5312fcff6150289035e8c4f7945 100644 (file)
--- a/src/runtime/XMLCppConv.cxx
+++ b/src/runtime/XMLCppConv.cxx
@@ -1,21 +1,22 @@
-//  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "TypeConversions.hxx"
 #include "XMLCppConv.hxx"
 
@@ -62,33 +63,33 @@ namespace YACS
       xmlNodePtr cur;
       Any *ob=NULL;
       {
-       doc = xmlParseMemory(data, strlen(data));
-       if (doc == NULL )
-         {
-           stringstream msg;
-           msg << "Problem in conversion: XML Document not parsed successfully ";
-           msg << " (" << __FILE__ << ":" << __LINE__ << ")";
-           throw ConversionException(msg.str());
-         }
-       cur = xmlDocGetRootElement(doc);
-       if (cur == NULL)
-         {
-           xmlFreeDoc(doc);
-           stringstream msg;
-           msg << "Problem in conversion: empty XML Document";
-           msg << " (" << __FILE__ << ":" << __LINE__ << ")";
-           throw ConversionException(msg.str());
-         }
-       while (cur != NULL)
-         {
-           if ((!xmlStrcmp(cur->name, (const xmlChar *)"value")))
-             {
-               ob=convertXmlCpp(edGetType(),doc,cur);
-               break;
-             }
-           cur = cur->next;
-         }
-       xmlFreeDoc(doc);
+        doc = xmlParseMemory(data, strlen(data));
+        if (doc == NULL )
+          {
+            stringstream msg;
+            msg << "Problem in conversion: XML Document not parsed successfully ";
+            msg << " (" << __FILE__ << ":" << __LINE__ << ")";
+            throw ConversionException(msg.str());
+          }
+        cur = xmlDocGetRootElement(doc);
+        if (cur == NULL)
+          {
+            xmlFreeDoc(doc);
+            stringstream msg;
+            msg << "Problem in conversion: empty XML Document";
+            msg << " (" << __FILE__ << ":" << __LINE__ << ")";
+            throw ConversionException(msg.str());
+          }
+        while (cur != NULL)
+          {
+            if ((!xmlStrcmp(cur->name, (const xmlChar *)"value")))
+              {
+                ob=convertXmlCpp(edGetType(),doc,cur);
+                break;
+              }
+            cur = cur->next;
+          }
+        xmlFreeDoc(doc);
         if(ob==NULL)
           {
             stringstream msg;