diff options
author | Ptyl Dragon <ptyl@cloudon.com> | 2013-10-29 18:12:00 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2013-11-15 16:51:56 +0100 |
commit | 2c27c563efcdace98e37da1dbc4824df7267ceaa (patch) | |
tree | 191ce45ea9574ddad7d5a607bafa691ef42af145 | |
parent | Need to acquire SolarMutex while using a VirtualDevice (diff) | |
download | core-2c27c563efcdace98e37da1dbc4824df7267ceaa.tar.gz core-2c27c563efcdace98e37da1dbc4824df7267ceaa.zip |
created a long long unit for MLOContentSize
Change-Id: I41910058088161119d3cae8ca625d456652d890f
-rw-r--r-- | include/touch/touch.h | 15 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 9 | ||||
-rw-r--r-- | vcl/ios/iosinst.cxx | 11 |
3 files changed, 23 insertions, 12 deletions
diff --git a/include/touch/touch.h b/include/touch/touch.h index 0041038ba934..6fba7bd9b737 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -90,6 +90,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, @@ -132,7 +145,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 14bf6eb8b30c..d0f27e8bea94 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1815,6 +1815,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 d6e580a84a9b..39208f53ca56 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; |