when figuring out the minimum size of a column to fit its contents, take...

when figuring out the minimum size of a column to fit its contents, take merged cells into account in a slightly better way, by subtracting the width of the additional columns from the size that is needed for the text in a cell.
BUG: 124079