fix build breaker - adjust XML snippet processed by xml2cmp tool and adjust…

fix build breaker - adjust XML snippet processed by xml2cmp tool and adjust xml2cmp tool to handle XML comments

io/source/acceptor/acceptor.xml

 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +20,6 @@
  * under the License.
  *
  ***********************************************************-->
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
-
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
     <module-name>   acceptor.uno    </module-name>
     <component-description>

io/source/connector/connectr.xml

 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +20,6 @@
  * under the License.
  *
  ***********************************************************-->
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
-
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
     <module-name>   connector.uno   </module-name>
     <component-description>

io/source/stm/stm.xml

 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <!--***********************************************************
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +20,6 @@
  * under the License.
  *
  ***********************************************************-->
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
-
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
     <module-name> streams.uno </module-name>
 

xml2cmp/source/xcd/parse.cxx

@@ -92,6 +92,11 @@ X2CParser::Parse()
     Parse_XmlDeclaration();
     Parse_Doctype();
 
+    // skip XML comment
+    Goto('<');
+    if ( IsText("<!--") )
+        Goto_And_Pass('>');
+
     pDocumentData->Parse(*this);
 }