Preparation for fix for bug 46009. (Bug visible on ooxml branch, but this change will expose the problem)