summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-12-20 15:27:50 +0100
committerMichael Meeks <michael.meeks@collabora.com>2020-01-01 23:42:25 +0100
commit736c330308e117a6536ef111fa09293c6ba0d2d8 (patch)
tree9b3ecfe23be8d946942914756b46c57718993aab /vcl
parent0189b87349f0589cb2e85897ef83c67b331024f0 (diff)
android: Make the Calc input bar working on the Android device too.
Thanks to Marco Ceccheti! - he's found what was wrong there. Change-Id: I45500f7f55ced60965a42ad6cb8032481594b409 Reviewed-on: https://gerrit.libreoffice.org/85612 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86089 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpgdi.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 7554ab1337ed..1bd55104c491 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -2170,14 +2170,21 @@ bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const
void dl_cairo_surface_set_device_scale(cairo_surface_t *surface, double x_scale, double y_scale)
{
+#ifdef ANDROID
+ cairo_surface_set_device_scale(surface, x_scale, y_scale);
+#else
static auto func = reinterpret_cast<void(*)(cairo_surface_t*, double, double)>(
dlsym(nullptr, "cairo_surface_set_device_scale"));
if (func)
func(surface, x_scale, y_scale);
+#endif
}
void dl_cairo_surface_get_device_scale(cairo_surface_t *surface, double* x_scale, double* y_scale)
{
+#ifdef ANDROID
+ cairo_surface_get_device_scale(surface, x_scale, y_scale);
+#else
static auto func = reinterpret_cast<void(*)(cairo_surface_t*, double*, double*)>(
dlsym(nullptr, "cairo_surface_get_device_scale"));
if (func)
@@ -2189,6 +2196,7 @@ void dl_cairo_surface_get_device_scale(cairo_surface_t *surface, double* x_scale
if (y_scale)
*y_scale = 1.0;
}
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */