diff options
-rw-r--r-- | configure.in | 17 | ||||
-rw-r--r-- | scp2/source/activex/file_activex.scp | 3 | ||||
-rw-r--r-- | scp2/source/activex/module_activex.scp | 4 | ||||
-rw-r--r-- | scp2/source/calc/registryitem_calc.scp | 12 | ||||
-rw-r--r-- | scp2/source/draw/registryitem_draw.scp | 12 | ||||
-rw-r--r-- | scp2/source/impress/registryitem_impress.scp | 12 | ||||
-rw-r--r-- | scp2/source/math/registryitem_math.scp | 12 | ||||
-rw-r--r-- | scp2/source/writer/registryitem_writer.scp | 11 |
8 files changed, 80 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 16f1879b0b83..4fd9afed24ff 100644 --- a/configure.in +++ b/configure.in @@ -109,6 +109,9 @@ AC_ARG_ENABLE(epm, epm, however epm is useless for large scale package building. ],,enable_epm="yes") +AC_ARG_ENABLE(activex_component, +[ --disable-activex-component Remove support for ActiveX embedding of OOo +],,enable_activex_component=yes) AC_ARG_WITH(epm, [ --with-epm Decides which epm to use. Default is to use the one from the system if one is built. When @@ -7066,6 +7069,20 @@ AC_SUBST(WITHOUT_AFMS) AC_SUBST(SCPDEFS) +if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([whether to enable ActiveX embedding of OOo components]) + if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then + ENABLE_ACTIVEX_COMPONENT="TRUE" + AC_MSG_RESULT([yes]) + SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT" + else + ENABLE_ACTIVEX_COMPONENT="" + AC_MSG_RESULT([no]) + fi + AC_SUBST(ENABLE_ACTIVEX_COMPONENT) + AC_SUBST(SCPDEFS) +fi + AC_MSG_CHECKING([whether and how to use Xinerama]) if test "$_os" = "Darwin"; then USE_XINERAMA=YES diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 574657b5b441..db9b028def62 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#ifdef WITH_ACTIVEX_COMPONENT + File gid_File_Lib_Soactivex TXT_FILE_BODY; Styles = (PACKED); @@ -58,3 +60,4 @@ File gid_File_Lib_Regpatchactivex_Msi Name = "regpatchactivex.dll"; End +#endif // WITH_ACTIVEX_COMPONENT diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 808afa874992..aaac49d8012d 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#ifdef WITH_ACTIVEX_COMPONENT + Module gid_Module_Optional_Activexcontrol PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL ); @@ -36,3 +38,5 @@ Module gid_Module_Optional_Activexcontrol ParentID = gid_Module_Optional; Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); End + +#endif // WITH_ACTIVEX_COMPONENT diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index be92161c79ef..c76ae8b2168d 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -27,6 +27,8 @@ #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; @@ -265,6 +267,8 @@ 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; @@ -272,6 +276,8 @@ 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; @@ -279,6 +285,8 @@ 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; @@ -639,6 +647,8 @@ 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; @@ -646,6 +656,8 @@ 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 a298eb64f388..5d7e0d99edfc 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -27,6 +27,8 @@ #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; @@ -265,7 +267,7 @@ 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; @@ -274,6 +276,8 @@ 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; @@ -281,6 +285,8 @@ 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; @@ -639,6 +645,8 @@ 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; @@ -646,6 +654,8 @@ 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 1f07ec9c1e31..0885d81d7c31 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -27,6 +27,8 @@ #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; @@ -265,7 +267,7 @@ 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; @@ -274,6 +276,8 @@ 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; @@ -281,6 +285,8 @@ 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; @@ -654,6 +660,8 @@ 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; @@ -661,6 +669,8 @@ 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 b87e5b940356..b58e15e5265e 100644 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -26,6 +26,8 @@ ************************************************************************/ #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; @@ -264,7 +266,7 @@ 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; @@ -273,6 +275,8 @@ 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; @@ -280,6 +284,8 @@ 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; @@ -523,6 +529,8 @@ 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; @@ -530,6 +538,8 @@ 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 d1a92634d318..6810cf8ff8e6 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -27,6 +27,8 @@ #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; @@ -265,6 +267,7 @@ 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; @@ -273,6 +276,8 @@ 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; @@ -280,6 +285,8 @@ 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; @@ -761,6 +768,8 @@ 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; @@ -768,6 +777,8 @@ 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; |