summaryrefslogtreecommitdiff
path: root/vcl/quartz
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-08-17 01:02:11 +0300
committerTor Lillqvist <tml@collabora.com>2016-08-17 18:16:10 +0300
commitfb83fd9d22e07f8a12e5f54eea60440123125717 (patch)
treea8a59a1c3f33a5192d4625152a2d8529eb0e1ed0 /vcl/quartz
parentf07b8e63fde24c04e0f496c356319440e03b4741 (diff)
Massage ifdefs etc for iOS to avoid undefineds
I think it's best to not use cairo on iOS, even if we do use it on Android. We probably want to use native APIs for the functionality that cairo would provide. Just like we do on OS X. No idea whether the resulting TiledLibreOffice will still work like it used to in May last year, when I last tried. Change-Id: Ie15cad6918d7a66e2aff7faabfcade7f3246b060
Diffstat (limited to 'vcl/quartz')
-rw-r--r--vcl/quartz/salgdicommon.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 4f90876ec2ef..907bf087c1b1 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1544,10 +1544,9 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
return nSalColor;
}
-#ifndef IOS
-
void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
+#ifndef IOS
if( !mnRealDPIY )
{
initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
@@ -1555,9 +1554,10 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
rDPIX = mnRealDPIX;
rDPIY = mnRealDPIY;
-}
-
+#else
+ rDPIX = rDPIY = 200; // FIXME
#endif
+}
void AquaSalGraphics::ImplDrawPixel( long nX, long nY, const RGBAColor& rColor )
{