diff --git a/src/TDataStd/TDataStd_BooleanArray.cdl b/src/TDataStd/TDataStd_BooleanArray.cdl index fe9a08c61f..c520a7064a 100755 --- a/src/TDataStd/TDataStd_BooleanArray.cdl +++ b/src/TDataStd/TDataStd_BooleanArray.cdl @@ -58,6 +58,7 @@ is index :Integer from Standard; value : Boolean from Standard); ---Purpose: Sets the th element of the array to + -- OutOfRange exception is raised if doesn't respect Lower and Upper bounds of the internal array. Value (me; Index : Integer from Standard) diff --git a/src/TDataStd/TDataStd_BooleanArray.cxx b/src/TDataStd/TDataStd_BooleanArray.cxx index 8092c52a64..895355a723 100755 --- a/src/TDataStd/TDataStd_BooleanArray.cxx +++ b/src/TDataStd/TDataStd_BooleanArray.cxx @@ -110,13 +110,9 @@ Handle(TDataStd_BooleanArray) TDataStd_BooleanArray::Set(const TDF_Label& void TDataStd_BooleanArray::SetValue (const Standard_Integer index, const Standard_Boolean value) { -#ifdef DEB - if (myValues.IsNull()) - return; - if (index < myLower || index > myUpper) - return; -#endif + if (myValues.IsNull()) + return; Standard_Integer byte_index = (index - myLower) >> 3; Standard_Integer degree = index - (byte_index << 3) - myLower; Standard_Integer byte_value = DegreeOf2(degree); diff --git a/src/TDataStd/TDataStd_ByteArray.cdl b/src/TDataStd/TDataStd_ByteArray.cdl index 7d16c3e345..54af7f1759 100755 --- a/src/TDataStd/TDataStd_ByteArray.cdl +++ b/src/TDataStd/TDataStd_ByteArray.cdl @@ -62,6 +62,7 @@ is index :Integer from Standard; value : Byte from Standard); ---Purpose: Sets the th element of the array to + -- OutOfRange exception is raised if doesn't respect Lower and Upper bounds of the internal array. Value (me; Index : Integer from Standard) diff --git a/src/TDataStd/TDataStd_ByteArray.cxx b/src/TDataStd/TDataStd_ByteArray.cxx index 2a5e749388..2c946924c8 100755 --- a/src/TDataStd/TDataStd_ByteArray.cxx +++ b/src/TDataStd/TDataStd_ByteArray.cxx @@ -79,6 +79,8 @@ Handle(TDataStd_ByteArray) TDataStd_ByteArray::Set(const TDF_Label& label, void TDataStd_ByteArray::SetValue (const Standard_Integer index, const Standard_Byte value) { + if (myValue.IsNull()) + return; if (value == myValue->Value(index)) return; Backup(); diff --git a/src/TDataStd/TDataStd_ExtStringArray.cdl b/src/TDataStd/TDataStd_ExtStringArray.cdl index 693e4bb54c..63911509e7 100755 --- a/src/TDataStd/TDataStd_ExtStringArray.cdl +++ b/src/TDataStd/TDataStd_ExtStringArray.cdl @@ -60,6 +60,7 @@ is SetValue (me : mutable; Index : Integer from Standard; Value : ExtendedString from TCollection); ---Purpose: Sets the th element of the array to + -- OutOfRange exception is raised if doesn't respect Lower and Upper bounds of the internal array. Value (me; Index : Integer from Standard) ---Purpose: Returns the value of the th element of the array diff --git a/src/TDataStd/TDataStd_IntegerArray.cdl b/src/TDataStd/TDataStd_IntegerArray.cdl index 3df9d7da2d..0aa00baf38 100755 --- a/src/TDataStd/TDataStd_IntegerArray.cdl +++ b/src/TDataStd/TDataStd_IntegerArray.cdl @@ -60,6 +60,7 @@ is SetValue (me : mutable; Index, Value : Integer from Standard); ---Purpose: Sets the th element of the array to + -- OutOfRange exception is raised if doesn't respect Lower and Upper bounds of the internal array. Value (me; Index : Integer from Standard) ---Purpose: Return the value of the th element of the array diff --git a/src/TDataStd/TDataStd_IntegerArray.cxx b/src/TDataStd/TDataStd_IntegerArray.cxx index 1c11154225..3083ace65c 100755 --- a/src/TDataStd/TDataStd_IntegerArray.cxx +++ b/src/TDataStd/TDataStd_IntegerArray.cxx @@ -95,7 +95,7 @@ void TDataStd_IntegerArray::SetValue(const Standard_Integer index, const Standar { if(myValue.IsNull()) return; if( myValue->Value(index) == value) - return; + return; Backup(); myValue->SetValue(index, value); } diff --git a/src/TDataStd/TDataStd_RealArray.cdl b/src/TDataStd/TDataStd_RealArray.cdl index 1696e1a0c9..97171d44f1 100755 --- a/src/TDataStd/TDataStd_RealArray.cdl +++ b/src/TDataStd/TDataStd_RealArray.cdl @@ -59,6 +59,7 @@ is SetValue (me : mutable; Index :Integer from Standard; Value : Real from Standard); ---Purpose: Sets the th element of the array to + -- OutOfRange exception is raised if doesn't respect Lower and Upper bounds of the internal array. Value (me; Index : Integer from Standard) ---Purpose: Return the value of the th element of the array diff --git a/src/TDataStd/TDataStd_RealArray.cxx b/src/TDataStd/TDataStd_RealArray.cxx index 86d558a87e..02e60fea50 100755 --- a/src/TDataStd/TDataStd_RealArray.cxx +++ b/src/TDataStd/TDataStd_RealArray.cxx @@ -94,8 +94,7 @@ void TDataStd_RealArray::SetValue (const Standard_Integer index, // OCC2932 correction if(myValue.IsNull()) return; if(myValue->Value(index) == value) - return; - + return; Backup(); myValue->SetValue(index, value); } diff --git a/src/TDataStd/TDataStd_ReferenceArray.cdl b/src/TDataStd/TDataStd_ReferenceArray.cdl index 595bc98ab8..7b51855a19 100755 --- a/src/TDataStd/TDataStd_ReferenceArray.cdl +++ b/src/TDataStd/TDataStd_ReferenceArray.cdl @@ -59,6 +59,7 @@ is index :Integer from Standard; value : Label from TDF); ---Purpose: Sets the th element of the array to + -- OutOfRange exception is raised if doesn't respect Lower and Upper bounds of the internal array. Value (me; Index : Integer from Standard) diff --git a/src/TDataStd/TDataStd_ReferenceArray.cxx b/src/TDataStd/TDataStd_ReferenceArray.cxx index 2a3547d884..4b6e2eff07 100755 --- a/src/TDataStd/TDataStd_ReferenceArray.cxx +++ b/src/TDataStd/TDataStd_ReferenceArray.cxx @@ -80,9 +80,9 @@ Handle(TDataStd_ReferenceArray) TDataStd_ReferenceArray::Set(const TDF_Label& void TDataStd_ReferenceArray::SetValue (const Standard_Integer index, const TDF_Label& value) { + if(myArray.IsNull()) return; if (value == myArray->Value(index)) return; - Backup(); myArray->SetValue(index, value); @@ -144,7 +144,7 @@ const Handle(TDataStd_HLabelArray1)& TDataStd_ReferenceArray::InternalArray () c //purpose : //======================================================================= void TDataStd_ReferenceArray::SetInternalArray (const Handle(TDataStd_HLabelArray1)& values, - const Standard_Boolean /*isCheckItem*/) + const Standard_Boolean isCheckItem) { // myArray = values; Standard_Integer aLower = values->Lower();