[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - include/touch sw/source vcl/ios

[Ptyl Dragon]

 include/touch/touch.h          |   15 ++++++++++++++-
 sw/source/core/view/viewsh.cxx |    9 +++++++++
 vcl/ios/iosinst.cxx            |   11 -----------
 3 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit 02cf93393fc0c0af8673008dee159a976acaeb3a
Author: Ptyl Dragon <ptyl at cloudon.com>
Date:   Tue Oct 29 18:12:00 2013 +0200

    created a long long unit for MLOContentSize
    
    Change-Id: I41910058088161119d3cae8ca625d456652d890f

diff --git a/include/touch/touch.h b/include/touch/touch.h
index ae4f491..6ba2fab 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -69,6 +69,19 @@ typedef CGRect MLORect;
 typedef basegfx::B2IBox MLORect;
 #endif
 
+typedef long long MLOContentSizeDimension;
+struct MLOContentSize {
+    MLOContentSizeDimension width;
+    MLOContentSizeDimension height;
+};
+typedef struct MLOContentSize MLOContentSize;
+
+CG_INLINE MLOContentSize
+MLOContentSizeMake(MLOContentSizeDimension width, MLOContentSizeDimension height)
+{
+    MLOContentSize size; size.width = width; size.height = height; return size;
+}
+
 void touch_ui_selection_start(MLOSelectionKind kind,
                               const void *documentHandle,
                               MLORect *rectangles,
@@ -111,7 +124,7 @@ context, contextHeight, contextWidth specify where to draw.
 */
 void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tilePosX, int tilePosY, int tileWidth, int tileHeight);
 void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth, size_t targetHeight);
-CGSize touch_lo_get_content_size();
+MLOContentSize touch_lo_get_content_size();
 void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
 
 // Move the start of the selection to (x,y)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 68ba9bb..1df00fed 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1817,6 +1817,15 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int
     }
     Application::ReleaseSolarMutex();
 }
+extern "C"
+MLOContentSize touch_lo_get_content_size()
+{
+    SwWrtShell *pViewShell = GetActiveWrtShell();
+    if (pViewShell)
+    {
+    }
+    return MLOContentSizeMake(0,0);
+}
 #endif
 
 extern "C" void touch_ui_selection_none() {}
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index d6e580a..39208f5 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -415,17 +415,6 @@ touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t sourceHeigh
 }
 
 extern "C"
-CGSize touch_lo_get_content_size()
-{
-    CGSize contentSize = CGSizeMake(0,0);
-    SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame();
-    if (pFocus)
-    {
-    }
-    return contentSize;
-}
-
-extern "C"
 void touch_lo_render_windows(void *context, int minX, int minY, int width, int height)
 {
     CGContextRef cgContext = (CGContextRef) context;