From c3da64a686817545c4a7e5c30717b29d555266fa Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Tue, 27 Oct 2020 11:41:12 +0300
Subject: [PATCH] 0031884: Data Exchange - NULL de-reference within
 STEPCAFControl_Reader::SetSourceCodePage()

Removed methods with unclear usage rules.
---
 src/STEPCAFControl/STEPCAFControl_Reader.cxx | 22 +-------------------
 src/STEPCAFControl/STEPCAFControl_Reader.hxx |  7 -------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 029d9f4d0d..2772edc2d6 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -384,7 +384,7 @@ TCollection_ExtendedString STEPCAFControl_Reader::convertName (const TCollection
   // If source code page is not a NoConversion
   // the string is treated as having UTF-8 coding,
   // else each character is copied to ExtCharacter.
-  return TCollection_ExtendedString (theName, SourceCodePage() != Resource_FormatType_NoConversion);
+  return TCollection_ExtendedString (theName, myReader.StepModel()->SourceCodePage() != Resource_FormatType_NoConversion);
 }
 
 //=======================================================================
@@ -4783,26 +4783,6 @@ Standard_Boolean STEPCAFControl_Reader::GetNameMode() const
   return myNameMode;
 }
 
-//=======================================================================
-//function : SourceCodePage
-//purpose  : 
-//=======================================================================
-
-Resource_FormatType STEPCAFControl_Reader::SourceCodePage() const
-{
-  return myReader.StepModel()->SourceCodePage();
-}
-
-//=======================================================================
-//function : SetSourceCodePage
-//purpose  : 
-//=======================================================================
-
-void STEPCAFControl_Reader::SetSourceCodePage(Resource_FormatType theCode)
-{
-  myReader.StepModel()->SetSourceCodePage(theCode);
-}
-
 //=======================================================================
 //function : SetLayerMode
 //purpose  : 
diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.hxx b/src/STEPCAFControl/STEPCAFControl_Reader.hxx
index 8bddd9602e..2aa4d23f38 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.hxx
@@ -141,13 +141,6 @@ public:
   
   Standard_EXPORT Standard_Boolean GetNameMode() const;
 
-  //! Return the encoding of STEP file for converting names into UNICODE.
-  //! Initialized from "read.step.codepage" variable by constructor, which is Resource_UTF8 by default.
-  Standard_EXPORT Resource_FormatType SourceCodePage() const;
-
-  //! Return the encoding of STEP file for converting names into UNICODE.
-  Standard_EXPORT void SetSourceCodePage (Resource_FormatType theCode);
-
   //! Set LayerMode for indicate read Layers or not.
   Standard_EXPORT void SetLayerMode (const Standard_Boolean layermode);