android/source/build.gradle | 4 -
android/source/src/java/org/libreoffice/LibreOfficeApplication.java | 4 -
instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt | 18
+++---
instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 26
+++++-----
instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt | 1
instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt | 16
+++---
instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt | 1
solenv/bin/modules/installer/windows/idtglobal.pm | 4 -
9 files changed, 37 insertions(+), 38 deletions(-)
New commits:
commit 86050dc7c72b98cf7af98d78e664965c9d9bb383
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 16 10:35:39 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 16 15:13:20 2024 +0200
android: Disable multidex, only needed for minSdkVersion < 21
multidex was enabled in
commit 037680488b56aa2c4eb21900168aa88ef35d5b07
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Dec 27 12:51:54 2022 +0100
android: Enable multidex, update com.google.android.material to
1.7.0
as it was needed when building for minSdkVersion <= 20, see [1]
and the full commit message of the above-mentioned commit
for more details.
However, since
commit c2fc2c8c7c63ca4e43bca6e8c9b82c50418422d2
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Dec 5 09:57:22 2023 +0100
android: Bump minSdkVersion to 21 (Android 5.0)
, the minSdkVersion is greater than that, so this
is no longer needed.
[1] https://developer.android.com/build/multidex
Change-Id: I31502ec74e9c4201a8a11be42820f70e5fd5a1fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167735
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 6428a0ffcfda..8aa3d2dbf9c6 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -34,7 +34,6 @@ dependencies {
])
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
- implementation "androidx.multidex:multidex:2.0.1"
implementation 'androidx.preference:preference:1.2.1'
}
@@ -60,9 +59,6 @@ android {
defaultConfig {
// minSdkVersion is set in liboSettings.gradle
targetSdkVersion 34
- // multidex needed when > 65,536 methods referenced with minSdKVersion
< 21
- // s. https://developer.android.com/studio/build/multidex
- multiDexEnabled true
vectorDrawables.useSupportLibrary = true
}
buildTypes {
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
b/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
index 3b03c83adda9..77f1af493b0e 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
@@ -10,11 +10,11 @@
package org.libreoffice;
+import android.app.Application;
import android.content.Context;
import android.os.Handler;
-import androidx.multidex.MultiDexApplication;
-public class LibreOfficeApplication extends MultiDexApplication {
+public class LibreOfficeApplication extends Application {
private static Handler mainHandler;
commit bf067777fee9fccd361fecc106eafc587b1c8a88
Author: kubak <k...@openoffice.com.pl>
AuthorDate: Wed May 1 09:59:14 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu May 16 15:13:09 2024 +0200
MSI: Adds the missing ExtendedType column in the CustomAction table
ICE06 WARNING Column: ExtendedType of Table: CustomAction is not defined in
database.
https: //learn.microsoft.com/en-us/windows/win32/msi/ice06
https: //learn.microsoft.com/en-us/windows/win32/msi/customaction-table
Change-Id: I5f9368fedf421b23a397f5dcd77f383cb9f42ac5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166951
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index aaf07ca28d96..80f0a0ad043a 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -1,10 +1,10 @@
-Action Type Source Target
-s72 i2 S64 S255
+Action Type Source Target ExtendedType
+s72 i2 S72 S255 I4
CustomAction Action
-setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
-SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
-setUserProfileNT 51 USERPROFILE [%USERPROFILE]
-SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetARPNoRemove 51 ARPNOREMOVE 1
-NewProductFound 19 OOO_CUSTOMACTION_1
-SameProductFound 19 OOO_CUSTOMACTION_2
+setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
+SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All
Users
+setUserProfileNT 51 USERPROFILE [%USERPROFILE]
+SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
+SetARPNoRemove 51 ARPNOREMOVE 1
+NewProductFound 19 OOO_CUSTOMACTION_1
+SameProductFound 19 OOO_CUSTOMACTION_2
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index 53dcdd84e45c..78edec13939c 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -111,6 +111,7 @@ ControlEvent Ordering Y 0
2147483647 An integer used to order
several events
CreateFolder Component_ N Component 1
Identifier Foreign key into the Component table.
CreateFolder Directory_ N Directory 1
Identifier Primary key, could be foreign key into the Directory
table.
CustomAction Action N Identifier
Primary key, name of action, normally appears in sequence table unless
private use.
+CustomAction ExtendedType Y 0 2147483647
A numeric custom action type that extends code type or option
flags of the Type column.
CustomAction Source Y CustomSource
The table reference of the source of the code.
CustomAction Target Y Formatted
Execution parameter, depends on the type of custom action
CustomAction Type N 1 32767
The numeric custom action type, consisting of source location, code type,
entry, option flags.
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index d010a0bd2279..5475014af641 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -1,14 +1,14 @@
-Action Type Source Target
-s72 i2 S64 S255
+Action Type Source Target ExtendedType
+s72 i2 S72 S255 I4
CustomAction Action
-ISInitAllUsers 307 ALLUSERS 1
-setAllUsersProfile 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
-setUserProfile 51 USERPROFILE [%USERPROFILE]
-SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-NewProductFound 19 OOO_CUSTOMACTION_1
-SameProductFound 19 OOO_CUSTOMACTION_2
-SetLanguageSelected 51 LANG_SELECTED 1
-ResetLanguageSelected 51 LANG_SELECTED 0
-SetApplicationSelected 51 APP_SELECTED 1
-ResetApplicationSelected 51 APP_SELECTED 0
-SetAdminInstallProperty 51 ADMININSTALL 1
+ISInitAllUsers 307 ALLUSERS 1
+setAllUsersProfile 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
+setUserProfile 51 USERPROFILE [%USERPROFILE]
+SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
+NewProductFound 19 OOO_CUSTOMACTION_1
+SameProductFound 19 OOO_CUSTOMACTION_2
+SetLanguageSelected 51 LANG_SELECTED 1
+ResetLanguageSelected 51 LANG_SELECTED 0
+SetApplicationSelected 51 APP_SELECTED 1
+ResetApplicationSelected 51 APP_SELECTED 0
+SetAdminInstallProperty 51 ADMININSTALL 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index ea986c0ea1d8..babf8efa3691 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -110,6 +110,7 @@ ControlEvent Ordering Y 0
2147483647 An integer used to order
several events
CreateFolder Component_ N Component 1
Identifier Foreign key into the Component table.
CreateFolder Directory_ N Directory 1
Identifier Primary key, could be foreign key into the Directory
table.
CustomAction Action N Identifier
Primary key, name of action, normally appears in sequence table unless
private use.
+CustomAction ExtendedType Y 0 2147483647
A numeric custom action type that extends code type or option
flags of the Type column.
CustomAction Source Y CustomSource
The table reference of the source of the code.
# DON'T YOU EVEN ATTEMPT to fix the "Excecution" typo below - the MSI tools
depend on that, and will fail if you change it.
CustomAction Target Y Formatted
Excecution parameter, depends on the type of custom action
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
index 04cde2ad4d29..666832964a90 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
@@ -1,9 +1,9 @@
-Action Type Source Target
-s72 i2 S64 S255
+Action Type Source Target ExtendedType
+s72 i2 S72 S255 I4
CustomAction Action
-ISInitAllUsers 307 ALLUSERS 1
-setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
-SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
-setUserProfileNT 51 USERPROFILE [%USERPROFILE]
-SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetARPNoRemove 51 ARPNOREMOVE 1
+ISInitAllUsers 307 ALLUSERS 1
+setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
+SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All
Users
+setUserProfileNT 51 USERPROFILE [%USERPROFILE]
+SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
+SetARPNoRemove 51 ARPNOREMOVE 1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index 53dcdd84e45c..78edec13939c 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
@@ -111,6 +111,7 @@ ControlEvent Ordering Y 0
2147483647 An integer used to order
several events
CreateFolder Component_ N Component 1
Identifier Foreign key into the Component table.
CreateFolder Directory_ N Directory 1
Identifier Primary key, could be foreign key into the Directory
table.
CustomAction Action N Identifier
Primary key, name of action, normally appears in sequence table unless
private use.
+CustomAction ExtendedType Y 0 2147483647
A numeric custom action type that extends code type or option
flags of the Type column.
CustomAction Source Y CustomSource
The table reference of the source of the code.
CustomAction Target Y Formatted
Execution parameter, depends on the type of custom action
CustomAction Type N 1 32767
The numeric custom action type, consisting of source location, code type,
entry, option flags.
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index f0e59c29efbf..ba3af1ab48d7 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1005,7 +1005,7 @@ sub set_custom_action
# when the style NO_FILE is set, no searching for the file is needed, no
filtering is done, we can add that custom action
if ( $styles =~ /NO_FILE/ )
{
- my $line = $actionname . " " . $actionflags . " " .
$customaction_exefilename . " " . $actionparameter . "
";
+ my $line = $actionname . " " . $actionflags . " " .
$customaction_exefilename . " " . $actionparameter . "
";
push(@{$customactionidttable}, $line);
$infoline = "Added $actionname CustomAction into table
$customactionidttablename (NO_FILE has been set)
";
@@ -1054,7 +1054,7 @@ sub set_custom_action
if ( ! $inbinarytable ) { $customaction_exefilename = $uniquename; }
# the unique file name has to be added to the custom action table
- my $line = $actionname . " " . $actionflags . " " .
$customaction_exefilename . " " . $actionparameter . "
";
+ my $line = $actionname . " " . $actionflags . " " .
$customaction_exefilename . " " . $actionparameter . "
";
push(@{$customactionidttable}, $line);
$included_customaction = 1;
