This reverts commit 23151ab5.

Fixed root cause in previous commit.

It's even mentioned in Effective STL.

(Changing the corresponding build-order-only dependencies to proper ones should
be safe here, as all mentions of $^ are within $(filter) calls.)

37b5dce6 re-wrote a std::rotate call to cause
an "error: function requires a valid iterator range [__middle, __last)" abort
from debug-mode GCC libstdc++ during smoketest.  Lionel should check whether
this fix is actually good -- at least, it causes "make check" to succeed again.

OD's comment was right: forcing a restart of the layout may cause
loops... and we falled into that case. As this seems to be useless,
removed the whole thing.

This is an update to the previous commit ( for the same bug ) d3a26738b426846ee1a787e7c97280fc43002961

Also fixed order in the other makefile target to make it clear
that it differs in the SDK

Older ODT files containing <table:table table:is-sub-table="true">
confused the RTF exporter. Add a few sanity checks to make sure the
output is still valid.

Adjusts the width of the dialog to be wider, if required.

This partially reverts b3c3e116