[Libreoffice-commits] core.git: ios/shared

2013-12-28 Thread Tor Lillqvist 
 ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1c7ea4668d306620662bb36e5d82de0fee923aef
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Dec 28 15:01:49 2013 +0200

OSL_DEBUG_LEVEL is defined in the flags in lo.xcconfig

Change-Id: If35f0407e40bfeade9c2a342e509ef5e84306f53

diff --git a/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h 
b/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
index 9a12cd2..eb87735 100644
--- a/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
+++ b/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
@@ -27,7 +27,6 @@ static const BOOL
 #define IGNORE_ARG(X) ((void) X)
 
 #define CPPU_ENV gcc3
-#define OSL_DEBUG_LEVEL 1
 #define RTL_USING
 #define HAVE_GCC_VISIBILITY_FEATURE
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/shared

2013-12-17 Thread Tor Lillqvist 
 ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h |   19 --
 1 file changed, 19 deletions(-)

New commits:
commit f4502a2f7f36c8dba9f76176cc761dd66b1a0e16
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Dec 17 15:10:03 2013 +0200

These get defined through lo.xcconfig now

Change-Id: I4d574b728aa0a60808bcfdd36c503476c226599a

diff --git a/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h 
b/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
index eac726c..9a12cd2 100644
--- a/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
+++ b/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
@@ -26,28 +26,9 @@ static const BOOL
 #define LOG_RECT(RECT,NAME)  NSLog(@%@: w:%d, h:%d, origin:(%d,%d),NAME, 
(int) RECT.size.width, (int) RECT.size.height, (int) RECT.origin.x, (int) 
RECT.origin.y)
 #define IGNORE_ARG(X) ((void) X)
 
-#define ARM
-#define ARM32
-#define BOOST_DETAIL_NO_CONTAINER_FWD
 #define CPPU_ENV gcc3
-#define DBG_UTIL
-#define DISABLE_DYNLOADING
-#define DISABLE_SCRIPTING
-#define ENABLE_READONLY_INSTALLSET
-#define IOS
-#define LIBO_INTERNAL_ONLY
-#define NO_PTHREAD_PRIORITY
 #define OSL_DEBUG_LEVEL 1
-#define SAL_LOG_INFO
-#define SAL_LOG_WARN
-#define SUPD 410
-#define UNIX
-#define UNX
-#define _DEBUG
-#define _PTHREADS
-#define _REENTRANT
 #define RTL_USING
-#define SYSTEM_ZLIB
 #define HAVE_GCC_VISIBILITY_FEATURE
 
 #import time.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/shared

2013-10-30 Thread Ptyl Dragon 
 ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m |4 
 1 file changed, 4 insertions(+)

New commits:
commit 95f112d200db6ae61f7510ae95e3f0eaa60a8929
Author: Ptyl Dragon p...@cloudon.com
Date:   Wed Oct 30 15:41:21 2013 +0200

added stub for void touch_ui_selection_none in MLOGestureEngine

Change-Id: I45f957863dc26b2ef40bdfed04cb689325f5b170
Reviewed-on: https://gerrit.libreoffice.org/6492
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com

diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m 
b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
index 3523dca..53d3c74 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
@@ -470,3 +470,7 @@ void touch_ui_selection_start(MLOSelectionKind kind,
   rectangles[i].origin.y);
 }
 }
+
+void touch_ui_selection_none(){
+// STUB
+}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/shared

2013-10-20 Thread Ptyl Dragon 
 ios/shared/ios_sharedlo/cxx/mlo_uno.mm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6dd844917205a051c880ff7609c28e09698770c8
Author: Ptyl Dragon p...@cloudon.com
Date:   Sun Oct 20 12:10:18 2013 +0200

fix save several file on by reseting the xstorable on close

Change-Id: I329d43e06b0c81cebda0464ebb0fff41714020a3
Reviewed-on: https://gerrit.libreoffice.org/6355
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com

diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm 
b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
index 20c079b..49a4fac 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
@@ -365,6 +365,7 @@ mlo_close(void){
 openedXSelectionSupplier.clear();
 openedXFrame.clear();
 openedXDispatchProvider.clear();
+openedXStorable.clear();
 resetLastSearch();
 
 NSLog(@XComponent disposed successfully);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/shared

2013-10-19 Thread Ptyl Dragon 
 ios/shared/ios_sharedlo/cxx/mlo_uno.h  
 |1 
 ios/shared/ios_sharedlo/cxx/mlo_uno.mm 
 |   25 ++
 ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.h  
 |2 
 ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m  
 |   19 ++-
 ios/shared/ios_sharedlo/objective_c/view_controllers/role/MLOAppRoleLoApp.m
 |3 -
 
ios/shared/ios_sharedlo/objective_c/view_controllers/toolbar/MLOToolbarViewController.m
 |   11 ++--
 6 files changed, 53 insertions(+), 8 deletions(-)

New commits:
commit 1034a2eb97a291846ff0d9b67677946ecab7df87
Author: Ptyl Dragon p...@cloudon.com
Date:   Sat Oct 19 12:51:02 2013 +0200

added save to ios app and removed keyboard on open

Change-Id: Ibfa9373cc82d7e2022190e158f94eb323a57f241
Reviewed-on: https://gerrit.libreoffice.org/6351
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com

diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.h 
b/ios/shared/ios_sharedlo/cxx/mlo_uno.h
index d9ec63b..df53190 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo_uno.h
+++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.h
@@ -23,6 +23,7 @@ extern C {
 void mlo_get_selection(NSMutableString * mutableString);
 void mlo_fetch_view_data(NSMutableString * mutableString);
 void mlo_select_all(void);
+void mlo_save(void);
 
 #ifdef __cplusplus
 }
diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm 
b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
index ff92821..20c079b 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
@@ -26,6 +26,7 @@
 #include com/sun/star/frame/XDispatchHelper.hpp
 #include com/sun/star/frame/DispatchHelper.hpp
 #include com/sun/star/frame/XComponentLoader.hpp
+#include com/sun/star/frame/XStorable.hpp
 #include com/sun/star/awt/XScrollBar.hpp
 #include com/sun/star/container/XContentEnumerationAccess.hpp
 #include com/sun/star/frame/Desktop.hpp
@@ -83,6 +84,7 @@ ReferenceXSearchable openedXSearchable;
 ReferenceXSelectionSupplier openedXSelectionSupplier;
 ReferenceXFrame openedXFrame;
 ReferenceXDispatchProvider openedXDispatchProvider;
+ReferenceXStorable openedXStorable;
 
 ReferenceXIndexAccess currentFindAll;
 rtl::OUString lastSearch;
@@ -229,6 +231,15 @@ ReferenceXDispatchHelper getXDispatchHelper(){
 return helper;
 }
 
+ReferenceXStorable getXStorable(){
+if(!openedXStorable.get()){
+ReferenceXStorable stroable(getXModel(),UNO_QUERY);
+openedXStorable.set(stroable);
+LOG_EVAL(openedXStorable, @XDispatchProvider);
+}
+return openedXStorable;
+}
+
 NSString * createFileUri(NSString * file){
 if(file==nil){
 NSString * app_root_escaped = [[[NSBundle mainBundle] bundlePath] 
stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
@@ -477,4 +488,18 @@ mlo_select_all(void){
   OUString(_self),
   0,
   SequencePropertyValue ());
+}
+
+extern C
+void
+mlo_save(void){
+if(mlo_is_document_open()){
+ReferenceXStorable storable =getXStorable();
+if(storable-isReadonly()){
+NSLog(@Cannot save changes. File is read only);
+}else{
+storable-store();
+NSLog(@saved changes);
+}
+}
 }
\ No newline at end of file
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.h 
b/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.h
index c30fda0..6649ce0 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.h
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.h
@@ -15,4 +15,6 @@
 -(void)addToMainViewController;
 -(void)show;
 -(void)hide;
+-(void)showLibreOffice;
+-(void)hideLibreOffice;
 @end
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m 
b/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
index f7d483f..fde1d82 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
@@ -15,6 +15,7 @@
 @interface MLOKeyboardManager ()
 @property MLOMainViewController * mainViewController;
 @property UITextView * textView;
+@property BOOL allowLoToinvokdeKeyboard;
 @property BOOL isShown;
 @end
 
@@ -40,6 +41,13 @@
 -(void)addToMainViewController{
 [self.mainViewController.canvas addSubview:self.textView];
 }
+-(void)hideLibreOffice{
+self.allowLoToinvokdeKeyboard =NO;
+[self hide];
+}
+-(void)showLibreOffice{
+self.allowLoToinvokdeKeyboard =NO;
+}
 -(void)initTextView{
 self.textView = [[UITextView alloc] initWithFrame:CGRECT_ONE];
 self.textView.alpha = 0.0f;
@@ -77,6 +85,13 @@
 return NO;
 }
 
+-(void)loInvokeKeyboard{
+