[Libreoffice-commits] online.git: 3 commits - kit/Kit.cpp Mobile/Mobile
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 1 16:34:59 UTC 2018
Mobile/Mobile/Info.plist.in | 367 ++++++++++++++++++++++++--------------------
kit/Kit.cpp | 5
2 files changed, 204 insertions(+), 168 deletions(-)
New commits:
commit 2a12bf3371ce314ed56c206202cfe0f16a65dbe1
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 1 18:28:30 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 1 18:34:14 2018 +0200
Add xlsx to Info.plis(.in)
Added it to UTImportedTypeDeclarations, seemed to work. Not sure what
document types should be in UTImportedTypeDeclarations and what in
UTExportedTypeDeclarations. The documentation for document type
association is sadly rather vague.
I remember that some month ago I had horrible problems with this stuff
(see 26323fb92b3e860665c2a37deba049e9e310a7e9), but now adding xlsx
went without a hitch. Not sure if I was just lucky, or whether iOS
12.1 has some bug fix related to this...
Change-Id: I75483719bd20496e8b44f935c788455148655a88
diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index fd75c02e9..4f0af735f 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -70,6 +70,20 @@
<string>org.oasis-open.opendocument.spreadsheet</string>
</array>
</dict>
+ <dict>
+ <key>CFBundleTypeIconFiles</key>
+ <array/>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Alternate</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openxmlformats.spreadsheetml.sheet</string>
+ </array>
+ </dict>
</array>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
@@ -163,7 +177,30 @@
</dict>
</array>
<key>UTImportedTypeDeclarations</key>
- <array/>
+ <array>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>org.openxmlformats.openxml</string>
+ <string>public.composite-content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Office Open XML spreadsheet</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.openxmlformats.spreadsheetml.sheet</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>xlsx</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</string>
+ </array>
+ </dict>
+ </dict>
+ </array>
<key>NSCameraUsageDescription</key>
<string>$(PRODUCT_NAME) camera use</string>
</dict>
commit 1fd5abc7828a59ec99c21b0d9b0925ae0fa57156
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 1 18:15:19 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 1 18:34:14 2018 +0200
Add Emacs mode line and untabify
Change-Id: I9995a78cf59104e546f289dbaf685d70f9ba302e
diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index dc078a396..fd75c02e9 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: nXML; tab-width: 4; indent-tabs-mode: nil; nxml-child-indent:4 -*- -->
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>$(DEVELOPMENT_LANGUAGE)</string>
- <key>CFBundleDisplayName</key>
- <string>@IOSAPP_NAME@</string>
- <key>CFBundleDocumentTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Flat Text</string>
- <key>LSHandlerRank</key>
- <string>Default</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>com.collabora.office.uti.fodt</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleTypeIconFiles</key>
- <array/>
- <key>CFBundleTypeName</key>
- <string>Plain Text</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSHandlerRank</key>
- <string>Alternate</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>public.text</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Text</string>
- <key>LSHandlerRank</key>
- <string>Owner</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>org.oasis-open.opendocument.text</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleTypeIconFiles</key>
- <array/>
- <key>CFBundleTypeName</key>
- <string>Microsoft Word Document</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSHandlerRank</key>
- <string>Alternate</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>com.microsoft.word.doc</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleTypeIconFiles</key>
- <array/>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Spreadsheet</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSHandlerRank</key>
- <string>Owner</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>org.oasis-open.opendocument.spreadsheet</string>
- </array>
- </dict>
- </array>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>$(PRODUCT_NAME)</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>UIFileSharingEnabled</key>
- <true/>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UIMainStoryboardFile</key>
- <string>Main</string>
- <key>UIRequiredDeviceCapabilities</key>
- <array>
- <string>armv7</string>
- </array>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
- <key>UISupportedInterfaceOrientations~ipad</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationPortraitUpsideDown</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
- <key>UISupportsDocumentBrowser</key>
- <true/>
- <key>UTExportedTypeDeclarations</key>
- <array>
- <dict>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- </array>
- <key>UTTypeIdentifier</key>
- <string>com.collabora.office.uti.fodt</string>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <string>fodt</string>
- </dict>
- </dict>
- <dict>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- </array>
- <key>UTTypeDescription</key>
- <string>OpenDocument Text</string>
- <key>UTTypeIconFiles</key>
- <array/>
- <key>UTTypeIdentifier</key>
- <string>org.oasis-open.opendocument.text</string>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <string>odt</string>
- </dict>
- </dict>
- <dict>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- </array>
- <key>UTTypeDescription</key>
- <string>OpenDocument Spreadsheet</string>
- <key>UTTypeIconFiles</key>
- <array/>
- <key>UTTypeIdentifier</key>
- <string>org.oasis-open.opendocument.spreadsheet</string>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <string>ods</string>
- </dict>
- </dict>
- </array>
- <key>UTImportedTypeDeclarations</key>
- <array/>
- <key>NSCameraUsageDescription</key>
- <string>$(PRODUCT_NAME) camera use</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleDisplayName</key>
+ <string>@IOSAPP_NAME@</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Flat Text</string>
+ <key>LSHandlerRank</key>
+ <string>Default</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.collabora.office.uti.fodt</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeIconFiles</key>
+ <array/>
+ <key>CFBundleTypeName</key>
+ <string>Plain Text</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Alternate</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>public.text</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Text</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.text</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeIconFiles</key>
+ <array/>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Word Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Alternate</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.microsoft.word.doc</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeIconFiles</key>
+ <array/>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.spreadsheet</string>
+ </array>
+ </dict>
+ </array>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UIFileSharingEnabled</key>
+ <true/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UIMainStoryboardFile</key>
+ <string>Main</string>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>armv7</string>
+ </array>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UISupportsDocumentBrowser</key>
+ <true/>
+ <key>UTExportedTypeDeclarations</key>
+ <array>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeIdentifier</key>
+ <string>com.collabora.office.uti.fodt</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <string>fodt</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>OpenDocument Text</string>
+ <key>UTTypeIconFiles</key>
+ <array/>
+ <key>UTTypeIdentifier</key>
+ <string>org.oasis-open.opendocument.text</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <string>odt</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>OpenDocument Spreadsheet</string>
+ <key>UTTypeIconFiles</key>
+ <array/>
+ <key>UTTypeIdentifier</key>
+ <string>org.oasis-open.opendocument.spreadsheet</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <string>ods</string>
+ </dict>
+ </dict>
+ </array>
+ <key>UTImportedTypeDeclarations</key>
+ <array/>
+ <key>NSCameraUsageDescription</key>
+ <string>$(PRODUCT_NAME) camera use</string>
</dict>
</plist>
commit b52456aeee47ff5d19ebb4e46ca074f8e4e099ce
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 31 19:08:08 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 1 18:34:14 2018 +0200
Use non-empty dummy values of 'jailId' and 'pid'
Just in case some code checks them for being non-empty.
Change-Id: I6e595272f3fb6d3c2e57a31c291a89b0fb02563a
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index b731d0eb9..46cccafae 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2470,9 +2470,8 @@ void lokit_main(
LOOLWSD::LOKitVersion = loKit->getVersionInfo();
// Dummies
- Poco::URI uri;
- const std::string jailId;
- const std::string pid;
+ const std::string jailId = "jailid";
+ const std::string pid = "101";
#endif // MOBILEAPP
More information about the Libreoffice-commits
mailing list