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

[tml svn gnome org]

Author: tml
Date: Mon Sep 22 10:36:24 2008
New Revision: 13990
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13990&view=rev

Log:
2008-09-22  Tor Lillqvist  <tml novell com>

	* patches/src680/win32-activex-disable.diff: Unfuzzify.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-activex-disable.diff

Modified: trunk/patches/dev300/win32-activex-disable.diff
==============================================================================
--- trunk/patches/dev300/win32-activex-disable.diff	(original)
+++ trunk/patches/dev300/win32-activex-disable.diff	Mon Sep 22 10:36:24 2008
@@ -63,220 +63,280 @@
 +#endif // WITH_ACTIVEX_COMPONENT
 --- scp2/source/calc/registryitem_calc.scp	Thu Nov 10 18:18:08 2005
 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/scp2/source/calc/registryitem_calc.scp	Wed May  3 14:25:20 2006
-@@ -36,4 +36,6 @@
+@@ -36,6 +36,8 @@
+ 
  #include "macros.inc"
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  // MSOLE embedded object in SO7 file format
  RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
-@@ -272,4 +274,6 @@
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -272,6 +274,8 @@
+     Value = "opendocument.CalcDocument.1";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
 +
- RegistryItem gid_Regitem_Sdc_Contenttype
+ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -359,4 +363,6 @@
+     ModuleID = gid_Module_Prg_Calc_Bin;
+@@ -359,6 +363,8 @@
+     REG_VALUE_LNG(SO60_SPREADSHEET)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -366,4 +372,6 @@
+     ModuleID = gid_Module_Prg_Calc_Bin;
+@@ -366,6 +372,8 @@
+     Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -688,4 +696,6 @@
+     ModuleID = gid_Module_Prg_Calc_Bin;
+@@ -688,6 +696,8 @@
+     REG_VALUE_LNG(OO_CALC)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -694,4 +704,6 @@
+     ModuleID = gid_Module_Prg_Calc_Bin;
+@@ -694,6 +704,8 @@
+     Subkey = "opendocument.CalcDocument.1\CLSID";
      Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
  End
 +
 +#endif // WITH_ACTIVEX_COMPONENT
  
  RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 --- scp2/source/draw/registryitem_draw.scp	Thu Nov 10 18:18:21 2005
 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/scp2/source/draw/registryitem_draw.scp	Wed May  3 14:25:46 2006
-@@ -36,4 +36,6 @@
+@@ -36,6 +36,8 @@
+ 
  #include "macros.inc"
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  // MSOLE embedded object in SO7 file format
  RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
-@@ -272,5 +274,5 @@
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -272,7 +274,7 @@
+     Value = "opendocument.DrawDocument.1";
  End
  
 -
 +#endif // WITH_ACTIVEX_COMPONENT
  
- RegistryItem gid_Regitem_Sda_Contenttype
-@@ -361,4 +363,6 @@
+ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -361,6 +363,8 @@
+     REG_VALUE_LNG(SO60_DRAWING)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -368,4 +372,6 @@
+     ModuleID = gid_Module_Prg_Draw_Bin;
+@@ -368,6 +372,8 @@
+     Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -690,4 +696,6 @@
+     ModuleID = gid_Module_Prg_Draw_Bin;
+@@ -690,6 +696,8 @@
+     REG_VALUE_LNG(OO_DRAW)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -696,4 +704,6 @@
+     ModuleID = gid_Module_Prg_Draw_Bin;
+@@ -696,6 +704,8 @@
+     Subkey = "opendocument.DrawDocument.1\CLSID";
      Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
  End
 +
 +#endif // WITH_ACTIVEX_COMPONENT
  
  RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 --- scp2/source/impress/registryitem_impress.scp	Thu Nov 10 18:18:33 2005
 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/scp2/source/impress/registryitem_impress.scp	Wed May  3 14:26:13 2006
-@@ -36,4 +36,6 @@
+@@ -36,6 +36,8 @@
+ 
  #include "macros.inc"
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  // MSOLE embedded object in SO7 file format
  RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
-@@ -272,5 +274,5 @@
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -272,7 +274,7 @@
+     Value = "opendocument.ImpressDocument.1";
  End
  
 -
 +#endif // WITH_ACTIVEX_COMPONENT
  
- RegistryItem gid_Regitem_Sdd_Contenttype
-@@ -377,4 +379,6 @@
+ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -377,6 +379,8 @@
+     REG_VALUE_LNG(SO60_PRESENT)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -384,4 +388,6 @@
+     ModuleID = gid_Module_Prg_Impress_Bin;
+@@ -384,6 +388,8 @@
+     Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -727,4 +733,6 @@
+     ModuleID = gid_Module_Prg_Impress_Bin;
+@@ -727,6 +733,8 @@
+     REG_VALUE_LNG(OO_PRESENT)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -733,4 +741,6 @@
+     ModuleID = gid_Module_Prg_Impress_Bin;
+@@ -733,6 +741,8 @@
+     Subkey = "opendocument.ImpressDocument.1\CLSID";
      Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
  End
 +
 +#endif // WITH_ACTIVEX_COMPONENT
  
  RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 --- scp2/source/math/registryitem_math.scp	Thu Nov 10 18:18:46 2005
 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/scp2/source/math/registryitem_math.scp	Wed May  3 14:26:36 2006
-@@ -35,4 +35,6 @@
+@@ -35,6 +35,8 @@
+  ************************************************************************/
  #include "macros.inc"
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  // MSOLE embedded object in SO7 file format
  RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
-@@ -271,5 +273,5 @@
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -271,7 +273,7 @@
+     Value = "opendocument.MathDocument.1";
  End
  
 -
 +#endif // WITH_ACTIVEX_COMPONENT
  
- RegistryItem gid_Regitem_Smf_Contenttype
-@@ -360,4 +362,6 @@
+ RegistryItem gid_Regitem_Soffice_Starmathdocument_6
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -360,6 +362,8 @@
+     REG_VALUE_LNG(SO60_FORMULA)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -367,4 +371,6 @@
+     ModuleID = gid_Module_Prg_Math_Bin;
+@@ -367,6 +371,8 @@
+     Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -582,4 +588,6 @@
+     ModuleID = gid_Module_Prg_Math_Bin;
+@@ -582,6 +588,8 @@
+     REG_VALUE_LNG(OO_FORMULA)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -588,4 +596,6 @@
+     ModuleID = gid_Module_Prg_Math_Bin;
+@@ -588,6 +596,8 @@
+     Subkey = "opendocument.MathDocument.1\CLSID";
      Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
  End
 +
 +#endif // WITH_ACTIVEX_COMPONENT
  
  RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 --- scp2/source/writer/registryitem_writer.scp	Thu Nov 10 18:19:00 2005
 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/scp2/source/writer/registryitem_writer.scp	Wed May  3 14:27:50 2006
-@@ -36,4 +36,6 @@
+@@ -36,6 +36,8 @@
+ 
  #include "macros.inc"
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  // MSOLE embedded object in SO7 file format
  RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
-@@ -272,4 +274,5 @@
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -272,6 +274,7 @@
+     Value = "opendocument.WriterDocument.1";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
  
- RegistryItem gid_Regitem_Sdw_Contenttype
-@@ -376,4 +379,6 @@
+ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+@@ -376,6 +379,8 @@
+     REG_VALUE_LNG(SO60_TEXT)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -383,4 +388,6 @@
+     ModuleID = gid_Module_Prg_Wrt_Bin;
+@@ -383,6 +388,8 @@
+     Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
  End
  
 +#endif // WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -882,4 +889,6 @@
+     ModuleID = gid_Module_Prg_Wrt_Bin;
+@@ -882,6 +889,8 @@
+     REG_VALUE_LNG(OO_WRITER)
  End
  
 +#ifdef WITH_ACTIVEX_COMPONENT
 +
  RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
      ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-@@ -888,4 +897,6 @@
+     ModuleID = gid_Module_Prg_Wrt_Bin;
+@@ -888,6 +897,8 @@
+     Subkey = "opendocument.WriterDocument.1\CLSID";
      Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
  End
 +
 +#endif // WITH_ACTIVEX_COMPONENT
  
  RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
+     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;