Merge 'master' branch into 'V9_dev' branch.

diff --cc doc/salome/examples/free_boundaries.py
index 3a263c816d637d3f96f4ef1821a43a2f78ca2160,361739a91ab126274def583f7cb9f10ac250449c..1ae412a8e23dbd747e0a045b7e0641046bc87ea9
--- 1/doc/salome/examples/free_boundaries.py
--- 2/doc/salome/examples/free_boundaries.py
+++ b/doc/salome/examples/free_boundaries.py
@@@ -19,8 -19,8 +19,8 @@@ for fi in range(len(faces))
      fid = geompy.addToStudyInFather(cut, faces[fi], "Face %d" % (fi+1))
      isSuccess, closedWires, openWires = geompy.GetFreeBoundary(faces[fi])
      if isSuccess:
-         print("Check free boudaries in face %d: OK" % (fi+1))
 -        print "Check free boundaries in face %d: OK" % (fi+1)
 -        print "-- Nb of closed boundaries = %d" % len(closedWires)
++        print("Check free boundaries in face %d: OK" % (fi+1))
 +        print("-- Nb of closed boundaries = %d" % len(closedWires))
          for wi in range(len(closedWires)):
              wid = geompy.addToStudyInFather(faces[fi], closedWires[wi], "Closed wire %d" % (wi+1))
              pass
@@@ -30,6 -30,6 +30,6 @@@
              pass
          pass
      else:
-         print("Check free boudaries in face %d: KO" % (fi+1))
 -        print "Check free boundaries in face %d: KO" % (fi+1)
++        print("Check free boundaries in face %d: KO" % (fi+1))
          pass
      pass

diff --cc idl/GEOM_Gen.idl
Simple merge

diff --cc src/AdvancedEngine/AdvancedEngine_IOperations.cxx
Simple merge

diff --cc src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx
Simple merge

diff --cc src/BasicGUI/BasicGUI_PointDlg.cxx
Simple merge

diff --cc src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
Simple merge

diff --cc src/EntityGUI/EntityGUI_FieldDlg.cxx
Simple merge

diff --cc src/EntityGUI/EntityGUI_SketcherDlg.cxx
Simple merge

diff --cc src/GEOMBase/GEOMBase_Helper.cxx
Simple merge

diff --cc src/GEOMBase/GEOMBase_Helper.h
Simple merge

diff --cc src/GEOMGUI/GEOMGUI_DimensionProperty.h
Simple merge

diff --cc src/GEOMGUI/GEOM_Displayer.cxx
Simple merge

diff --cc src/GEOMGUI/GEOM_Displayer.h
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
Simple merge

diff --cc src/GEOMToolsGUI/GEOMToolsGUI.cxx
index 96d86599bbd4529854d15515656708e03dabe3d2,d79a68e10f9eaa4a42fbcd7a6a818f2ebb9e0957..1f5bc409dae02e4379c860e8a8196d2ced5d6a15
--- 1/src/GEOMToolsGUI/GEOMToolsGUI.cxx
--- 2/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@@ -77,12 -77,11 +77,12 @@@ static QString getParentComponent( _PTR
  
  //=====================================================================================
  // function : inUse
- // purpose  : check if the object(s) passed as the the second arguments are used
+ // purpose  : check if the object(s) passed as the second arguments are used
  //            by the other objects in the study
  //=====================================================================================
 -static bool inUse( _PTR(Study) study, const QString& component, const QMap<QString,QString>& objects )
 +static bool inUse( const QString& component, const QMap<QString,QString>& objects )
  {
 +  _PTR(Study) study = SalomeApp_Application::getStudy();
    _PTR(SObject) comp = study->FindObjectID( component.toLatin1().data() );
    if ( !comp )
      return false;

diff --cc src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
Simple merge

diff --cc src/GEOM_I/GEOM_Gen_i.cc
index 756ebd362ac3ca128baadda2f85c918025a67f19,fc6cee5c4398886e6ed1dd76b387a26ce36ca0ee..b94e8619eac09ed5b19af20c1e51b9dc1cc132b4
--- 1/src/GEOM_I/GEOM_Gen_i.cc
--- 2/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@@ -913,9 -917,9 +913,9 @@@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubS
  
    // find SObject in the study if it is already published
    CORBA::String_var anIORo = _orb->object_to_string(theObject);
 -  SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in());
 +  SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(anIORo.in());
    //PTv, IMP 0020001, The salome object <aSO>
-   // is not obligatory in case of invokation from script
+   // is not obligatory in case of invocation from script
    // if (CORBA::is_nil(aSO))
    //  return aParts._retn();
  
@@@ -942,9 -947,9 +942,9 @@@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGive
  
    // find SObject in the study if it is already published
    CORBA::String_var anIORo = _orb->object_to_string(theObject);
 -  SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in());
 +  SALOMEDS::SObject_var aSO = getStudyServant()->FindObjectIOR(anIORo.in());
    //PTv, IMP 0020001, The salome object <aSO>
-   // is not obligatory in case of invokation from script
+   // is not obligatory in case of invocation from script
    // if (CORBA::is_nil(aSO))
    //  return aParts._retn();
  
@@@ -1025,10 -1032,9 +1025,10 @@@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubS
                                               CORBA::Boolean          theAddPrefix)
  {
    GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
 +  SALOMEDS::Study_var aStudy = getStudyServant();
    //PTv, IMP 0020001, The salome object <theSObject>
-   //     is not obligatory in case of invokation from script
+   //     is not obligatory in case of invocation from script
 -  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
 +  if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
      return aParts._retn();
  
    // For Dump Python (mantis issue 0020768)
@@@ -1618,10 -1624,9 +1618,10 @@@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGive
                                                    CORBA::Boolean          theAddPrefix)
  {
    GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
 +  SALOMEDS::Study_var aStudy = getStudyServant();
    //PTv, IMP 0020001, The salome object <theSObject>
-   //     is not obligatory in case of invokation from script
+   //     is not obligatory in case of invocation from script
 -  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
 +  if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
      return aParts._retn();
  
    // If theArgs list is empty, nothing to do

diff --cc src/GEOM_SWIG/GEOM_TestHealing.py
Simple merge

diff --cc src/GEOM_SWIG/GEOM_blocks.py
Simple merge

diff --cc src/GEOM_SWIG/geomBuilder.py
Simple merge

diff --cc src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx
Simple merge

diff --cc src/GroupGUI/GroupGUI_BooleanDlg.cxx
Simple merge

diff --cc src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
Simple merge

diff --cc src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
Simple merge

diff --cc src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
Simple merge

diff --cc src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx
index d8f8dfaefdd0bb35117c96e934f4477c53aecfe1,7cf7b9792d8b06df89356321035e924c281bd61c..347f2b8664df4080e773659fdf9f2be3e4d7ee88
--- 1/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx
--- 2/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.cxx
@@@ -205,13 -206,13 +205,13 @@@ MeasureGUI_ShapeStatisticsDlg::~Measure
  //=================================================================================
  GEOM::GEOM_IOperations_ptr MeasureGUI_ShapeStatisticsDlg::createOperation()
  {
 -  return getGeomEngine()->GetIGroupOperations(getStudyId());
 +  return getGeomEngine()->GetIGroupOperations();
  }
  
- #define RETURN_WITH_MSG(a, b) \
-   if (!(a)) { \
-     theMessage += (b); \
-     return false; \
+ #define RETURN_WITH_MSG(a, b)                   \
+   if (!(a)) {                                   \
+     theMessage += (b);                          \
+     return false;                               \
    }
  
  //================================================================
@@@ -471,8 -472,9 +471,8 @@@ bool MeasureGUI_ShapeStatisticsDlg::exe
    int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
    QString aTypePrefix = myCBTypes->currentText().replace(' ', '_');
    QString objIOR, aMin, aMax, aGroupName;
 -  //SalomeApp_Study* study = getStudy();
  
-   GEOMUtils::Distribution aShapesDistr = 
+   GEOMUtils::Distribution aShapesDistr =
      GEOMUtils::ComputeDistribution( myShapes, currentType(), myNbIntervals->value(), aRange );
  
    int nbGroups = 0;

diff --cc src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
Simple merge

diff --cc src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
Simple merge

diff --cc src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
Simple merge