[Libreoffice-commits] online.git: 2 commits - configure.ac ios/Mobile

[Tor Lillqvist (via logerrit)]

 configure.ac             |    2 +-
 ios/Mobile/Info.plist.in |   29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit 163f6f5f5e327ec24077011d5a0c645ab01725d7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jul 12 18:22:58 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 23 10:44:44 2019 +0200

    It's ios/Mobile/Branding that we want
    
    Change-Id: I059189b7268b41515d12ef245b52f6eb6117f9b4
    (cherry picked from commit 5cd866441db6f1f7f7a3450b63893d4d44256e31)
    Reviewed-on: https://gerrit.libreoffice.org/79385
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index c3ab7c195..b14ac3745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -778,7 +778,7 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
           mkdir ios/Mobile/Branding
           if test -n "$APP_BRANDING_DIR" ; then
               AC_MSG_NOTICE([copying branding files])
-              mkdir -p loleaflet/dist/branding
+              mkdir -p ios/Mobile/Branding
               (cd "$APP_BRANDING_DIR" && tar cf - .) | (cd ios/Mobile/Branding && tar xf -)
           else
               # A Branding/branding.css file must exist, it is
commit 02746c398adda373d0e102702a799e3884bbc3f2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri May 31 11:21:22 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 23 10:44:30 2019 +0200

    Add Lotus WordPro Document, the .lwp extension
    
    Note that this is just one step, work is needed elsewhere, too, for
    the app to actually manage to open a .lwp document correctly. (Desktop
    Collabora Office opens such documents without problems.) As we can't
    save this format, set the CFBundleTypeRole to "Viewer".
    
    Change-Id: I5f818bf915a1a9ee607a97424b2437655f8a9d79
    (cherry picked from commit 38e6ace9a6d2dfe848a185c97d955a06493cd21d)
    Reviewed-on: https://gerrit.libreoffice.org/79384
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index ecf7bf642..55b998375 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -292,6 +292,20 @@
             <key>CFBundleTypeIconFiles</key>
             <array/>
             <key>CFBundleTypeName</key>
+            <string>Lotus WordPro Document</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>com.collabora.office.uti.lwp</string>
+            </array>
+        </dict>
+        <dict>
+            <key>CFBundleTypeIconFiles</key>
+            <array/>
+            <key>CFBundleTypeName</key>
             <string>Plain Text</string>
             <key>CFBundleTypeRole</key>
             <string>Editor</string>
@@ -481,6 +495,21 @@
                 <string>public.data</string>
             </array>
             <key>UTTypeDescription</key>
+            <string>Lotus WordPro Document</string>
+            <key>UTTypeIdentifier</key>
+            <string>com.collabora.office.uti.lwp</string>
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <string>lwp</string>
+            </dict>
+        </dict>
+        <dict>
+            <key>UTTypeConformsTo</key>
+            <array>
+                <string>public.data</string>
+            </array>
+            <key>UTTypeDescription</key>
             <string>OpenDocument Spreadsheet</string>
             <key>UTTypeIconFiles</key>
             <array/>