[Libreoffice-commits] .: canvas/source

[Michael Meeks]

 canvas/source/cairo/cairo_services.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit b0547b358b2262a7f75b932ba37f35155a5c2406
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Apr 23 16:58:59 2012 +0100

    bomb out compilation of cairo canvas for mac or windows
    
    This is to avoid unintended regressions based on configure options.

diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index dfb694f..f9ca5d6 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -46,6 +46,10 @@
 
 using namespace ::com::sun::star;
 
+#if defined(WNT) || defined (MACOSX)
+#  error "The cairo canvas should not be enabled on Windows or Mac cf fdo#46901"
+#endif
+
 namespace cairocanvas
 {
     static uno::Reference<uno::XInterface> initCanvas( Canvas* pCanvas )