ODT-Export: Bugfixes / Refactoring