include/touch/touch.h | 2 +- sw/source/core/view/viewsh.cxx | 12 ------------ vcl/ios/iosinst.cxx | 11 +++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit 8e22438b560121b74f588cef19891b4e2c3e45a6 Author: Ptyl Dragon <p...@cloudon.com> Date: Tue Oct 29 16:22:06 2013 +0200 changed to CGSize Change-Id: Ic84fcadf4332210693586825cdd8e32ef0f2a727 diff --git a/include/touch/touch.h b/include/touch/touch.h index a480fb6..ae4f491 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -111,7 +111,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); -Size touch_lo_get_content_size(); +CGSize 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 9427b3d..c4a8dd8 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1772,7 +1772,6 @@ void ViewShell::PaintTile(OutputDevice *pOut, const Rectangle &rRect) } #if !HAVE_FEATURE_DESKTOP - extern "C" void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int tilePosX, int tilePosY, int tileWidth, int tileHeight) { @@ -1814,17 +1813,6 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int contextHeight); } } - -extern "C" -Size touch_lo_get_content_size() -{ - SwWrtShell *pViewShell = GetActiveWrtShell(); - Size contentSize(0,0); - if (pViewShell) - { - } - return contentSize; -} #endif extern "C" void touch_ui_selection_none() {} diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 39208f5..d6e580a 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -415,6 +415,17 @@ 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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits