Merge remote-tracking branch 'origin/master' into V9_dev

[modules/hexablock.git] / src / HEXABLOCK / HexDocument_Xml.cxx

diff --git a/src/HEXABLOCK/HexDocument_Xml.cxx b/src/HEXABLOCK/HexDocument_Xml.cxx
index 82e3dc7270afc7e2408ecb95fb63997ba24e8a56..92039da360c54b279cb457a8fc3aa1d34a38c52a 100755 (executable)
--- a/src/HEXABLOCK/HexDocument_Xml.cxx
+++ b/src/HEXABLOCK/HexDocument_Xml.cxx
@@ -1,12 +1,12 @@
 
 // C++ : Classe Document : methodes internes
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2016  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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "HexDocument.hxx"
-#include <libgen.h>               // Pour basename
+// #include <Basics_DirUtils.hxx>   
 #include <cstdlib>               // Pour atoi et atof
 
 #include "Hex.hxx"
@@ -121,7 +121,8 @@ int Document::loadXml (cpchar ficname)
 {
    XmlTree xml("");
    string filename = ficname;
-   el_name         = basename ((pchar)ficname);
+   //el_name         = Kernel_Utils::GetBaseName ((pchar)ficname);
+   make_basename (ficname, el_name);
 
    static const int NbExt = 3;
    static cpchar t_ext [NbExt] = { ".xml", ".XML", ".Xml" };