Author: leidb
Date: Mon Jun 25 06:01:09 2012
New Revision: 1353389
URL: http://svn.apache.org/viewvc?rev=1353389&view=rev
Log:
#118057# - fix the word 2003 XML (wordml) filters broken
Found by: mst.ooo dot arcor.de
Patch by: mst.ooo dot arcor.de
Review by: yuanlin <yuanlin.ibm at gmail dot com> and Lei De Bin
Modified:
incubator/ooo/trunk/main/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
incubator/ooo/trunk/main/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
Modified:
incubator/ooo/trunk/main/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl?rev=1353389&r1=1353388&r2=1353389&view=diff
==============================================================================
---
incubator/ooo/trunk/main/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
(original)
+++
incubator/ooo/trunk/main/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
Mon Jun 25 06:01:09 2012
@@ -21,7 +21,7 @@
***********************************************************-->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml";
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint";
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:aml="http://schemas.microsoft.com/aml/2001/core";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:w10="urn:schemas-microsoft-com:office:word"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns
:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xalan="http://xml.apache.org/xalan"; xmlns:oleextracter="MyOleExtracter"
xmlns:ole="java:XSLTFilterOLEExtracter"
xmlns:java="http://saxon.sf.net/java-type"; exclude-result-prefixes="office
table style text draw svg dc config xlink meta oooc dom ooo chart math dr3d
form script ooow draw xalan ole oleextracter ja
va" extension-element-prefixes="oleextracter">
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml";
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint";
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:aml="http://schemas.microsoft.com/aml/2001/core";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:w10="urn:schemas-microsoft-com:office:word"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns
:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xalan="http://xml.apache.org/xalan"; xmlns:oleextracter="MyOleExtracter"
xmlns:ole="java:com.sun.star.comp.xsltfilter.XSLTFilterOLEExtracter"
xmlns:java="http://saxon.sf.net/java-type"; exclude-result-prefixes="office
table style text draw svg dc config xlink meta oooc dom ooo chart math dr3d
form script ooow d
raw xalan ole oleextracter java" extension-element-prefixes="oleextracter">
<xsl:include href="ooo2wordml_custom_draw.xsl"/>
<xsl:param name="oleExtractor"
as="java:com.sun.star.comp.xsltfilter.XSLTFilterOLEExtracter"
select="ole:new()"/>
<xsl:param name="XMultiServiceFactory"
as="java:com.sun.star.lang.XMultiServiceFactory"
select="ole:init($oleExtractor,
'uno:socket,host=localhost,port=8100;urp;StarOffice.ServiceManager')"/>
Modified:
incubator/ooo/trunk/main/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl?rev=1353389&r1=1353388&r2=1353389&view=diff
==============================================================================
---
incubator/ooo/trunk/main/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
(original)
+++
incubator/ooo/trunk/main/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
Mon Jun 25 06:01:09 2012
@@ -21,7 +21,7 @@
***********************************************************-->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml";
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint";
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:aml="http://schemas.microsoft.com/aml/2001/core";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:dat
astyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xalan="http://xml.apache.org/xalan"; xmlns:oleextracter="MyOleExtracter"
xmlns:ole="java:XSLTFilterOLEExtracter"
xmlns:java="http://saxon.sf.net/java-type"; exclude-result-prefixes="w wx aml o
dt v xalan ole oleextracter java" extension-element-prefixes="oleextracter">
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml";
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint";
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:aml="http://schemas.microsoft.com/aml/2001/core";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:dat
astyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xalan="http://xml.apache.org/xalan"; xmlns:oleextracter="MyOleExtracter"
xmlns:ole="java:com.sun.star.comp.xsltfilter.XSLTFilterOLEExtracter"
xmlns:java="http://saxon.sf.net/java-type"; exclude-result-prefixes="w wx aml o
dt v xalan ole oleextracter java" extension-element-prefixes="oleextracter">
<xsl:include href="wordml2ooo_custom_draw.xsl"/>
<xsl:include href="wordml2ooo_path.xsl"/>
<xsl:param name="oleExtractor"
as="java:com.sun.star.comp.xsltfilter.XSLTFilterOLEExtracter"
select="ole:new()"/>
