diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-06-05 14:00:34 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-05 14:00:34 +0200 |
| commit | d79fa4ee0fd5b6e9787838f74cc45c9c9b93a5b3 (patch) | |
| tree | 6ffe77e049063b10b2e58c04f6f28409f4089e7c /vcl/source/outdev/outdev.cxx | |
| parent | 0394d49a70e14e176c047ced39e2e754fcc26f3d (diff) | |
Revert "Cleanup crossplatform cairo"
Unfortunately this breaks Android and iOS.
This reverts commit e4d55e8045c99af65a2cae57b26ec076825c9673.
Diffstat (limited to 'vcl/source/outdev/outdev.cxx')
| -rw-r--r-- | vcl/source/outdev/outdev.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 0b6d0aa7ec01..2ae452e70d63 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -324,10 +324,9 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const return mpGraphics->GetGraphicsData(); } -#if ENABLE_CAIRO_CANVAS - bool OutputDevice::SupportsCairo() const { +#if ENABLE_CAIRO_CANVAS if (!mpGraphics) { if (!AcquireGraphics()) @@ -335,6 +334,10 @@ bool OutputDevice::SupportsCairo() const } return mpGraphics->SupportsCairo(); +#else + (void) this; // loplugin:staticmethods + return false; +#endif } cairo::SurfaceSharedPtr OutputDevice::CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const @@ -377,8 +380,6 @@ 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(); |