odf-flatxml-import-export.diff: Migrated to gitlinux-build-fridrich-20100930

2 files changed, 0 insertions, 561 deletions

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0fd72e5bc..ba56d48c2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -814,10 +814,6 @@ vfs-kde-too.diff, michael
 # Trade speed for reliability with valgrind
 valgrind-alloc.diff, michael
 
-# load and save also odf documents in flat xml format as opposed to the
-# compressed ones (conforming to the odf specifications)
-odf-flatxml-import-export.diff
-
 [ Win32Only ]
 # search <ooo-home>/share/template/common for language independent templates
 # will not push it upstream because it will be replaced by upcomming kendy's work
diff --git a/patches/dev300/odf-flatxml-import-export.diff b/patches/dev300/odf-flatxml-import-export.diff
deleted file mode 100644
index 84637bc16..000000000
--- a/patches/dev300/odf-flatxml-import-export.diff
+++ /dev/null
@@ -1,557 +0,0 @@
----
- filter/prj/d.lst                                   |    2 +
- filter/source/config/fragments/fcfg_xslt.mk        |    8 +++
- .../config/fragments/filters/ODG_FlatXML.xcu       |   13 +++++
- .../config/fragments/filters/ODP_FlatXML.xcu       |   13 +++++
- .../config/fragments/filters/ODS_FlatXML.xcu       |   13 +++++
- .../config/fragments/filters/ODT_FlatXML.xcu       |   13 +++++
- .../config/fragments/types/calc_ODS_FlatXML.xcu    |   14 ++++++
- .../config/fragments/types/draw_ODG_FlatXML.xcu    |   14 ++++++
- .../config/fragments/types/impress_ODP_FlatXML.xcu |   14 ++++++
- .../config/fragments/types/writer_ODT_FlatXML.xcu  |   14 ++++++
- filter/source/odfflatxml/odfflatxmlexport.xsl      |   14 ++++++
- filter/source/odfflatxml/odfflatxmlimport.xsl      |   10 ++++
- scp2/source/calc/registryitem_calc.scp             |   47 ++++++++++++++++++++
- scp2/source/draw/registryitem_draw.scp             |   47 ++++++++++++++++++++
- scp2/source/impress/registryitem_impress.scp       |   47 ++++++++++++++++++++
- scp2/source/ooo/directory_ooo.scp                  |    5 ++
- scp2/source/writer/registryitem_writer.scp         |   47 ++++++++++++++++++++
- scp2/source/xsltfilter/file_xsltfilter.scp         |   14 ++++++
- scp2/source/xsltfilter/module_xsltfilter.scp       |    2 +
- 19 files changed, 351 insertions(+), 0 deletions(-)
- create mode 100644 filter/source/config/fragments/filters/ODG_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/filters/ODP_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/filters/ODS_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/filters/ODT_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/types/calc_ODS_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/types/draw_ODG_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/types/impress_ODP_FlatXML.xcu
- create mode 100644 filter/source/config/fragments/types/writer_ODT_FlatXML.xcu
- create mode 100644 filter/source/odfflatxml/odfflatxmlexport.xsl
- create mode 100644 filter/source/odfflatxml/odfflatxmlimport.xsl
-
-diff --git filter/prj/d.lst filter/prj/d.lst
-index e8fdae8..6983a3b 100644
---- filter/prj/d.lst
-+++ filter/prj/d.lst
-@@ -24,6 +24,7 @@ mkdir: %_DEST%\bin%_EXT%\xslt\import\common
- mkdir: %_DEST%\bin%_EXT%\xslt\import\spreadsheetml
- mkdir: %_DEST%\bin%_EXT%\xslt\import\uof
- mkdir: %_DEST%\bin%_EXT%\xslt\import\wordml
-+mkdir: %_DEST%\bin%_EXT%\xslt\odfflatxml
- mkdir: %_DEST%\xml%_EXT%\registry
- mkdir: %_DEST%\xml%_EXT%\registry\spool
- mkdir: %_DEST%\bin%_EXT%\pdfimport
-@@ -43,6 +44,7 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
- ..\source\xslt\import\spreadsheetml\*.xsl %_DEST%\bin%_EXT%\xslt\import\spreadsheetml\*.xsl
- ..\source\xslt\import\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\import\wordml\*.xsl
- ..\source\xslt\import\uof\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof\*.xsl
-+..\source\odfflatxml\*.xsl %_DEST%\bin%_EXT%\xslt\odfflatxml\*.xsl
- ..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
- ..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
- ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
-diff --git filter/source/config/fragments/fcfg_xslt.mk filter/source/config/fragments/fcfg_xslt.mk
-index 852383a..12087a5 100644
---- filter/source/config/fragments/fcfg_xslt.mk
-+++ filter/source/config/fragments/fcfg_xslt.mk
-@@ -3,7 +3,11 @@ all_fragments+=xslt
- # -----------------------------------------------
- # count = 5
- T4_XSLT = \
-+    calc_ODS_FlatXML \
-+    draw_ODG_FlatXML \
-+    impress_ODP_FlatXML \
-     writer_DocBook_File \
-+    writer_ODT_FlatXML \
-     XHTML_File \
-     Unified_Office_Format_text \
-     Unified_Office_Format_spreadsheet \
-@@ -13,6 +17,10 @@ T4_XSLT = \
- # count = 8
- F4_XSLT = \
-     DocBook_File \
-+    ODG_FlatXML \
-+    ODP_FlatXML \
-+    ODS_FlatXML \
-+    ODT_FlatXML \
-     XHTML_Calc_File \
-     XHTML_Draw_File \
-     XHTML_Impress_File \
-diff --git filter/source/config/fragments/filters/ODG_FlatXML.xcu filter/source/config/fragments/filters/ODG_FlatXML.xcu
-new file mode 100644
-index 0000000..2a5a4a0
---- /dev/null
-+++ 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 filter/source/config/fragments/filters/ODP_FlatXML.xcu filter/source/config/fragments/filters/ODP_FlatXML.xcu
-new file mode 100644
-index 0000000..175936c
---- /dev/null
-+++ 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 filter/source/config/fragments/filters/ODS_FlatXML.xcu filter/source/config/fragments/filters/ODS_FlatXML.xcu
-new file mode 100644
-index 0000000..a780901
---- /dev/null
-+++ 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 filter/source/config/fragments/filters/ODT_FlatXML.xcu filter/source/config/fragments/filters/ODT_FlatXML.xcu
-new file mode 100644
-index 0000000..b931543
---- /dev/null
-+++ 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 filter/source/config/fragments/types/calc_ODS_FlatXML.xcu filter/source/config/fragments/types/calc_ODS_FlatXML.xcu
-new file mode 100644
-index 0000000..51e43cb
---- /dev/null
-+++ 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 filter/source/config/fragments/types/draw_ODG_FlatXML.xcu filter/source/config/fragments/types/draw_ODG_FlatXML.xcu
-new file mode 100644
-index 0000000..2fa92bf
---- /dev/null
-+++ 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 filter/source/config/fragments/types/impress_ODP_FlatXML.xcu filter/source/config/fragments/types/impress_ODP_FlatXML.xcu
-new file mode 100644
-index 0000000..1b43a63
---- /dev/null
-+++ 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 filter/source/config/fragments/types/writer_ODT_FlatXML.xcu filter/source/config/fragments/types/writer_ODT_FlatXML.xcu
-new file mode 100644
-index 0000000..7c6f324
---- /dev/null
-+++ 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 filter/source/odfflatxml/odfflatxmlexport.xsl filter/source/odfflatxml/odfflatxmlexport.xsl
-new file mode 100644
-index 0000000..e08afd7
---- /dev/null
-+++ 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 filter/source/odfflatxml/odfflatxmlimport.xsl filter/source/odfflatxml/odfflatxmlimport.xsl
-new file mode 100644
-index 0000000..802ff53
---- /dev/null
-+++ 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 scp2/source/calc/registryitem_calc.scp scp2/source/calc/registryitem_calc.scp
-index efc71ac..be92161 100644
---- scp2/source/calc/registryitem_calc.scp
-+++ scp2/source/calc/registryitem_calc.scp
-@@ -738,6 +738,53 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
-     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
- End
- 
-+// .fods
-+
-+RegistryItem gid_Regitem_Fods_PersistentHandler
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Calc_Bin;
-+    Subkey = ".fods\PersistentHandler";
-+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-+End
-+
-+RegistryItem gid_Regitem_Fods_Shellex_00021500_0000_0000_C000_000000000046
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Calc_Bin;
-+    Subkey = ".fods\shellex\{00021500-0000-0000-C000-000000000046}";
-+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-+End
-+
-+RegistryItem gid_Regitem_Fods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Calc_Bin;
-+    Subkey = ".fods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-+End
-+
-+RegistryItem gid_Regitem__Fods
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Calc_Bin;
-+    Subkey = ".fods";
-+    Value = "opendocument.CalcDocument.1";
-+End
-+
-+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
-+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-+    ModuleID = gid_Module_Root;
-+    Name = ".fods";
-+    Value = "opendocument.CalcDocument.1";
-+    Styles = (PATCH);
-+End
-+
-+RegistryItem gid_Regitem_Fods_Contenttype
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Calc_Bin;
-+    Subkey = ".fods";
-+    Name = "Content Type";
-+    Value = "application/vnd.oasis.opendocument.spreadsheet";
-+End
-+
- // new ots file extension 
- 
- RegistryItem gid_Regitem_Ots_PersistentHandler
-diff --git scp2/source/draw/registryitem_draw.scp scp2/source/draw/registryitem_draw.scp
-index 0ecb215..a298eb6 100644
---- scp2/source/draw/registryitem_draw.scp
-+++ scp2/source/draw/registryitem_draw.scp
-@@ -738,6 +738,53 @@ RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Ve
-     Value = "&Open";
- End
- 
-+// .fodg
-+
-+RegistryItem gid_Regitem_Fodg_PersistentHandler
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Draw_Bin;
-+    Subkey = ".fodg\PersistentHandler";
-+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-+End
-+
-+RegistryItem gid_Regitem_Fodg_Shellex_00021500_0000_0000_C000_000000000046
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Draw_Bin;
-+    Subkey = ".fodg\shellex\{00021500-0000-0000-C000-000000000046}";
-+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-+End
-+
-+RegistryItem gid_Regitem_Fodg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Draw_Bin;
-+    Subkey = ".fodg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-+End
-+
-+RegistryItem gid_Regitem_Fodg_Contenttype
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Draw_Bin;
-+    Subkey = ".fodg";
-+    Name = "Content Type";
-+    Value = "application/vnd.oasis.opendocument.graphics";
-+End
-+
-+RegistryItem gid_Regitem__Fodg
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Draw_Bin;
-+    Subkey = ".fodg";
-+    Value = "opendocument.DrawDocument.1";
-+End
-+
-+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
-+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-+    ModuleID = gid_Module_Root;
-+    Name = ".fodg";
-+    Value = "opendocument.DrawDocument.1";
-+    Styles = (PATCH);
-+End
-+
- // new otg file extension 
- 
- RegistryItem gid_Regitem_Otg_PersistentHandler
-diff --git scp2/source/impress/registryitem_impress.scp scp2/source/impress/registryitem_impress.scp
-index cce7f1d..1f07ec9 100644
---- scp2/source/impress/registryitem_impress.scp
-+++ scp2/source/impress/registryitem_impress.scp
-@@ -767,6 +767,53 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
-     Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
- End
- 
-+// .fodp
-+
-+RegistryItem gid_Regitem_Fodp_PersistentHandler
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Impress_Bin;
-+    Subkey = ".fodp\PersistentHandler";
-+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-+End
-+
-+RegistryItem gid_Regitem_Fodp_Shellex_00021500_0000_0000_C000_000000000046
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Impress_Bin;
-+    Subkey = ".fodp\shellex\{00021500-0000-0000-C000-000000000046}";
-+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-+End
-+
-+RegistryItem gid_Regitem_Fodp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Impress_Bin;
-+    Subkey = ".fodp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-+End
-+
-+RegistryItem gid_Regitem__Fodp
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Impress_Bin;
-+    Subkey = ".fodp";
-+    Value = "opendocument.ImpressDocument.1";
-+End
-+
-+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
-+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-+    ModuleID = gid_Module_Root;
-+    Name = ".fodp";
-+    Value = "opendocument.ImpressDocument.1";
-+    Styles = (PATCH);
-+End
-+
-+RegistryItem gid_Regitem_Fodp_Contenttype
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Impress_Bin;
-+    Subkey = ".fodp";
-+    Name = "Content Type";
-+    Value = "application/vnd.oasis.opendocument.presentation";
-+End
-+
- // new otp file extension
- 
- RegistryItem gid_Regitem_Otp_PersistentHandler
-diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
-index 5bcd887..6b53469 100644
---- scp2/source/ooo/directory_ooo.scp
-+++ scp2/source/ooo/directory_ooo.scp
-@@ -454,6 +454,11 @@ Directory gid_Dir_Share_Xslt_Import_Common
-     DosName = "common";
- End
- 
-+Directory gid_Dir_Share_Xslt_Odfflatxml
-+    ParentID = gid_Dir_Share_Xslt;
-+    DosName = "odfflatxml";
-+End
-+
- Directory gid_Dir_Share_Dtd
-     ParentID = gid_Dir_Share;
-     DosName = "dtd";
-diff --git scp2/source/writer/registryitem_writer.scp scp2/source/writer/registryitem_writer.scp
-index 925c887..d1a9263 100644
---- scp2/source/writer/registryitem_writer.scp
-+++ scp2/source/writer/registryitem_writer.scp
-@@ -883,6 +883,53 @@ RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
-     Styles = ();
- End
- 
-+// .fodt
-+
-+RegistryItem gid_Regitem_Fodt_PersistentHandler
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Wrt_Bin;
-+    Subkey = ".fodt\PersistentHandler";
-+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-+End
-+
-+RegistryItem gid_Regitem_Fodt_Shellex_00021500_0000_0000_C000_000000000046
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Wrt_Bin;
-+    Subkey = ".fodt\shellex\{00021500-0000-0000-C000-000000000046}";
-+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-+End
-+
-+RegistryItem gid_Regitem_Fodt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Wrt_Bin;
-+    Subkey = ".fodt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-+End
-+
-+RegistryItem gid_Regitem__Fodt
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Wrt_Bin;
-+    Subkey = ".fodt";
-+    Value = "opendocument.WriterDocument.1";
-+End
-+
-+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
-+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-+    ModuleID = gid_Module_Root;
-+    Name = ".fodt";
-+    Value = "opendocument.WriterDocument.1";
-+    Styles = (PATCH);
-+End
-+
-+RegistryItem gid_Regitem_Fodt_Contenttype
-+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+    ModuleID = gid_Module_Prg_Wrt_Bin;
-+    Subkey = ".fodt";
-+    Name = "Content Type";
-+    Value = "application/vnd.oasis.opendocument.text";
-+End
-+
- // new ott file extension 
- 
- RegistryItem gid_Regitem_Ott_PersistentHandler
-diff --git scp2/source/xsltfilter/file_xsltfilter.scp scp2/source/xsltfilter/file_xsltfilter.scp
-index 848b1c7..d40a515 100644
---- scp2/source/xsltfilter/file_xsltfilter.scp
-+++ scp2/source/xsltfilter/file_xsltfilter.scp
-@@ -83,3 +83,17 @@ File gid_File_Xsl_Export_Xhtml_Table
-     Name = "/xslt/export/xhtml/table.xsl";
- End
- 
-+
-+File gid_File_Xsl_Export_Odfflatxml
-+    TXT_FILE_BODY;
-+    Styles = (PACKED, PATCH);
-+    Dir = gid_Dir_Share_Xslt_Odfflatxml;
-+    Name = "/xslt/odfflatxml/odfflatxmlexport.xsl";
-+End
-+
-+File gid_File_Xsl_Import_Odfflatxml
-+    TXT_FILE_BODY;
-+    Styles = (PACKED, PATCH);
-+    Dir = gid_Dir_Share_Xslt_Odfflatxml;
-+    Name = "/xslt/odfflatxml/odfflatxmlimport.xsl";
-+End
-diff --git scp2/source/xsltfilter/module_xsltfilter.scp scp2/source/xsltfilter/module_xsltfilter.scp
-index 7854ce7..16f0d7d 100644
---- scp2/source/xsltfilter/module_xsltfilter.scp
-+++ scp2/source/xsltfilter/module_xsltfilter.scp
-@@ -43,6 +43,8 @@ Module gid_Module_Optional_Xsltfiltersamples
-     gid_File_Xsl_Export_Xhtml_Master_Usability_Links,
-     gid_File_Xsl_Export_Xhtml_Ooo2xhtml,
-     gid_File_Xsl_Export_Xhtml_Table,
-+    gid_File_Xsl_Export_Odfflatxml,
-+    gid_File_Xsl_Import_Odfflatxml,
-     gid_File_Share_Registry_Xsltfilter_Xcd );
-     Minimal = NO;
-     Default = NO;
--- 
-1.7.0.1
-