fdo#47944 enable insertion of OLE objects into external applications

5 files changed, 0 insertions, 60 deletions

diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 29555e1a7469..49a648dec1ad 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -27,8 +27,6 @@
 
 #include "macros.inc"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -267,8 +265,6 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionind
     Value = "opendocument.CalcDocument.1";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -276,8 +272,6 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     REG_VALUE_LNG(SO60_SPREADSHEET)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -285,8 +279,6 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -650,8 +642,6 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     REG_VALUE_LNG(OO_CALC)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -659,8 +649,6 @@ RegistryItem gid_Regitem_Openoffice_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;
     ModuleID = gid_Module_Prg_Calc_Bin;
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 1c9b3a153a3d..b30a41cdfa03 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -27,8 +27,6 @@
 
 #include "macros.inc"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -267,8 +265,6 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionind
     Value = "opendocument.DrawDocument.1";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -276,8 +272,6 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     REG_VALUE_LNG(SO60_DRAWING)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -285,8 +279,6 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -649,8 +641,6 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     REG_VALUE_LNG(OO_DRAW)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -658,8 +648,6 @@ RegistryItem gid_Regitem_Openoffice_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;
     ModuleID = gid_Module_Prg_Draw_Bin;
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 57c58fbace8d..e9352f1540f0 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -27,8 +27,6 @@
 
 #include "macros.inc"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -267,8 +265,6 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Versionind
     Value = "opendocument.ImpressDocument.1";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -276,8 +272,6 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
     REG_VALUE_LNG(SO60_PRESENT)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -285,8 +279,6 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
     Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -664,8 +656,6 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     REG_VALUE_LNG(OO_PRESENT)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -673,8 +663,6 @@ RegistryItem gid_Regitem_Openoffice_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;
     ModuleID = gid_Module_Prg_Impress_Bin;
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 60826aaacf1b..f61c32598e1a 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -26,8 +26,6 @@
  ************************************************************************/
 #include "macros.inc"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -266,8 +264,6 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Versionind
     Value = "opendocument.MathDocument.1";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -275,8 +271,6 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6
     REG_VALUE_LNG(SO60_FORMULA)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -284,8 +278,6 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
     Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -531,8 +523,6 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1
     REG_VALUE_LNG(OO_FORMULA)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -540,8 +530,6 @@ RegistryItem gid_Regitem_Openoffice_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;
     ModuleID = gid_Module_Prg_Math_Bin;
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 97df01cdf88a..1911b15e763b 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -27,8 +27,6 @@
 
 #include "macros.inc"
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -267,8 +265,6 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionind
     Value = "opendocument.WriterDocument.1";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -276,8 +272,6 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
     REG_VALUE_LNG(SO60_TEXT)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -285,8 +279,6 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
     Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
 End
 
-#endif // WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -773,8 +765,6 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     REG_VALUE_LNG(OO_WRITER)
 End
 
-#ifdef WITH_ACTIVEX_COMPONENT
-
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -782,8 +772,6 @@ RegistryItem gid_Regitem_Openoffice_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;
     ModuleID = gid_Module_Prg_Wrt_Bin;