...the single remaining user can use officecfg/Setup.hxx instead.

Change-Id: Icc1b56d820a9fcd7ecc52e279bcdde3aac4499d4