svn commit: r1305252 - in /incubator/ooo/trunk/main: io/source/acceptor/acceptor.xml io/source/connector/connectr.xml io/source/stm/stm.xml xml2cmp/source/xcd/parse.cxx

[orw]

Author: orw
Date: Mon Mar 26 07:47:18 2012
New Revision: 1305252

URL: http://svn.apache.org/viewvc?rev=1305252&view=rev
Log:
fix build breaker - adjust XML snippet processed by xml2cmp tool and adjust 
xml2cmp tool to handle XML comments

Modified:
    incubator/ooo/trunk/main/io/source/acceptor/acceptor.xml
    incubator/ooo/trunk/main/io/source/connector/connectr.xml
    incubator/ooo/trunk/main/io/source/stm/stm.xml
    incubator/ooo/trunk/main/xml2cmp/source/xcd/parse.cxx

Modified: incubator/ooo/trunk/main/io/source/acceptor/acceptor.xml
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/io/source/acceptor/acceptor.xml?rev=1305252&r1=1305251&r2=1305252&view=diff
==============================================================================
--- incubator/ooo/trunk/main/io/source/acceptor/acceptor.xml (original)
+++ incubator/ooo/trunk/main/io/source/acceptor/acceptor.xml Mon Mar 26 
07:47:18 2012
@@ -1,4 +1,5 @@
 <?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>

Modified: incubator/ooo/trunk/main/io/source/connector/connectr.xml
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/io/source/connector/connectr.xml?rev=1305252&r1=1305251&r2=1305252&view=diff
==============================================================================
--- incubator/ooo/trunk/main/io/source/connector/connectr.xml (original)
+++ incubator/ooo/trunk/main/io/source/connector/connectr.xml Mon Mar 26 
07:47:18 2012
@@ -1,4 +1,5 @@
 <?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>

Modified: incubator/ooo/trunk/main/io/source/stm/stm.xml
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/io/source/stm/stm.xml?rev=1305252&r1=1305251&r2=1305252&view=diff
==============================================================================
--- incubator/ooo/trunk/main/io/source/stm/stm.xml (original)
+++ incubator/ooo/trunk/main/io/source/stm/stm.xml Mon Mar 26 07:47:18 2012
@@ -1,4 +1,5 @@
 <?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>
 

Modified: incubator/ooo/trunk/main/xml2cmp/source/xcd/parse.cxx
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xml2cmp/source/xcd/parse.cxx?rev=1305252&r1=1305251&r2=1305252&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xml2cmp/source/xcd/parse.cxx (original)
+++ incubator/ooo/trunk/main/xml2cmp/source/xcd/parse.cxx Mon Mar 26 07:47:18 
2012
@@ -92,6 +92,11 @@ X2CParser::Parse()
        Parse_XmlDeclaration();
        Parse_Doctype();
 
+    // skip XML comment
+    Goto('<');
+    if ( IsText("<!--") )
+        Goto_And_Pass('>');
+
        pDocumentData->Parse(*this);
 }