diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2022-04-29 21:55:54 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2022-05-03 21:23:51 +0200 |
| commit | 72341ab5042e76a7a2cea4844a269e5d9bf8631b (patch) | |
| tree | 2b5860655fec8e751d2b01549ab609b4d0d62c4d | |
| parent | tdf#148851 Unmap + close file again in xdictionary dtor (diff) | |
| download | core-72341ab5042e76a7a2cea4844a269e5d9bf8631b.tar.gz core-72341ab5042e76a7a2cea4844a269e5d9bf8631b.zip | |
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.weghorn@posteo.de>
(cherry picked from commit 965205931162b7fcdc175672354103b40985c6ed)
| -rw-r--r-- | android/source/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/ui/FileUtilities.java | 2 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 1 |
3 files changed, 3 insertions, 2 deletions
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", |