ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 16
++++++++--
ios/experimental/LibreOffice/LibreOffice/View.m | 9 +----
vcl/source/window/window.cxx | 2 -
3 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit d404c67e8a0f597e3d2fdd027e8e822823c6b1ae
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Oct 11 18:00:38 2013 +0300
Don't use X11 concepts on iOS or Android
Change-Id: I39023acc08e652fcc9d365fe50a8240cbe0b610d
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 95c6f61..9aa6289 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8504,7 +8504,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
{
uno::Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
-#if defined(UNX) && !defined(MACOSX)
+#if defined(UNX) && !defined(MACOSX) && !defined(IOS) && !defined(ANDROID)
// A hack, making the primary selection available as an
instance
// of the SystemClipboard service on X11:
css::uno::Sequence<css::uno::Any> args(1);
commit 54be385b3332a0ad615426a1085ef18b6f517af7
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Oct 11 17:58:53 2013 +0300
Redo the temporary hack for long touch: just simulate a double-click
This is just throwaway experimentation, not how it should *really* be
done of course.
Change-Id: If600a5d3f01f118e84079f513dfccb25f4d59622
diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m
b/ios/experimental/LibreOffice/LibreOffice/View.m
index a047bb0..99d57e9 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.m
+++ b/ios/experimental/LibreOffice/LibreOffice/View.m
@@ -103,12 +103,9 @@
NSLog(@"longPressGesture: state %d cords (%d,%d)",state
,(int)point.x,(int)point.y);
- if (state == UIGestureRecognizerStateBegan) {
- lo_mouse_drag(point.x, point.y, DOWN);
- } else if (state == UIGestureRecognizerStateChanged) {
- lo_mouse_drag(point.x, point.y, MOVE);
- } else if (state == UIGestureRecognizerStateEnded) {
- lo_mouse_drag(point.x, point.y, UP);
+ if (state == UIGestureRecognizerStateEnded) {
+ lo_tap(point.x, point.y);
+ lo_tap(point.x, point.y);
}
}
commit ee0e92c9e939cfea947b749675829571c537b259
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Oct 11 17:58:42 2013 +0300
Add some more source files
Change-Id: Ife2ee57878b2fad7af84f4a8b0b0a172f7a2cb7e
diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
index 97a7147..d1c6f60 100644
--- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
@@ -21,6 +21,12 @@
BE02DE57175F2E2A00ED4032 /* guess.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = guess.cxx; path = ../../../../sw/source/core/text/guess.cxx; sourceTree
= "<group>"; };
BE08805B16FDB784000CED5C /* View.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
View.h; sourceTree = "<group>"; };
BE08805C16FDB784000CED5C /* View.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= View.m; sourceTree = "<group>"; };
+ BE2CB9601808247600953CB4 /* winproc.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = winproc.cxx;
path = ../../../../vcl/source/window/winproc.cxx; sourceTree = "<group>"; };
+ BE2CB9611808297500953CB4 /* select.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = select.cxx; path = ../../../../sw/source/ui/wrtsh/select.cxx; sourceTree
= "<group>"; };
+ BE2CB962180829DD00953CB4 /* txtcrsr.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = txtcrsr.cxx; path = ../../../../sw/source/ui/shells/txtcrsr.cxx;
sourceTree = "<group>"; };
+ BE2CB96318082A7800953CB4 /* edtwin.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edtwin.cxx;
path = ../../../../sw/source/ui/docvw/edtwin.cxx; sourceTree = "<group>"; };
+ BE2CB96418082A7800953CB4 /* edtwin2.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edtwin2.cxx;
path = ../../../../sw/source/ui/docvw/edtwin2.cxx; sourceTree = "<group>"; };
+ BE2CB96518082A7800953CB4 /* edtwin3.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edtwin3.cxx;
path = ../../../../sw/source/ui/docvw/edtwin3.cxx; sourceTree = "<group>"; };
BE2F0A0A17077A040060FE0D /* typedescriptionprovider.cxx */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.cpp.cpp; name = typedescriptionprovider.cxx; path =
../../../../cppuhelper/source/typedescriptionprovider.cxx; sourceTree =
"<group>"; };
BE2F0A121707809B0060FE0D /* unoidlprovider.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = unoidlprovider.cxx; path = ../../../../unoidl/source/unoidlprovider.cxx;
sourceTree = "<group>"; };
BE4EEE9916FF724200D475B2 /* bitmapdevice.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = bitmapdevice.cxx; path = ../../../../basebmp/source/bitmapdevice.cxx;
sourceTree = "<group>"; };
@@ -130,6 +136,7 @@
BEBF3E3B17002D0200C454AC /* svmain.cxx */,
BE4EEE9A16FF80B100D475B2 /* virdev.cxx */,
BEBF3E3D17002D6900C454AC /* window.cxx */,
+ BE2CB9601808247600953CB4 /* winproc.cxx */,
BEA86899170B3FCB0043E44B /* coretext */,
BE2F0A0C17077A2F0060FE0D /* headless */,
);
@@ -205,8 +212,6 @@
BE2F0A1017077B560060FE0D /* basebmp */,
BE2F0A0B17077A0F0060FE0D /* cppuhelper */,
BE2F0A0E17077AC40060FE0D /* framework */,
- BE56CD651704A08E00CA5B15 /* lo.h */,
- BE56CD661704A08E00CA5B15 /* lo.mm */,
BE2F0A0F17077B060060FE0D /* sfx2 */,
BECB749717182B5F001BEB85 /* sw */,
BE2F0A11170780620060FE0D /* unoidl */,
@@ -271,7 +276,12 @@
isa = PBXGroup;
children = (
BECB749617181C92001BEB85 /* crsrsh.cxx */,
+ BE2CB96318082A7800953CB4 /* edtwin.cxx */,
+ BE2CB96418082A7800953CB4 /* edtwin2.cxx */,
+ BE2CB96518082A7800953CB4 /* edtwin3.cxx */,
BE02DE57175F2E2A00ED4032 /* guess.cxx */,
+ BE2CB9611808297500953CB4 /* select.cxx */,
+ BE2CB962180829DD00953CB4 /* txtcrsr.cxx */,
BECB749917185F48001BEB85 /* view.cxx */,
BECB749A17185F48001BEB85 /* view0.cxx */,
BECB749B17185F48001BEB85 /* view1.cxx */,
@@ -289,6 +299,8 @@
BE08805C16FDB784000CED5C /* View.m */,
BE7B7AFF170438D0002341F4 /* ViewController.h */,
BE7B7B00170438D0002341F4 /* ViewController.m */,
+ BE56CD651704A08E00CA5B15 /* lo.h */,
+ BE56CD661704A08E00CA5B15 /* lo.mm */,
);
name = LibreOffice;
sourceTree = "<group>";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
