diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-01-17 00:28:33 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-16 15:39:09 +0000 |
| commit | 7d432a9e67076b862cbdfc16199d5a72664d28f5 (patch) | |
| tree | 2160886fc4a5d33f0f9563741d9399a4ed10b7ad /vcl | |
| parent | ee99613941d78030e8abbca7d7554cf7e802f6d9 (diff) | |
Remove defines now that fontconfig baseline has been updated
Change-Id: Ia97ab24e60785be36f475f6bf275a0ae336e9408
Reviewed-on: https://gerrit.libreoffice.org/7461
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontconfig.cxx | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 5eff5bf7ee26..0069f5f3f34d 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -37,41 +37,6 @@ using namespace psp; #include <fontconfig/fontconfig.h> #include <ft2build.h> #include <fontconfig/fcfreetype.h> -// allow compile on baseline (currently with fontconfig 2.2.0) -#ifndef FC_WEIGHT_BOOK // TODO: remove when baseline moves to fc>=2.2.1 - #define FC_WEIGHT_BOOK 75 -#endif -#ifndef FC_EMBEDDED_BITMAP // TODO: remove when baseline moves to fc>=2.3.92 - #define FC_EMBEDDED_BITMAP "embeddedbitmap" -#endif -#ifndef FC_FAMILYLANG // TODO: remove when baseline moves to fc>=2.2.97 - #define FC_FAMILYLANG "familylang" -#endif -#ifndef FC_CAPABILITY // TODO: remove when baseline moves to fc>=2.2.97 - #define FC_CAPABILITY "capability" -#endif -#ifndef FC_STYLELANG // TODO: remove when baseline moves to fc>=2.2.97 - #define FC_STYLELANG "stylelang" -#endif -#ifndef FC_HINT_STYLE // TODO: remove when baseline moves to fc>=2.2.91 - #define FC_HINT_STYLE "hintstyle" - #define FC_HINT_NONE 0 - #define FC_HINT_SLIGHT 1 - #define FC_HINT_MEDIUM 2 - #define FC_HINT_FULL 3 -#endif -#ifndef FC_FT_FACE - #define FC_FT_FACE "ftface" -#endif -#ifndef FC_EMBOLDEN - #define FC_EMBOLDEN "embolden" -#endif -#ifndef FC_MATRIX - #define FC_MATRIX "matrix" -#endif -#ifndef FC_FONTFORMAT - #define FC_FONTFORMAT "fontformat" -#endif #if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) #include <dbus/dbus-glib.h> |