This is my first attempt at helping out in LibreOffice and I have tried to remove code that was commented out as per one of the "Easy hacks" suggestions. I haven't found the time to go through all the code yet but I have attached what I have done so far. If the code is usable it is fine to include it under the LGPLv3+ / MPL licenses. Also I noticed soltools/testhxx/testhxx.cxx doesn't seem to be used, so it might be OK to remove it. Regards Danny (kemra)