[gnumeric] configure: remove redundant libgsf related checks.



commit a9bbebe532cbaa9aa1eee5eb54255a56290349f9
Author: Morten Welinder <terra gnome org>
Date:   Mon May 5 13:30:58 2014 -0400

    configure: remove redundant libgsf related checks.
    
    We already require 1.14.24 so many checks are no longer needed.

 configure.ac                          |    8 --------
 plugins/excel/xlsx-read.c             |    4 ----
 plugins/openoffice/openoffice-read.c  |    4 ----
 plugins/openoffice/openoffice-write.c |    4 ----
 4 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fdbb181..a452e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,7 +581,6 @@ LIBS="$GNUMERIC_LIBS $LIBS"
 
 AC_CHECK_FUNCS(gtk_cell_renderer_text_get_background_set gtk_cell_renderer_text_get_foreground_set 
gtk_cell_renderer_text_get_editable)
 AC_CHECK_FUNCS(gtk_entry_set_editing_cancelled)
-AC_CHECK_FUNCS(gsf_infile_msvba_steal_modules gsf_open_pkg_foreach_rel gsf_odf_out_get_version)
 
 AC_MSG_CHECKING([for PANGO_WEIGHT_THIN etc.])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pango/pango.h>]],
@@ -592,13 +591,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pango/pango.h>]],
                AC_MSG_RESULT(yes)],
               [AC_MSG_RESULT(no)])
 
-AC_MSG_CHECKING([for OO_NS_CHART_OOO])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gsf/gsf-opendoc-utils.h>]],
-                               [[(void)((int)OO_NS_CHART_OOO == 42);]])],
-               [AC_DEFINE(HAVE_OO_NS_CHART_OOO, 1, [Define if OO_NS_CHART_OOO is available])
-               AC_MSG_RESULT(yes)],
-              [AC_MSG_RESULT(no)])
-
 CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
 
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index f817510..abe9af4 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -3022,7 +3022,6 @@ xlsx_CT_HyperLinks (GsfXMLIn *xin, xmlChar const **attrs)
        sheet_style_apply_range (state->sheet, &r, style);
 }
 
-#ifdef HAVE_GSF_OPEN_PKG_FOREACH_REL
 static void
 cb_find_pivots (GsfInput *opkg, GsfOpenPkgRel const *rel, gpointer    user_data)
 {
@@ -3035,15 +3034,12 @@ cb_find_pivots (GsfInput *opkg, GsfOpenPkgRel const *rel, gpointer    user_data)
            NULL != (part_stream = gsf_open_pkg_open_rel (opkg, rel, NULL)))
                xlsx_parse_stream (state, part_stream, xlsx_pivot_table_dtd);
 }
-#endif
 
 static void
 xlsx_CT_worksheet (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 {
-#ifdef HAVE_GSF_OPEN_PKG_FOREACH_REL
        gsf_open_pkg_foreach_rel (gsf_xml_in_get_input (xin),
                &cb_find_pivots, (XLSXReadState *)xin->user_state);
-#endif
 }
 
 static void
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index b24af87..49d46c0 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -11440,9 +11440,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
                  GSF_XML_IN_NODE (CHART_AXIS, CHART_AXIS_CAT,   OO_NS_CHART, "categories", 
GSF_XML_NO_CONTENT, &od_chart_axis_categories, NULL),
                  GSF_XML_IN_NODE_FULL (CHART_AXIS, CHART_AXIS_TITLE, OO_NS_CHART, "title", 
GSF_XML_NO_CONTENT, FALSE, FALSE, &oo_chart_title, &oo_chart_title_end, .v_int = 3),
                    GSF_XML_IN_NODE (CHART_AXIS_TITLE, TEXT_CONTENT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, 
NULL, NULL),/* 2nd Def */
-#ifdef HAVE_OO_NS_CHART_OOO
                GSF_XML_IN_NODE (CHART_PLOT_AREA, CHART_OOO_COORDINATE_REGION, OO_NS_CHART_OOO, 
"coordinate-region", GSF_XML_NO_CONTENT, NULL, NULL),
-#endif
            GSF_XML_IN_NODE (SPREADSHEET, TABLE, OO_NS_TABLE, "table", GSF_XML_NO_CONTENT, &oo_table_start, 
&oo_table_end),
              GSF_XML_IN_NODE (TABLE, SHEET_SELECTIONS, OO_GNUM_NS_EXT, "selections", GSF_XML_NO_CONTENT, 
&odf_selection, &odf_selection_end),
                GSF_XML_IN_NODE (SHEET_SELECTIONS, SELECTION, OO_GNUM_NS_EXT, "selection", 
GSF_XML_NO_CONTENT, &odf_selection_range, NULL),
@@ -11713,9 +11711,7 @@ static GsfXMLInNode const opendoc_content_preparse_dtd [] =
                  GSF_XML_IN_NODE (CHART_AXIS, CHART_AXIS_CAT,   OO_NS_CHART, "categories", 
GSF_XML_NO_CONTENT, NULL, NULL),
                  GSF_XML_IN_NODE_FULL (CHART_AXIS, CHART_AXIS_TITLE, OO_NS_CHART, "title", 
GSF_XML_NO_CONTENT, FALSE, FALSE, NULL, NULL, .v_int = 3),
                    GSF_XML_IN_NODE (CHART_AXIS_TITLE, TEXT_CONTENT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, 
NULL, NULL),/* 2nd Def */
-#ifdef HAVE_OO_NS_CHART_OOO
                GSF_XML_IN_NODE (CHART_PLOT_AREA, CHART_OOO_COORDINATE_REGION, OO_NS_CHART_OOO, 
"coordinate-region", GSF_XML_NO_CONTENT, NULL, NULL),
-#endif
            GSF_XML_IN_NODE (SPREADSHEET, TABLE, OO_NS_TABLE, "table", GSF_XML_NO_CONTENT, 
&odf_preparse_table_start, &odf_preparse_table_end),
              GSF_XML_IN_NODE (TABLE, SHEET_SELECTIONS, OO_GNUM_NS_EXT, "selections", GSF_XML_NO_CONTENT, 
NULL, NULL),
                GSF_XML_IN_NODE (SHEET_SELECTIONS, SELECTION, OO_GNUM_NS_EXT, "selection", 
GSF_XML_NO_CONTENT, NULL, NULL),
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 7dd0c4a..941fe5e 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -4730,14 +4730,10 @@ odf_write_named_expression (G_GNUC_UNUSED gpointer key, GnmNamedExpr *nexpr,
 static GsfXMLOut *
 create_new_xml_child (G_GNUC_UNUSED GnmOOExport *state, GsfOutput *child)
 {
-#ifdef HAVE_GSF_ODF_OUT_GET_VERSION
        return g_object_new (GSF_ODF_OUT_TYPE,
                             "sink", child,
                             "odf-version", state->odf_version,
                             NULL);
-#else
-       return gsf_xml_out_new (child);
-#endif
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]