>But weren't there supposed to be many changes all over the LibreOffice
>source to clean up, remove dead code, translate German comments, etc...?
>These would have to be somehow patched or redone for the Apache OpenOffice
>versions of the source files, and this is something that needs programming
>skills, not just legal.
Actually, it may be as simple as "git rebase aoo-3.4" (if you first make sure aoo-3.4 is a git branch that derives from the last common commit).
Of course, there will probably be a few conflicts where both forks have modified the same section of a file, but those should be solvable with only a few days of coding work.
The problem is more what to do about the features removed from AOO with no direct replacement. I would say re-add them as LGPL only for now, and reimplement them later (or rather, steal the AOO reimplementation when they get around to it).
In that scenario LO development will not be set back at all, and less than a man-month of new development will be "wasted", but it may still take a while before a MPL-licensed LO becomes a reality.