Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 60 insertions, 0 deletions

diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
new file mode 100644
index 000000000..2f6645593
--- /dev/null
+++ b/scp2/source/activex/module_activex.scp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/activexbinarytable"
+#include "AutoInstall/activex"
+#include "AutoInstall/activexwin64"
+
+Module gid_Module_Optional_Activexcontrol
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
+    Sortkey = "1000";
+    Default = NO;
+    ParentID = gid_Module_Optional;
+    Files = (auto_activexbinarytable_ALL,
+        auto_activex_ALL,
+        auto_activexwin64_ALL);
+End
diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf
new file mode 100644
index 000000000..eb8a045d7
--- /dev/null
+++ b/scp2/source/activex/module_activex.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACTIVEXCONTROL]
+en-US = "ActiveX Control"
+
+[STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL]
+en-US = "Deprecated Component (see release notes) to enable Microsoft Internet Explorer to display %PRODUCTNAME documents."
+
+
+