diff -Nurb a/plugins/wmf/plugin.m4 b/plugins/wmf/plugin.m4 --- a/plugins/wmf/plugin.m4 2012-04-30 16:15:10.000000000 +0200 +++ b/plugins/wmf/plugin.m4 2012-08-07 10:52:51.000000000 +0200 @@ -7,15 +7,6 @@ AC_PATH_PROG(libwmfconfig, libwmf-config) ]) -AC_ARG_WITH([standard_symbols_l], - [AS_HELP_STRING([--with-standard-symbols-l], [use font family 'Standard Symbols L' for Symbol])], -[ - abi_cv_standard_symbols_l="$withval" -]) -if test "$abi_cv_standard_symbols_l" = "yes"; then - AC_DEFINE([WITH_STANDARD_SYMBOLS_L], [1], [Use font family 'Standard Symbols L' for Symbol]) -fi - # The required libwmf version, as reported by libwmf-config libwmf_major_req=0 libwmf_minor_req=2 diff -Nurb a/src/af/gr/xp/gr_CairoGraphics.cpp b/src/af/gr/xp/gr_CairoGraphics.cpp --- a/src/af/gr/xp/gr_CairoGraphics.cpp 2012-08-07 10:39:58.000000000 +0200 +++ b/src/af/gr/xp/gr_CairoGraphics.cpp 2012-08-07 10:45:00.000000000 +0200 @@ -2548,11 +2548,7 @@ if (szLCFontName) { xxx_UT_DEBUGMSG(("GR_CairoGraphics::setFont: %s\n", szLCFontName)); -#ifdef WITH_STANDARD_SYMBOLS_L - if(strstr(szLCFontName,"standard symbols l") != NULL) -#else if(strstr(szLCFontName,"symbol") != NULL) -#endif { /* * I am not too happy about this, and do not want to see the exception diff -Nurb a/src/text/ptbl/xp/pt_PT_Styles.cpp b/src/text/ptbl/xp/pt_PT_Styles.cpp --- a/src/text/ptbl/xp/pt_PT_Styles.cpp 2012-08-07 10:40:03.000000000 +0200 +++ b/src/text/ptbl/xp/pt_PT_Styles.cpp 2012-08-07 10:48:01.000000000 +0200 @@ -19,9 +19,6 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "ut_locale.h" #include "ut_types.h" #include "ut_misc.h" diff -Nurb a/src/wp/ap/xp/ap_Dialog_Lists.cpp b/src/wp/ap/xp/ap_Dialog_Lists.cpp --- a/src/wp/ap/xp/ap_Dialog_Lists.cpp 2012-08-07 10:40:03.000000000 +0200 +++ b/src/wp/ap/xp/ap_Dialog_Lists.cpp 2012-08-07 10:48:53.000000000 +0200 @@ -21,10 +21,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "ap_Features.h" #include "ut_assert.h" diff -Nurb a/src/wp/impexp/xp/ie_imp_RTF.cpp b/src/wp/impexp/xp/ie_imp_RTF.cpp --- a/src/wp/impexp/xp/ie_imp_RTF.cpp 2012-07-31 09:54:40.000000000 +0200 +++ b/src/wp/impexp/xp/ie_imp_RTF.cpp 2012-08-07 10:46:34.000000000 +0200 @@ -358,19 +358,11 @@ FieldFont = m_pParaProps->m_pszFieldFont; if(abiListType == BULLETED_LIST) { -#ifdef WITH_STANDARD_SYMBOLS_L - FieldFont = "Standard Symbols L"; -#else FieldFont = "Symbol"; -#endif } if(abiListType == IMPLIES_LIST) { -#ifdef WITH_STANDARD_SYMBOLS_L - FieldFont = "Standard Symbols L"; -#else FieldFont = "Symbol"; -#endif } *szFieldFont = FieldFont.c_str(); //