Mobile/Mobile/Info.plist.in | 27 +++++++++++++++++++++++++++ common/Png.hpp | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-)
New commits: commit 331579421d80867c3af35c469bf445621f5056af Author: Tor Lillqvist <[email protected]> AuthorDate: Fri Nov 2 16:34:00 2018 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Nov 2 16:34:00 2018 +0200 Add .odp Change-Id: If1e863f2e2208a6804a974fc04ca47e27e9973fb diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in index 4fd5f60f7..a5494978b 100644 --- a/Mobile/Mobile/Info.plist.in +++ b/Mobile/Mobile/Info.plist.in @@ -84,6 +84,16 @@ <string>org.openxmlformats.spreadsheetml.sheet</string> </array> </dict> + <dict> + <key>CFBundleTypeName</key> + <string>OpenDocument Presentation</string> + <key>LSHandlerRank</key> + <string>Owner</string> + <key>LSItemContentTypes</key> + <array> + <string>org.oasis-open.opendocument.presentation</string> + </array> + </dict> </array> <key>CFBundleExecutable</key> <string>$(EXECUTABLE_NAME)</string> @@ -175,6 +185,23 @@ <string>ods</string> </dict> </dict> + <dict> + <key>UTTypeConformsTo</key> + <array> + <string>public.data</string> + </array> + <key>UTTypeDescription</key> + <string>OpenDocument Presentation</string> + <key>UTTypeIconFiles</key> + <array/> + <key>UTTypeIdentifier</key> + <string>org.oasis-open.opendocument.presentation</string> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <string>odp</string> + </dict> + </dict> </array> <key>UTImportedTypeDeclarations</key> <array> commit 2d1c865dd54f8c0e79dacd9c5f86787ba0f34e85 Author: Tor Lillqvist <[email protected]> AuthorDate: Fri Nov 2 16:20:49 2018 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Nov 2 16:20:49 2018 +0200 Use std::memcpy() here for consistency Change-Id: I295b1db38333935ccf6efc4c2232bc2db8e84dd5 diff --git a/common/Png.hpp b/common/Png.hpp index f7957c0b8..84861fc48 100644 --- a/common/Png.hpp +++ b/common/Png.hpp @@ -91,7 +91,7 @@ unpremultiply_data (png_structp /*png*/, png_row_infop row_info, png_bytep data) uint32_t pixel; uint8_t alpha; - memcpy (&pixel, b, sizeof (uint32_t)); + std::memcpy (&pixel, b, sizeof (uint32_t)); alpha = (pixel & 0xff000000) >> 24; if (alpha == 0) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
