diff options
| author | Ptyl Dragon <ptyl@cloudon.com> | 2013-10-29 16:22:06 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-11-15 16:51:55 +0100 |
| commit | 46f2b5388c1d7d1de3aa86054f28d2555634a8d9 (patch) | |
| tree | 63fd4d6611f56f21d3c3f5277f49138d6a9090f6 | |
| parent | 53001c774adbe2da8a4cb536a026a6f4cd4d8674 (diff) | |
changed to CGSize
Change-Id: Ic84fcadf4332210693586825cdd8e32ef0f2a727
| -rw-r--r-- | include/touch/touch.h | 2 | ||||
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 12 | ||||
| -rw-r--r-- | vcl/ios/iosinst.cxx | 11 |
3 files changed, 12 insertions, 13 deletions
diff --git a/include/touch/touch.h b/include/touch/touch.h index 8d9064cc5bcf..0041038ba934 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -132,7 +132,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 c6cf0d324a9b..aff6c529a116 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1770,7 +1770,6 @@ void SwViewShell::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) { @@ -1812,17 +1811,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 39208f53ca56..d6e580a84a9b 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; |