0024023: Revamp the OCCT Handle -- general

[occt.git] / src / XmlLDrivers / XmlLDrivers_DocumentRetrievalDriver.cxx

diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
old mode 100755 (executable)
new mode 100644 (file)
index eb48b03..5b427b8
--- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
@@ -1,22 +1,17 @@
 // Created on: 2001-07-09
 // Created by: Julia DOROVSKIKH
-// Copyright (c) 2001-2012 OPEN CASCADE SAS
+// Copyright (c) 2001-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
-
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #include <XmlLDrivers_DocumentRetrievalDriver.ixx>
 
@@ -51,8 +46,6 @@
 #define END_REF           "END_REF"
 #define REFERENCE_COUNTER "REFERENCE_COUNTER"
 
-static  Standard_Integer myDocumentVersion = 0;
-
 //#define TAKE_TIMES
 static void take_time (const Standard_Integer, const char *,
                        const Handle(CDM_MessageDriver)&)
@@ -180,7 +173,7 @@ TCollection_ExtendedString XmlLDrivers_DocumentRetrievalDriver::SchemaName() con
 //purpose  : pure virtual method definition
 //=======================================================================
 void XmlLDrivers_DocumentRetrievalDriver::Make (const Handle(PCDM_Document)&,
-                                               const Handle(CDM_Document&))
+                                               const Handle(CDM_Document)&)
 {
 }
 
@@ -195,10 +188,6 @@ void XmlLDrivers_DocumentRetrievalDriver::Read
 {
   myReaderStatus = PCDM_RS_DriverFailure;
   myFileName = theFileName;
-  const TCollection_AsciiString anOldNumLocale =
-    (Standard_CString) setlocale (LC_NUMERIC, NULL);
-  setlocale(LC_NUMERIC, "C");
-  
   Handle(CDM_MessageDriver) aMessageDriver = theApplication -> MessageDriver();
   ::take_time (~0, " +++++ Start RETRIEVE procedures ++++++", aMessageDriver);
 
@@ -216,8 +205,6 @@ void XmlLDrivers_DocumentRetrievalDriver::Read
   ::take_time (0, " +++++ Fin parsing XML :       ", aMessageDriver);
 
   ReadFromDomDocument (anElement, theNewDocument, theApplication);
-
-  setlocale(LC_NUMERIC, (char *) anOldNumLocale.ToCString()) ;
 }
 
 //=======================================================================
@@ -415,7 +402,7 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument
   try
   {
     OCC_CATCH_SIGNALS
-#if defined(DEB) && !defined(TAKE_TIMES)
+#ifdef OCCT_DEBUG
     TCollection_ExtendedString aMessage ("PasteDocument");
     aMsgDriver -> Write (aMessage.ToExtString());
 #endif
@@ -497,7 +484,7 @@ static void take_time (const Standard_Integer isReset, const char * aHeader,
   if (isReset) tmbuf0 = tmbuf;
   else {
     char take_tm_buf [64];
-    sprintf (take_tm_buf, "%9.2f s ++++",
+    Sprintf (take_tm_buf, "%9.2f s ++++",
              double(tmbuf.time - tmbuf0.time) +
              double(tmbuf.millitm - tmbuf0.millitm)/1000.);
     aMessage += take_tm_buf;
@@ -513,9 +500,6 @@ static void take_time (const Standard_Integer isReset, const char * aHeader,
 void XmlLDrivers_DocumentRetrievalDriver::PropagateDocumentVersion(
                                    const Standard_Integer theDocVersion )
 {
-#ifdef DEB
-//    cout << "DocCurVersion =" << theDocVersion <<endl;
-#endif
   XmlMDataStd::SetDocumentVersion(theDocVersion);
 }