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/headless | |
| 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/headless')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 5 | ||||
| -rw-r--r-- | vcl/headless/svptext.cxx | 5 | ||||
| -rw-r--r-- | vcl/headless/svptextrender.cxx | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 0f184fddbf6f..13f93cff3e5e 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -25,6 +25,7 @@ #include "saldatabasic.hxx" #include <vcl/sysdata.hxx> +#include <config_cairo_canvas.h> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2ibox.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -735,6 +736,8 @@ bool SvpSalGraphics::supportsOperation( OutDevSupportType ) const #endif +#if ENABLE_CAIRO_CANVAS + bool SvpSalGraphics::SupportsCairo() const { return false; @@ -760,4 +763,6 @@ css::uno::Any SvpSalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& /* return css::uno::Any(); } +#endif // ENABLE_CAIRO_CANVAS + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 1651a3a49c5d..9eb39f263b69 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -20,6 +20,7 @@ #include <sal/types.h> #include <basegfx/range/b2ibox.hxx> #include "headless/svpgdi.hxx" +#include <config_cairo_canvas.h> sal_uInt16 SvpSalGraphics::SetFont( FontSelectPattern* pIFSD, int nFallbackLevel ) { @@ -123,11 +124,15 @@ void SvpSalGraphics::SetTextColor( SalColor nSalColor ) m_xTextRenderImpl->SetTextColor(nSalColor); } +#if ENABLE_CAIRO_CANVAS + SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const { return m_xTextRenderImpl->GetSysFontData(nFallbacklevel); } +#endif // ENABLE_CAIRO_CANVAS + void SvpSalGraphics::BlendTextColor(const basebmp::Color &rTextColor, const basebmp::BitmapDeviceSharedPtr &rAlphaMask, const basegfx::B2IPoint &rDstPoint) { diff --git a/vcl/headless/svptextrender.cxx b/vcl/headless/svptextrender.cxx index af28eb302357..a2acf005e4e8 100644 --- a/vcl/headless/svptextrender.cxx +++ b/vcl/headless/svptextrender.cxx @@ -28,6 +28,7 @@ #include <rtl/instance.hxx> #include <tools/debug.hxx> #include <vcl/sysdata.hxx> +#include <config_cairo_canvas.h> #include "generic/geninst.h" #include "generic/genpspgraphics.h" @@ -447,6 +448,8 @@ void SvpTextRender::SetTextColor( SalColor nSalColor ) m_aTextColor = basebmp::Color( nSalColor ); } +#if ENABLE_CAIRO_CANVAS + SystemFontData SvpTextRender::GetSysFontData( int nFallbackLevel ) const { SystemFontData aSysFontData; @@ -468,6 +471,8 @@ SystemFontData SvpTextRender::GetSysFontData( int nFallbackLevel ) const return aSysFontData; } +#endif // ENABLE_CAIRO_CANVAS + void SvpTextRender::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice ) { // determine matching bitmap format for masks |