[PUSHED][REVIEW:3-5] fdo#47036 two RTF import fixes

[Caolán McNamara]

On Thu, 2012-04-05 at 09:39 +0200, Miklos Vajna wrote:
> The last two won't apply as-is to -3-5, so I'm attaching the backport of
> all three. Testcase in sw/qa/extras/rtftok/data/fdo47036.rtf on master.

Nothing jumps out as wrong, so pushed now to 3-5

C.