[ooo-build-commit] .: Branch 'refs/tags/linux-build-fridrich-20100930' - 3 commits - filter/source writerfilter/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Oct 1 00:38:52 PDT 2010
Rebased ref, commits from common ancestor:
commit fc21466b8460b00ef939362cebbdd540ce486c08
Author: Rene Engelhard <rene at debian.org>
Date: Thu Sep 30 23:57:05 2010 +0200
oops, move files actually into filters/...
diff --git a/filter/source/config/fragments/filters/ODG_FlatXML.xcu b/filter/source/config/fragments/filters/ODG_FlatXML.xcu
new file mode 100644
index 0000000..2a5a4a0
--- /dev/null
+++ b/filter/source/config/fragments/filters/ODG_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Drawing Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>draw_ODG_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Drawing (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/filter/source/config/fragments/filters/ODP_FlatXML.xcu b/filter/source/config/fragments/filters/ODP_FlatXML.xcu
new file mode 100644
index 0000000..175936c
--- /dev/null
+++ b/filter/source/config/fragments/filters/ODP_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Presentation Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>impress_ODP_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Presentation (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/filter/source/config/fragments/filters/ODS_FlatXML.xcu b/filter/source/config/fragments/filters/ODS_FlatXML.xcu
new file mode 100644
index 0000000..a780901
--- /dev/null
+++ b/filter/source/config/fragments/filters/ODS_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Spreadsheet Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>calc_ODS_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Spreadsheet (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/filter/source/config/fragments/filters/ODT_FlatXML.xcu b/filter/source/config/fragments/filters/ODT_FlatXML.xcu
new file mode 100644
index 0000000..b931543
--- /dev/null
+++ b/filter/source/config/fragments/filters/ODT_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Text Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>writer_ODT_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Text (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu b/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu
new file mode 100644
index 0000000..51e43cb
--- /dev/null
+++ b/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="calc_ODS_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fods ods xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Spreadsheet Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Spreadsheet (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.spreadsheet"</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu b/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu
new file mode 100644
index 0000000..2fa92bf
--- /dev/null
+++ b/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="draw_ODG_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fodg odg xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Drawing Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Drawing (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.graphics"</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu b/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu
new file mode 100644
index 0000000..1b43a63
--- /dev/null
+++ b/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="impress_ODP_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fodp odp xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Presentation Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Presentation (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.presentation"</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu b/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu
new file mode 100644
index 0000000..7c6f324
--- /dev/null
+++ b/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="writer_ODT_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fodt odt xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Text Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Text (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.text"</value>
+ </prop>
+ </node>
diff --git a/filter/source/odfflatxml/odfflatxmlexport.xsl b/filter/source/odfflatxml/odfflatxmlexport.xsl
new file mode 100644
index 0000000..e08afd7
--- /dev/null
+++ b/filter/source/odfflatxml/odfflatxmlexport.xsl
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
+ <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="@office:mimetype[string(.)='application/vnd.oasis.opendocument.drawing']">
+ <xsl:attribute name="office:mimetype">application/vnd.oasis.opendocument.graphics</xsl:attribute>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/filter/source/odfflatxml/odfflatxmlimport.xsl b/filter/source/odfflatxml/odfflatxmlimport.xsl
new file mode 100644
index 0000000..802ff53
--- /dev/null
+++ b/filter/source/odfflatxml/odfflatxmlimport.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/source/config/fragments/filters/ODG_FlatXML.xcu b/source/config/fragments/filters/ODG_FlatXML.xcu
deleted file mode 100644
index 2a5a4a0..0000000
--- a/source/config/fragments/filters/ODG_FlatXML.xcu
+++ /dev/null
@@ -1,13 +0,0 @@
- <node oor:name="OpenDocument Drawing Flat XML" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>draw_ODG_FlatXML</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>OpenDocument Drawing (Flat XML)</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/source/config/fragments/filters/ODP_FlatXML.xcu b/source/config/fragments/filters/ODP_FlatXML.xcu
deleted file mode 100644
index 175936c..0000000
--- a/source/config/fragments/filters/ODP_FlatXML.xcu
+++ /dev/null
@@ -1,13 +0,0 @@
- <node oor:name="OpenDocument Presentation Flat XML" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>impress_ODP_FlatXML</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>OpenDocument Presentation (Flat XML)</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/source/config/fragments/filters/ODS_FlatXML.xcu b/source/config/fragments/filters/ODS_FlatXML.xcu
deleted file mode 100644
index a780901..0000000
--- a/source/config/fragments/filters/ODS_FlatXML.xcu
+++ /dev/null
@@ -1,13 +0,0 @@
- <node oor:name="OpenDocument Spreadsheet Flat XML" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>calc_ODS_FlatXML</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>OpenDocument Spreadsheet (Flat XML)</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/source/config/fragments/filters/ODT_FlatXML.xcu b/source/config/fragments/filters/ODT_FlatXML.xcu
deleted file mode 100644
index b931543..0000000
--- a/source/config/fragments/filters/ODT_FlatXML.xcu
+++ /dev/null
@@ -1,13 +0,0 @@
- <node oor:name="OpenDocument Text Flat XML" oor:op="replace">
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_ODT_FlatXML</value></prop>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="UIName">
- <value>OpenDocument Text (Flat XML)</value>
- </prop>
- <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
- </node>
diff --git a/source/config/fragments/types/calc_ODS_FlatXML.xcu b/source/config/fragments/types/calc_ODS_FlatXML.xcu
deleted file mode 100644
index 51e43cb..0000000
--- a/source/config/fragments/types/calc_ODS_FlatXML.xcu
+++ /dev/null
@@ -1,14 +0,0 @@
- <node oor:name="calc_ODS_FlatXML" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>fods ods xml</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>OpenDocument Spreadsheet Flat XML</value></prop>
- <prop oor:name="UIName">
- <value>OpenDocument Spreadsheet (Flat XML)</value>
- </prop>
- <prop oor:name="ClipboardFormat">
- <value>doctype:office:mimetype="application/vnd.oasis.opendocument.spreadsheet"</value>
- </prop>
- </node>
diff --git a/source/config/fragments/types/draw_ODG_FlatXML.xcu b/source/config/fragments/types/draw_ODG_FlatXML.xcu
deleted file mode 100644
index 2fa92bf..0000000
--- a/source/config/fragments/types/draw_ODG_FlatXML.xcu
+++ /dev/null
@@ -1,14 +0,0 @@
- <node oor:name="draw_ODG_FlatXML" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>fodg odg xml</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>OpenDocument Drawing Flat XML</value></prop>
- <prop oor:name="UIName">
- <value>OpenDocument Drawing (Flat XML)</value>
- </prop>
- <prop oor:name="ClipboardFormat">
- <value>doctype:office:mimetype="application/vnd.oasis.opendocument.graphics"</value>
- </prop>
- </node>
diff --git a/source/config/fragments/types/impress_ODP_FlatXML.xcu b/source/config/fragments/types/impress_ODP_FlatXML.xcu
deleted file mode 100644
index 1b43a63..0000000
--- a/source/config/fragments/types/impress_ODP_FlatXML.xcu
+++ /dev/null
@@ -1,14 +0,0 @@
- <node oor:name="impress_ODP_FlatXML" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>fodp odp xml</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>OpenDocument Presentation Flat XML</value></prop>
- <prop oor:name="UIName">
- <value>OpenDocument Presentation (Flat XML)</value>
- </prop>
- <prop oor:name="ClipboardFormat">
- <value>doctype:office:mimetype="application/vnd.oasis.opendocument.presentation"</value>
- </prop>
- </node>
diff --git a/source/config/fragments/types/writer_ODT_FlatXML.xcu b/source/config/fragments/types/writer_ODT_FlatXML.xcu
deleted file mode 100644
index 7c6f324..0000000
--- a/source/config/fragments/types/writer_ODT_FlatXML.xcu
+++ /dev/null
@@ -1,14 +0,0 @@
- <node oor:name="writer_ODT_FlatXML" oor:op="replace">
- <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
- <prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>fodt odt xml</value></prop>
- <prop oor:name="MediaType"/>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>OpenDocument Text Flat XML</value></prop>
- <prop oor:name="UIName">
- <value>OpenDocument Text (Flat XML)</value>
- </prop>
- <prop oor:name="ClipboardFormat">
- <value>doctype:office:mimetype="application/vnd.oasis.opendocument.text"</value>
- </prop>
- </node>
diff --git a/source/odfflatxml/odfflatxmlexport.xsl b/source/odfflatxml/odfflatxmlexport.xsl
deleted file mode 100644
index e08afd7..0000000
--- a/source/odfflatxml/odfflatxmlexport.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
- <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="@office:mimetype[string(.)='application/vnd.oasis.opendocument.drawing']">
- <xsl:attribute name="office:mimetype">application/vnd.oasis.opendocument.graphics</xsl:attribute>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/source/odfflatxml/odfflatxmlimport.xsl b/source/odfflatxml/odfflatxmlimport.xsl
deleted file mode 100644
index 802ff53..0000000
--- a/source/odfflatxml/odfflatxmlimport.xsl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
commit 22e6c50e1a2d8d98a96763a010ff451e8e77a772
Author: Rene Engelhard <rene at debian.org>
Date: Thu Sep 30 23:33:40 2010 +0200
add files not committed when porting odf-flatxml-import-export.diff
diff --git a/source/config/fragments/filters/ODG_FlatXML.xcu b/source/config/fragments/filters/ODG_FlatXML.xcu
new file mode 100644
index 0000000..2a5a4a0
--- /dev/null
+++ b/source/config/fragments/filters/ODG_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Drawing Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>draw_ODG_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Drawing (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/source/config/fragments/filters/ODP_FlatXML.xcu b/source/config/fragments/filters/ODP_FlatXML.xcu
new file mode 100644
index 0000000..175936c
--- /dev/null
+++ b/source/config/fragments/filters/ODP_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Presentation Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>impress_ODP_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Presentation (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/source/config/fragments/filters/ODS_FlatXML.xcu b/source/config/fragments/filters/ODS_FlatXML.xcu
new file mode 100644
index 0000000..a780901
--- /dev/null
+++ b/source/config/fragments/filters/ODS_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Spreadsheet Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>calc_ODS_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Spreadsheet (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/source/config/fragments/filters/ODT_FlatXML.xcu b/source/config/fragments/filters/ODT_FlatXML.xcu
new file mode 100644
index 0000000..b931543
--- /dev/null
+++ b/source/config/fragments/filters/ODT_FlatXML.xcu
@@ -0,0 +1,13 @@
+ <node oor:name="OpenDocument Text Flat XML" oor:op="replace">
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>writer_ODT_FlatXML</value></prop>
+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/odfflatxml/odfflatxmlimport.xsl,../share/xslt/odfflatxml/odfflatxmlexport.xsl</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="UIName">
+ <value>OpenDocument Text (Flat XML)</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT OWN 3RDPARTYFILTER</value></prop>
+ </node>
diff --git a/source/config/fragments/types/calc_ODS_FlatXML.xcu b/source/config/fragments/types/calc_ODS_FlatXML.xcu
new file mode 100644
index 0000000..51e43cb
--- /dev/null
+++ b/source/config/fragments/types/calc_ODS_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="calc_ODS_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fods ods xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Spreadsheet Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Spreadsheet (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.spreadsheet"</value>
+ </prop>
+ </node>
diff --git a/source/config/fragments/types/draw_ODG_FlatXML.xcu b/source/config/fragments/types/draw_ODG_FlatXML.xcu
new file mode 100644
index 0000000..2fa92bf
--- /dev/null
+++ b/source/config/fragments/types/draw_ODG_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="draw_ODG_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fodg odg xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Drawing Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Drawing (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.graphics"</value>
+ </prop>
+ </node>
diff --git a/source/config/fragments/types/impress_ODP_FlatXML.xcu b/source/config/fragments/types/impress_ODP_FlatXML.xcu
new file mode 100644
index 0000000..1b43a63
--- /dev/null
+++ b/source/config/fragments/types/impress_ODP_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="impress_ODP_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fodp odp xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Presentation Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Presentation (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.presentation"</value>
+ </prop>
+ </node>
diff --git a/source/config/fragments/types/writer_ODT_FlatXML.xcu b/source/config/fragments/types/writer_ODT_FlatXML.xcu
new file mode 100644
index 0000000..7c6f324
--- /dev/null
+++ b/source/config/fragments/types/writer_ODT_FlatXML.xcu
@@ -0,0 +1,14 @@
+ <node oor:name="writer_ODT_FlatXML" oor:op="replace">
+ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
+ <prop oor:name="URLPattern"/>
+ <prop oor:name="Extensions"><value>fodt odt xml</value></prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred"><value>false</value></prop>
+ <prop oor:name="PreferredFilter"><value>OpenDocument Text Flat XML</value></prop>
+ <prop oor:name="UIName">
+ <value>OpenDocument Text (Flat XML)</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>doctype:office:mimetype="application/vnd.oasis.opendocument.text"</value>
+ </prop>
+ </node>
diff --git a/source/odfflatxml/odfflatxmlexport.xsl b/source/odfflatxml/odfflatxmlexport.xsl
new file mode 100644
index 0000000..e08afd7
--- /dev/null
+++ b/source/odfflatxml/odfflatxmlexport.xsl
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
+ <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="@office:mimetype[string(.)='application/vnd.oasis.opendocument.drawing']">
+ <xsl:attribute name="office:mimetype">application/vnd.oasis.opendocument.graphics</xsl:attribute>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/source/odfflatxml/odfflatxmlimport.xsl b/source/odfflatxml/odfflatxmlimport.xsl
new file mode 100644
index 0000000..802ff53
--- /dev/null
+++ b/source/odfflatxml/odfflatxmlimport.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
commit a12a67a7c4588e1cede2ad1ca24e3a405e045344
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 20:29:55 2010 +0100
Resolves: rhbz#632236 .docx table crasher
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3da51d9..e48abe5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -496,13 +496,6 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
if( aRepeatIter == m_aTableProperties->end() )
m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, false, uno::makeAny( (sal_Int32)0 ));
- // Remove the PROP_HEADER_ROW_COUNT from the table default to avoid
- // propagating it to the cells
- PropertyMap::iterator aDefaultRepeatIt =
- rInfo.pTableDefaults->find( PropertyDefinition( PROP_HEADER_ROW_COUNT, false ) );
- if ( aDefaultRepeatIt != rInfo.pTableDefaults->end( ) )
- rInfo.pTableDefaults->erase( aDefaultRepeatIt );
-
rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
#ifdef DEBUG_DOMAINMAPPER
@@ -592,7 +585,14 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
PropertyMapPtr pStyleProps = rInfo.pTableStyle->GetProperties( nCellStyleMask + nRowStyleMask );
pAllCellProps->insert( pStyleProps );
}
-
+
+ // Remove properties from style/row that aren't allowed in cells
+ const PropertyMap::iterator aDefaultRepeatIt =
+ pAllCellProps->find(
+ PropertyDefinition( PROP_HEADER_ROW_COUNT, false ) );
+ if ( aDefaultRepeatIt != pAllCellProps->end( ) )
+ pAllCellProps->erase( aDefaultRepeatIt );
+
// Then add the cell properties
pAllCellProps->insert( *aCellIterator );
aCellIterator->get( )->swap( *pAllCellProps.get( ) );
More information about the ooo-build-commit
mailing list