ooo-build r15106 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Jan 20 14:59:18 2009
New Revision: 15106
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15106&view=rev

Log:
2009-01-20  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/wps-registry.diff: readd WPS; move wps patches
          from CWSBackports to own WPS section and add WPS to Common


Added:
   trunk/patches/dev300/wps-registry.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 20 14:59:18 2009
@@ -14,7 +14,7 @@
 	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
-	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
+	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, WPS, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
 	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, UnusedMethodsRemoval, \
@@ -294,7 +294,7 @@
 # for mixed font set
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
-[ CWSBackports ]
+[ WPS ]
 # MS Works import filter (following patches depend on each other) Fridrich
 wpsimport-config_office.diff
 wpsimport-filter.diff
@@ -303,6 +303,11 @@
 wpsimport-writerperfect.diff
 libwps.diff
 
+[ WPS >= dev300-m40 ]
+# readd WPS. (removed in cws native214/m40)
+wps-registry.diff
+
+[ CWSBackports ]
 #basic runtime fixes
 basic-add-missing-includes-after-cws-npower10.diff
 

Added: trunk/patches/dev300/wps-registry.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/wps-registry.diff	Tue Jan 20 14:59:18 2009
@@ -0,0 +1,20 @@
+Index: source/writer/registryitem_writer.scp
+===================================================================
+--- source/writer/registryitem_writer.scp	(Revision 266578)
++++ source/writer/registryitem_writer.scp	(Arbeitskopie)
+@@ -1278,6 +1278,15 @@
+     Value = " ";
+ End
+ 
++// .WPS
++RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
++    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
++    Subkey = ".wps\OpenWithProgIDs";
++    ModuleID = gid_Module_Prg_Wrt_Bin;
++    Name = "opendocument.WriterDocument.1";
++    Value = " ";
++End
++
+ // .HWP
+ RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;