[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source

[Michael Meeks]

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

New commits:
commit 284fd74d34c0185743efbc19f1f7f3422e49835a
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.
    
    Signed-off-by: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>

diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 9f99f27..ef86102 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -47,6 +47,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 )