comphelper/source/container/IndexedPropertyValuesContainer.cxx | 4 +- sw/qa/complex/writer/CheckIndexedPropertyValues.java | 18 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-)
New commits: commit 46e12364dcf638e97831dc3d7507bb6b93377757 Author: Matthew J. Francis <[email protected]> Date: Thu Jun 4 15:56:58 2015 +0800 Fix insertion and deletion in IndexedPropertyValuesContainer The cases for iterating to an element from the end (used for elements in the second half of the underlying array) had an off by one error causing the wrong elements to be inserted/removed Change-Id: Idcbf158cc31afaf02fce3f1975509edf6239d3ae Reviewed-on: https://gerrit.libreoffice.org/16073 Tested-by: Jenkins <[email protected]> Reviewed-by: Norbert Thiebaud <[email protected]> diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index cd329af..b8b91f3 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -116,7 +116,7 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c else { aItr = maProperties.end(); - sal_Int32 i(nSize - 1); + sal_Int32 i(nSize); while(i > nIndex) { --i; @@ -151,7 +151,7 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) else { aItr = maProperties.end(); - sal_Int32 i(nSize - 1); + sal_Int32 i(nSize); while(i > nIndex) { --i; diff --git a/sw/qa/complex/writer/CheckIndexedPropertyValues.java b/sw/qa/complex/writer/CheckIndexedPropertyValues.java index c526176..338f706 100644 --- a/sw/qa/complex/writer/CheckIndexedPropertyValues.java +++ b/sw/qa/complex/writer/CheckIndexedPropertyValues.java @@ -53,6 +53,11 @@ public class CheckIndexedPropertyValues { prop2[0].Name = "Horst"; prop2[0].Value = "BadGuy"; + PropertyValue[] prop3 = new PropertyValue[1]; + prop3[0] = new PropertyValue(); + prop3[0].Name = "Peter"; + prop3[0].Value = "FamilyGuy"; + Type t = xCont.getElementType(); assertEquals("Initial container is not empty", 0, xCont.getCount()); xCont.insertByIndex(0, prop1); @@ -70,6 +75,17 @@ public class CheckIndexedPropertyValues { xCont.insertByIndex(1, prop2); assertTrue("Did not insert PropertyValue.", xCont.hasElements() && xCont.getCount()==2); + try { + xCont.removeByIndex(1); + } + catch (com.sun.star.lang.IndexOutOfBoundsException e) { + fail("Could not remove last PropertyValue"); + } + xCont.insertByIndex(1, prop2); + xCont.insertByIndex(1, prop3); + ret = (PropertyValue[])xCont.getByIndex(1); + assertEquals(prop3[0].Name, ret[0].Name); + assertEquals(prop3[0].Value, ret[0].Value); try { xCont.insertByIndex(25, prop2); @@ -86,7 +102,7 @@ public class CheckIndexedPropertyValues { } try { - xCont.insertByIndex(2, "Example String"); + xCont.insertByIndex(3, "Example String"); fail("IllegalArgumentException was not thrown."); } catch(com.sun.star.lang.IllegalArgumentException e) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
