[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300 patches/ooxml

[Petr Mladek]

 patches/dev300/apply                          |    2 -
 patches/ooxml/writerfilter-module-writer.diff |   29 --------------------------
 2 files changed, 31 deletions(-)

New commits:
commit fcdf7763fed0714258c61ca59660d7a25298d27b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 17:29:31 2011 +0200

    pushed writerfilter-module-writer.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 33f42fd..b3a061c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -931,8 +931,6 @@ SectionIssue => i#33654
 [ OOXML ]
 win32-installer-register-moox-types.diff
 
-writerfilter-module-writer.diff #disabled
-
 # Ugly temporary fix
 # FIXME 2011-04-04: Doesn't apply, unclear whether needed
 # docx-ugly-fix.diff, n#548701, cbosdo
diff --git a/patches/ooxml/writerfilter-module-writer.diff b/patches/ooxml/writerfilter-module-writer.diff
deleted file mode 100644
index d130b56..0000000
--- a/patches/ooxml/writerfilter-module-writer.diff
+++ /dev/null
@@ -1,29 +0,0 @@
----
- scp2/source/writer/module_writer.scp |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git scp2/source/writer/module_writer.scp scp2/source/writer/module_writer.scp
-index f6fdb65..f545ce8 100644
---- scp2/source/writer/module_writer.scp
-+++ scp2/source/writer/module_writer.scp
-@@ -51,6 +51,7 @@ Module gid_Module_Prg_Wrt_Bin
-     gid_File_Lib_Wpft,
-     gid_File_Lib_Msworks,
-     gid_File_Lib_T602Filter,
-+    gid_File_Lib_Writerfilter,
-     gid_File_Lib_Wlwp,
-     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
-     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
-@@ -59,7 +60,8 @@ Module gid_Module_Prg_Wrt_Bin
-     gid_File_Jar_Mail, 
-     gid_File_Jar_Activation,
-     gid_File_Share_Registry_Writer_Xcd,
--    gid_File_Tmp_Userinstall_Wrt_Inf);
-+    gid_File_Tmp_Userinstall_Wrt_Inf,
-+    gid_File_Lib_writerfilter);
- End
- 
- Module gid_Module_Brand_Prg_Wrt
--- 
-1.7.0.1
-