#i124657# #i124617# restore lost comment markers

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1586583 13f79535-47bb-0310-9956-ffa450edef68
i124661 secure possible out of bound access to stl vector content

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1586681 13f79535-47bb-0310-9956-ffa450edef68