Merge remote-tracking branch 'origin/5.4' 23/11123/1
Sylvestre Ledru [Thu, 28 Mar 2013 08:47:13 +0000 (09:47 +0100)]
Conflicts:
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c

Change-Id: I37f19135fb1a0a2c59498222b454124017308f00

16 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects/src/cpp/array.cpp
scilab/modules/external_objects/src/cpp/cast.cpp
scilab/modules/external_objects/src/cpp/doubleExclam_invoke.cpp
scilab/modules/external_objects/src/cpp/getEnvId.cpp
scilab/modules/external_objects/src/cpp/getEnvironmentName.cpp
scilab/modules/external_objects/src/cpp/getFields.cpp
scilab/modules/external_objects/src/cpp/getMethods.cpp
scilab/modules/external_objects/src/cpp/getNamedVariable.cpp
scilab/modules/external_objects/src/cpp/getRepresentation.cpp
scilab/modules/external_objects/src/cpp/getsetOptions.cpp
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c
scilab/modules/string/Makefile.in

Simple merge
@@@ -30,9 -29,8 +29,8 @@@ int ScilabGateway::cast(char * fname, c
      CheckInputArgument(pvApiCtx, 2, 2);
  
      ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
-     OptionsHelper & helper = env.getOptionsHelper();
      ScilabGatewayOptions & options = env.getGatewayOptions();
 -    OptionsHelper::setCopyOccured(false);
 +    OptionsHelper::setCopyOccurred(false);
      ScilabObjects::initialization(env, pvApiCtx);
      options.setIsNew(false);
  
@@@ -25,9 -25,8 +25,8 @@@ int ScilabGateway::getsetOptions(char 
      CheckOutputArgument(pvApiCtx, 1, 1);
  
      ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
-     OptionsHelper & helper = env.getOptionsHelper();
      ScilabGatewayOptions & options = env.getGatewayOptions();
 -    OptionsHelper::setCopyOccured(false);
 +    OptionsHelper::setCopyOccurred(false);
      ScilabObjects::initialization(env, pvApiCtx);
      options.setIsNew(false);
  
@@@ -253,9 -168,8 +252,8 @@@ int sci_xfpolys(char *fname, unsigned l
  
      setGraphicObjectProperty(pstCompoundUID, __GO_VISIBLE__, &iVisible, jni_bool, 1);
  
 -    LhsVar(1) = 0;
 -    PutLhsVar();
 +    AssignOutputVariable(pvApiCtx, 1) = 0;
 +    ReturnArguments(pvApiCtx);
      return 0;
  }
  
@@@ -44,8 -50,14 +50,15 @@@ int set_format_n_property(void* _pvCtx
          return SET_PROPERTY_ERROR;
      }
  
 -    format = getStringFromStack(stackPointer);
 +    format = (char*)_pvData;
 +
+     getGraphicObjectProperty(pobjUID, __GO_FORMATN__, jni_string, (void **)&oldFormat);
+     if (strcmp(format, oldFormat) == 0)
+     {
+         return SET_PROPERTY_SUCCEED;
+     }
      status = setGraphicObjectProperty(pobjUID, __GO_FORMATN__, format, jni_string, 1);
      if (status == TRUE)
      {
Simple merge