[gnumeric] Compilation: cleanup.



commit d480fe3e13c8ae9d6ee2c9d6230f253474c3fc1d
Author: Morten Welinder <terra gnome org>
Date:   Mon Jan 19 21:34:06 2015 -0500

    Compilation: cleanup.

 src/gui-util.c                    |    2 +-
 src/gui-util.h                    |    1 -
 src/rendered-value.c              |   59 -------------------------------------
 src/rendered-value.h              |    2 -
 src/tools/analysis-tools.c        |    5 +--
 src/tools/analysis-tools.h        |    8 -----
 src/widgets/gnumeric-expr-entry.c |   19 ------------
 src/widgets/gnumeric-expr-entry.h |    3 --
 8 files changed, 3 insertions(+), 96 deletions(-)
---
diff --git a/src/gui-util.c b/src/gui-util.c
index 13fcd45..63b8897 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -69,7 +69,7 @@ insert_error_info (GtkTextBuffer* text, GOErrorInfo *error, gint level)
  * SHOULD BE IN GOFFICE
  * Returns: (transfer full): the newly allocated dialog.
  */
-GtkWidget *
+static GtkWidget *
 gnumeric_go_error_info_list_dialog_create (GSList *errs)
 {
        GtkWidget *dialog;
diff --git a/src/gui-util.h b/src/gui-util.h
index 64abce2..51ff797 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -13,7 +13,6 @@ G_BEGIN_DECLS
        void name (GtkAction *a, WBCGtk *wbcg)
 
 GtkWidget* gnumeric_go_error_info_dialog_create (GOErrorInfo *error);
-GtkWidget* gnumeric_go_error_info_list_dialog_create (GSList *errs);
 void       gnumeric_go_error_info_dialog_show (GtkWindow *parent,
                                               GOErrorInfo *error);
 void       gnumeric_go_error_info_list_dialog_show (GtkWindow *parent,
diff --git a/src/rendered-value.c b/src/rendered-value.c
index 5e0ecc4..541858b 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -571,65 +571,6 @@ gnm_rendered_value_destroy (GnmRenderedValue *rv)
                CHUNK_FREE (rendered_value_pool, rv);
 }
 
-/**
- * gnm_rendered_value_recontext: (skip)
- * @rv: #GnmRenderedValue
- * @context: the new Pango context.
- *
- * Returns:
- **/
-GnmRenderedValue *
-gnm_rendered_value_recontext (GnmRenderedValue *rv, PangoContext *context)
-{
-       GnmRenderedValue *res;
-       PangoLayout *layout, *olayout;
-
-       if (rv->rotation) {
-               GnmRenderedRotatedValue *rres =
-                       CHUNK_ALLOC (GnmRenderedRotatedValue, rendered_rotated_value_pool);
-               res = (GnmRenderedValue *)rres;
-
-               *rres = *(GnmRenderedRotatedValue *)rv;
-               rres->lines = g_memdup (rres->lines,
-                                       rres->linecount * sizeof (struct GnmRenderedRotatedValueInfo));
-       } else {
-               res = CHUNK_ALLOC (GnmRenderedValue, rendered_value_pool);
-               *res = *rv;
-       }
-
-       res->layout = layout = pango_layout_new (context);
-       olayout = rv->layout;
-
-       pango_layout_set_text (layout, pango_layout_get_text (olayout), -1);
-       pango_layout_set_alignment (layout, pango_layout_get_alignment (olayout));
-       pango_layout_set_attributes (layout, pango_layout_get_attributes (olayout));
-       pango_layout_set_single_paragraph_mode (layout, pango_layout_get_single_paragraph_mode (olayout));
-       pango_layout_set_justify (layout, pango_layout_get_justify (olayout));
-       pango_layout_set_width (layout, pango_layout_get_width (olayout));
-       pango_layout_set_spacing (layout, pango_layout_get_spacing (olayout));
-       pango_layout_set_wrap (layout, pango_layout_get_wrap (olayout));
-       pango_layout_set_indent (layout, pango_layout_get_indent (olayout));
-       pango_layout_set_auto_dir (layout, pango_layout_get_auto_dir (olayout));
-       pango_layout_set_ellipsize (layout, pango_layout_get_ellipsize (olayout));
-       pango_layout_set_font_description (layout, pango_layout_get_font_description (olayout));
-       /* ignore tabs */
-
-       /*
-        * We really want to keep the line breaks, but currently pango
-        * does not support that.
-        */
-       if (pango_layout_get_line_count (olayout) == 1) {
-               if (pango_layout_get_line_count (layout) > 1) {
-                       res->wrap_text = FALSE;
-                       pango_layout_set_width (layout, -1);
-               }
-       }
-
-       gnm_rendered_value_remeasure (res);
-       return res;
-}
-
-
 /* Return the value as a single string without format infomation.
  */
 char const *
diff --git a/src/rendered-value.h b/src/rendered-value.h
index 9eb30f3..1b45b94 100644
--- a/src/rendered-value.h
+++ b/src/rendered-value.h
@@ -46,8 +46,6 @@ GnmRenderedValue *gnm_rendered_value_new       (GnmCell const *cell,
                                                double zoom);
 void              gnm_rendered_value_destroy   (GnmRenderedValue *rv);
 
-GnmRenderedValue *gnm_rendered_value_recontext (GnmRenderedValue *rv,
-                                               PangoContext *context);
 void              gnm_rendered_value_remeasure (GnmRenderedValue *rv);
 
 /* Return the value as a single string without format infomation.  */
diff --git a/src/tools/analysis-tools.c b/src/tools/analysis-tools.c
index bb39cad..8885f71 100644
--- a/src/tools/analysis-tools.c
+++ b/src/tools/analysis-tools.c
@@ -128,8 +128,7 @@ cb_adjust_areas (gpointer data, G_GNUC_UNUSED gpointer user_data)
  *  analysis_tools_remove_label:
  *
  */
-
-void
+static void
 analysis_tools_remove_label (GnmValue *val,
                             gboolean labels, group_by_t group_by)
 {
@@ -208,7 +207,7 @@ analysis_tools_write_label (GnmValue *val, data_analysis_output_t *dao,
  *
  */
 
-void
+static void
 analysis_tools_write_a_label (GnmValue *val, data_analysis_output_t *dao,
                              gboolean   labels, group_by_t group_by,
                              int x, int y)
diff --git a/src/tools/analysis-tools.h b/src/tools/analysis-tools.h
index 5c5e052..6aeef6f 100644
--- a/src/tools/analysis-tools.h
+++ b/src/tools/analysis-tools.h
@@ -242,14 +242,6 @@ void analysis_tools_write_label_ftest (GnmValue *val, /* depreceated */
                                       data_analysis_output_t *dao,
                                       int x, int y,
                                       gboolean labels, int i);
-void analysis_tools_write_a_label     (GnmValue *val,
-                                      data_analysis_output_t *dao,
-                                      gboolean   labels,
-                                      group_by_t group_by,
-                                      int x, int y);
-void analysis_tools_remove_label      (GnmValue *val,
-                                      gboolean labels,
-                                      group_by_t group_by);
 
 gboolean analysis_tool_table (data_analysis_output_t *dao,
                              analysis_tools_data_generic_t *info,
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index dd75fad..620f8f3 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -2844,25 +2844,6 @@ gnm_expr_entry_editing_canceled (GnmExprEntry *gee)
 /*****************************************************************************/
 
 void
-gnm_expr_entry_disable_highlight (GnmExprEntry *gee)
-{
-       g_return_if_fail (gee != NULL);
-       gee_destroy_feedback_range (gee);
-       gee->feedback_disabled = TRUE;
-}
-
-void
-gnm_expr_entry_enable_highlight (GnmExprEntry *gee)
-{
-       g_return_if_fail (gee != NULL);
-       gee->feedback_disabled = FALSE;
-       gee_update_lexer_items (gee);
-       gee_scan_for_range (gee);
-}
-
-/*****************************************************************************/
-
-void
 gnm_expr_entry_disable_tips (GnmExprEntry *gee)
 {
        g_return_if_fail (gee != NULL);
diff --git a/src/widgets/gnumeric-expr-entry.h b/src/widgets/gnumeric-expr-entry.h
index a6cdaeb..9f87b71 100644
--- a/src/widgets/gnumeric-expr-entry.h
+++ b/src/widgets/gnumeric-expr-entry.h
@@ -80,9 +80,6 @@ void gnm_expr_entry_set_update_policy (GnmExprEntry *gee,
                                            GnmUpdateType  policy);
 void gnm_expr_entry_grab_focus (GnmExprEntry *gee, gboolean select_all);
 
-void    gnm_expr_entry_disable_highlight (GnmExprEntry *gee);
-void    gnm_expr_entry_enable_highlight  (GnmExprEntry *gee);
-
 void    gnm_expr_entry_close_tips  (GnmExprEntry *gee);
 void    gnm_expr_entry_enable_tips  (GnmExprEntry *gee);
 void    gnm_expr_entry_disable_tips  (GnmExprEntry *gee);


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