[Libreoffice-commits] core.git: 3 commits - ios/MobileLibreOffice ios/shared
Tor Lillqvist
tml at collabora.com
Tue Oct 15 15:40:24 PDT 2013
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 16 +++++-----
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 8 ++---
ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m | 7 ++++
ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m | 2 +
4 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit 5b0577885a686199a5dc1ff4d1b0e6bd87665f8e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 16 01:39:49 2013 +0300
No mlo_select_all(), probably left out accidentally from Ptyl's commit
Change-Id: I1859f6c05f371fccdd39f903d663d5a452866876
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
index 79ccd4d..c9a75c4 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
@@ -33,9 +33,11 @@
-(void)loSelectAll:(id) sender{
+#if 0 // No mlo_select_all() anywhere !?
NSLog(@"Calling mlo_select_all()");
mlo_select_all();
NSLog(@"mlo_select_all() returned. reshowing contextualMenu");
+#endif
[_selectionViewController showPostSelectAll];
}
commit de547ccddec1e59879b66f34e5a977dca08cec75
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 16 01:35:36 2013 +0300
Use libc++ here, too, as we now do for the LO code
Also quotes added by Xcode around library names that contain
nonalphanumerics.
Change-Id: Ie5b34b2da0ec5600e9ca1aba1e17efd7e3e087de
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 018f9ab..64aa6db 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -441,7 +441,7 @@
68B9A126180BDB7E00FFEA35 /* libexplo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexplo.a; path = lib_link/libexplo.a; sourceTree = "<group>"; };
68B9A127180BDB7E00FFEA35 /* libexpwraplo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpwraplo.a; path = lib_link/libexpwraplo.a; sourceTree = "<group>"; };
68B9A128180BDB7E00FFEA35 /* libexslt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexslt.a; path = lib_link/libexslt.a; sourceTree = "<group>"; };
- 68B9A129180BDB7E00FFEA35 /* libexttextcat-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexttextcat-2.0.a; path = lib_link/libexttextcat-2.0.a; sourceTree = "<group>"; };
+ 68B9A129180BDB7E00FFEA35 /* libexttextcat-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libexttextcat-2.0.a"; path = "lib_link/libexttextcat-2.0.a"; sourceTree = "<group>"; };
68B9A12A180BDB7E00FFEA35 /* libfastsaxlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfastsaxlo.a; path = lib_link/libfastsaxlo.a; sourceTree = "<group>"; };
68B9A12B180BDB7E00FFEA35 /* libfileacc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfileacc.a; path = lib_link/libfileacc.a; sourceTree = "<group>"; };
68B9A12C180BDB7E00FFEA35 /* libfilelo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilelo.a; path = lib_link/libfilelo.a; sourceTree = "<group>"; };
@@ -464,7 +464,7 @@
68B9A13D180BDB7E00FFEA35 /* libgraphicfilterlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgraphicfilterlo.a; path = lib_link/libgraphicfilterlo.a; sourceTree = "<group>"; };
68B9A13E180BDB7E00FFEA35 /* libguesslanglo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libguesslanglo.a; path = lib_link/libguesslanglo.a; sourceTree = "<group>"; };
68B9A13F180BDB7E00FFEA35 /* libhatchwindowfactorylo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhatchwindowfactorylo.a; path = lib_link/libhatchwindowfactorylo.a; sourceTree = "<group>"; };
- 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhunspell-1.3.a; path = lib_link/libhunspell-1.3.a; sourceTree = "<group>"; };
+ 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libhunspell-1.3.a"; path = "lib_link/libhunspell-1.3.a"; sourceTree = "<group>"; };
68B9A141180BDB7E00FFEA35 /* libhwplo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhwplo.a; path = lib_link/libhwplo.a; sourceTree = "<group>"; };
68B9A142180BDB7E00FFEA35 /* libhyphen.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhyphen.a; path = lib_link/libhyphen.a; sourceTree = "<group>"; };
68B9A143180BDB7E00FFEA35 /* libhyphenlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhyphenlo.a; path = lib_link/libhyphenlo.a; sourceTree = "<group>"; };
@@ -510,7 +510,7 @@
68B9A16B180BDB7E00FFEA35 /* libmtfrendererlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmtfrendererlo.a; path = lib_link/libmtfrendererlo.a; sourceTree = "<group>"; };
68B9A16C180BDB7E00FFEA35 /* libmwaw-0.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmwaw-0.1.a"; path = "lib_link/libmwaw-0.1.a"; sourceTree = "<group>"; };
68B9A16D180BDB7E00FFEA35 /* libmysqllo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmysqllo.a; path = lib_link/libmysqllo.a; sourceTree = "<group>"; };
- 68B9A16E180BDB7E00FFEA35 /* libmythes-1.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmythes-1.2.a; path = lib_link/libmythes-1.2.a; sourceTree = "<group>"; };
+ 68B9A16E180BDB7E00FFEA35 /* libmythes-1.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmythes-1.2.a"; path = "lib_link/libmythes-1.2.a"; sourceTree = "<group>"; };
68B9A16F180BDB7E00FFEA35 /* libnamingservicelo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnamingservicelo.a; path = lib_link/libnamingservicelo.a; sourceTree = "<group>"; };
68B9A170180BDB7E00FFEA35 /* libodfflatxmllo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libodfflatxmllo.a; path = lib_link/libodfflatxmllo.a; sourceTree = "<group>"; };
68B9A171180BDB7E00FFEA35 /* libodfgen-0.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libodfgen-0.0.a"; path = "lib_link/libodfgen-0.0.a"; sourceTree = "<group>"; };
@@ -518,7 +518,7 @@
68B9A173180BDB7E00FFEA35 /* libooopathutils.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libooopathutils.a; path = lib_link/libooopathutils.a; sourceTree = "<group>"; };
68B9A174180BDB7E00FFEA35 /* libooxlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libooxlo.a; path = lib_link/libooxlo.a; sourceTree = "<group>"; };
68B9A175180BDB7E00FFEA35 /* liborcus-parser-0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "liborcus-parser-0.6.a"; path = "lib_link/liborcus-parser-0.6.a"; sourceTree = "<group>"; };
- 68B9A176180BDB7E00FFEA35 /* liborcus-0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liborcus-0.6.a; path = lib_link/liborcus-0.6.a; sourceTree = "<group>"; };
+ 68B9A176180BDB7E00FFEA35 /* liborcus-0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "liborcus-0.6.a"; path = "lib_link/liborcus-0.6.a"; sourceTree = "<group>"; };
68B9A177180BDB7E00FFEA35 /* libpackage2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpackage2.a; path = lib_link/libpackage2.a; sourceTree = "<group>"; };
68B9A178180BDB7E00FFEA35 /* libpasswordcontainerlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpasswordcontainerlo.a; path = lib_link/libpasswordcontainerlo.a; sourceTree = "<group>"; };
68B9A179180BDB7E00FFEA35 /* libpcrlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpcrlo.a; path = lib_link/libpcrlo.a; sourceTree = "<group>"; };
@@ -1512,7 +1512,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -1557,7 +1557,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -1594,7 +1594,7 @@
689EBB0E18069FB8002F1CD7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
GCC_DYNAMIC_NO_PIC = NO;
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1616,7 +1616,7 @@
689EBB0F18069FB8002F1CD7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
GCC_DYNAMIC_NO_PIC = NO;
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 2c59fbf..0ef4524 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -459,7 +459,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -500,7 +500,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -531,7 +531,7 @@
68FDBE3918053A140064DD74 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
DSTROOT = /tmp/ios_sharedlo.dst;
GCC_DYNAMIC_NO_PIC = NO;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
@@ -549,7 +549,7 @@
68FDBE3A18053A140064DD74 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LIBRARY = "libstdc++";
+ CLANG_CXX_LIBRARY = "libc++";
DSTROOT = /tmp/ios_sharedlo.dst;
GCC_DYNAMIC_NO_PIC = NO;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
commit 892ebc079a356a65d8ec5655613ae1653752d136
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 16 01:35:28 2013 +0300
Add dummy touch_ui_keyboard_visible()
Change-Id: Ib3de4092f48e16ac88108d6a69a04baf92a82de1
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m b/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
index 05bf576..c9c0b7a 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
@@ -108,4 +108,11 @@ void touch_ui_hide_keyboard()
});
}
+bool touch_ui_keyboard_visible()
+{
+ // Should return info whether the soft keyboard is currently displayed,
+ // or a hardware keyboard is attached/paired.
+ return false;
+}
+
@end
More information about the Libreoffice-commits
mailing list