undo "fix" of yesterday

JorisGoosen · JorisGoosen · commit e975c43c274a · 2024-10-24T11:46:36.000+02:00
diff --git a/CommonData/column.cpp b/CommonData/column.cpp
@@ -804,13 +804,13 @@ strintmap Column::labelsResetValues(int & maxValue)
 	return result;
 }
 
-void Column::labelsRemoveBeyond(size_t indexToStartRemoving)
+void Column::labelsRemoveBeyond(size_t desiredLabelsSize)
 {
-	for(size_t i=indexToStartRemoving; i<_labels.size(); i++)
+	for(size_t i=desiredLabelsSize; i<_labels.size(); i++)
 		delete _labels[i];
 	
-	_labels.resize(indexToStartRemoving > 0 ? indexToStartRemoving-1 : 0);
-	
+	_labels.resize(desiredLabelsSize);
+
 	_resetLabelValueMap();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -804,13 +804,13 @@ strintmap Column::labelsResetValues(int & maxValue)`
`804`	`804`	`return result;`
`805`	`805`	`}`
`806`	`806`
`807`		`-void Column::labelsRemoveBeyond(size_t indexToStartRemoving)`
	`807`	`+void Column::labelsRemoveBeyond(size_t desiredLabelsSize)`
`808`	`808`	`{`
`809`		`- for(size_t i=indexToStartRemoving; i<_labels.size(); i++)`
	`809`	`+ for(size_t i=desiredLabelsSize; i<_labels.size(); i++)`
`810`	`810`	`delete _labels[i];`
`811`	`811`
`812`		`- _labels.resize(indexToStartRemoving > 0 ? indexToStartRemoving-1 : 0);`
`813`		`-`
	`812`	`+ _labels.resize(desiredLabelsSize);`
	`813`	`+`
`814`	`814`	`_resetLabelValueMap();`
`815`	`815`	`}`
`816`	`816`