This reverts the following commits:
  + f3e275a2
  + 29a45a09 (partly)

Conflicts:

	officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu