summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/sheet/XSheetFilterable.idl
diff options
context:
space:
mode:
Diffstat (limited to 'offapi/com/sun/star/sheet/XSheetFilterable.idl')
-rw-r--r--offapi/com/sun/star/sheet/XSheetFilterable.idl5
1 files changed, 0 insertions, 5 deletions
diff --git a/offapi/com/sun/star/sheet/XSheetFilterable.idl b/offapi/com/sun/star/sheet/XSheetFilterable.idl
index b40437ec0fac..676e263501e8 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterable.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
#define __com_sun_star_sheet_XSheetFilterable_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
#include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
//=============================================================================
_CAIRO_CANVAS="TRUE"
fi
AC_SUBST(ENABLE_CAIRO_CANVAS)
@@ -10649,49 +10651,51 @@ dnl ===================================================================
SYSTEM_CAIRO=""
-AC_MSG_CHECKING([whether to use the system cairo])
+if test "$test_cairo" = "yes" ; then
+ AC_MSG_CHECKING([whether to use the system cairo])
-if test "$with_system_cairo" = "yes"; then
- SYSTEM_CAIRO=YES
- AC_MSG_RESULT([yes])
+ if test "$with_system_cairo" = "yes"; then
+ SYSTEM_CAIRO=YES
+ AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+ PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
- if test "$test_xrender" = "yes"; then
- if test "$with_system_xextensions_headers" != "no"; then
- AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
- AC_LANG_PUSH([C])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],[[
+ if test "$test_xrender" = "yes"; then
+ if test "$with_system_xextensions_headers" != "no"; then
+ AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
+ AC_LANG_PUSH([C])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],[[
#ifdef PictStandardA8
#else
return fail;
#endif
]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no, X headers too old.])])
- AC_LANG_POP([C])
- fi
- fi
- libo_MINGW_CHECK_DLL([CAIRO], [libcairo])
- libo_MINGW_TRY_DLL([FONTCONFIG], [libfontconfig])
- libo_MINGW_TRY_DLL([FREETYPE], [libfreetype])
- libo_MINGW_TRY_DLL([PIXMAN], [libpixman])
- libo_MINGW_TRY_DLL([PNG15], [libpng15])
-else
- AC_MSG_RESULT([no])
-
- if test $_os = WINNT; then
- dnl We only need cairo for Windows if we
- dnl build librsvg or directx disabled
- if test "$ENABLE_LIBRSVG" != NO -o -z "$ENABLE_DIRECTX"; then
- BUILD_TYPE="$BUILD_TYPE CAIRO"
+ AC_LANG_POP([C])
+ fi
fi
+ libo_MINGW_CHECK_DLL([CAIRO], [libcairo])
+ libo_MINGW_TRY_DLL([FONTCONFIG], [libfontconfig])
+ libo_MINGW_TRY_DLL([FREETYPE], [libfreetype])
+ libo_MINGW_TRY_DLL([PIXMAN], [libpixman])
+ libo_MINGW_TRY_DLL([PNG15], [libpng15])
else
- if test "$enable_cairo_canvas" = "yes"; then
- BUILD_TYPE="$BUILD_TYPE CAIRO"
+ AC_MSG_RESULT([no])
+
+ if test $_os = WINNT; then
+ dnl We only need cairo for Windows if we
+ dnl build librsvg or directx disabled
+ if test "$ENABLE_LIBRSVG" != NO -o -z "$ENABLE_DIRECTX"; then
+ BUILD_TYPE="$BUILD_TYPE CAIRO"
+ fi
else
- if test "$with_system_cairo" != "yes"; then
- if test "$ENABLE_LIBRSVG" != NO; then
- BUILD_TYPE="$BUILD_TYPE CAIRO"
+ if test "$enable_cairo_canvas" = "yes"; then
+ BUILD_TYPE="$BUILD_TYPE CAIRO"
+ else
+ if test "$with_system_cairo" != "yes"; then
+ if test "$ENABLE_LIBRSVG" != NO; then
+ BUILD_TYPE="$BUILD_TYPE CAIRO"
+ fi
fi
fi
fi