android/source/AndroidManifest.xml | 2 +- android/source/src/java/org/libreoffice/ui/FileUtilities.java | 2 +- android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 965205931162b7fcdc175672354103b40985c6ed Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Fri Apr 29 21:55:54 2022 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sat Apr 30 07:10:35 2022 +0200 tdf#111427 android: Enable support for .ppsx Opening the sample file of MIME type "application/vnd.openxmlformats-officedocument.presentationml.slideshow" attached to tdf#111427 worked fine now when testing in an x86_64 AVD with API level 31, so declare support for it. Change-Id: I67ace0fb6ee82c0a43624dc32671ba2d453e473c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133648 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 0af368c8460b..c50ad77ae71d 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -70,7 +70,7 @@ <!-- OOXML --> <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" /> <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" /> - <!-- Currently crashes. <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow"/> --> + <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow" /> <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" /> <!-- OOXML templates --> diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index 72da47b8cc3a..4675ca1d0709 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java @@ -74,7 +74,7 @@ public class FileUtilities { // OOXML mExtnMap.put(".docx", DOC); mExtnMap.put(".pptx", IMPRESS); - // mExtnMap.put(".ppsx", IMPRESS); + mExtnMap.put(".ppsx", IMPRESS); mExtnMap.put(".xlsx", CALC); // OOXML templates diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 965639e6e2ba..e7b38b4cac86 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -103,6 +103,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings "application/x-mspublisher", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.openxmlformats-officedocument.presentationml.presentation", + "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "application/vnd.openxmlformats-officedocument.wordprocessingml.template", "application/vnd.openxmlformats-officedocument.spreadsheetml.template",