(cherry picked from commit aa46680d)

Conflicts:
	sw/source/core/undo/undobj.cxx

Change-Id: I4689d5fe02ab2c814e15a1c11ebd3ad11d6e56c8