With a horizontal rule, it's possible that there is no \par following it
in a header, so RemoveLastParagraph() will delete the paragraph where
the shape is anchored (and so the shape as well).  Avoid that by adding
an extra \par if there is no \par following a shape.

Change-Id: I4840417880c98203866c9dcde51627516618f2d0