diff options
| author | Mox Soini <mox@iki.fi> | 2015-06-02 23:52:56 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-11 08:35:09 +0000 |
| commit | 0c87f8bf42ba0338dbf6516dc9539223a5dedf4c (patch) | |
| tree | b2257ea435d70bf8e5bc00f0529f6dabf6e563b5 /vcl/source/outdev/outdev.cxx | |
| parent | 776a3f14f2d987312b926ebc1ad09321a3a87f0d (diff) | |
Cleanup crossplatform cairo
Mac / Win cairo is not built / used, this cairo code can be removed to
reduce code bloat.
4th Revised version with Android fixes
Change-Id: I6e56850f535ca13b77839b7d67e227c5f39d388e
Reviewed-on: https://gerrit.libreoffice.org/16218
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/source/outdev/outdev.cxx')
| -rw-r--r-- | vcl/source/outdev/outdev.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 2ae452e70d63..0b6d0aa7ec01 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -324,9 +324,10 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const return mpGraphics->GetGraphicsData(); } +#if ENABLE_CAIRO_CANVAS + bool OutputDevice::SupportsCairo() const { -#if ENABLE_CAIRO_CANVAS if (!mpGraphics) { if (!AcquireGraphics()) @@ -334,10 +335,6 @@ bool OutputDevice::SupportsCairo() const } return mpGraphics->SupportsCairo(); -#else - (void) this; // loplugin:staticmethods - return false; -#endif } cairo::SurfaceSharedPtr OutputDevice::CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const @@ -380,6 +377,8 @@ css::uno::Any OutputDevice::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSur return mpGraphics->GetNativeSurfaceHandle(rSurface, rSize); } +#endif // ENABLE_CAIRO_CANVAS + css::uno::Any OutputDevice::GetSystemGfxDataAny() const { const SystemGraphicsData aSysData = GetSystemGfxData(); |