cherry picked from 0679158ebb6c84863e6e0e2fe877ea06eba4a2d4
cherry picked from 0679158ebb6c84863e6e0e2fe877ea06eba4a2d4

Move XServiceInfo.hpp from DEBUG to main.

Now that XServiceInfo is always used, it would be nice to always include
if defination. This fixes a compile error on mac.

PS: Also some trailing white space. The changed code all appears at the
top of the patch.

Signed-off-by: Noel Power <5d8953a81ee7faf03fd3845d9c88b1bd8aadcf4c@novell.com>

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core