Commit adc4b852 authored by Jody Goldberg's avatar Jody Goldberg
Browse files

Fix last minute header change.

parent bedb925b
......@@ -10,6 +10,7 @@
#include "parse-util.h"
#include "func.h"
#include "cell.h"
#include "rendered-value.h"
/* Type definitions */
......
......@@ -22,6 +22,7 @@
#include "colrow.h"
#include "dialogs.h"
#include "border.h"
#include "rendered-value.h"
/*
* NOTE : This is a work in progress
......
......@@ -17,7 +17,7 @@
#include "func.h"
#include "ranges.h"
#include "analysis-tools.h"
#include "rendered-value.h"
#define OK 0
#define N_COLUMNS_ERROR 1
......
......@@ -21,6 +21,7 @@
#include "ranges.h"
#include "commands.h"
#include "workbook.h"
#include "rendered-value.h"
#include "sort.h"
#define GLADE_FILE "cell-sort.glade"
......
......@@ -33,7 +33,7 @@ eval_pos_init (EvalPosition *eval_pos, Sheet *sheet, CellPos const *pos)
}
EvalPosition *
eval_pos_cell (EvalPosition *eval_pos, Cell *cell)
eval_pos_cell (EvalPosition *eval_pos, Cell const *cell)
{
CellPos pos;
g_return_val_if_fail (cell != NULL, NULL);
......@@ -73,7 +73,7 @@ parse_pos_init (ParsePosition *pp, Workbook *wb, Sheet *sheet, int col, int row)
}
ParsePosition *
parse_pos_cell (ParsePosition *pp, Cell *cell)
parse_pos_cell (ParsePosition *pp, Cell const *cell)
{
g_return_val_if_fail (pp != NULL, NULL);
g_return_val_if_fail (cell != NULL, NULL);
......
......@@ -113,11 +113,11 @@ struct _FunctionEvalInfo {
/* Transition functions */
EvalPosition *eval_pos_init (EvalPosition *pp, Sheet *s, CellPos const *pos);
EvalPosition *eval_pos_cell (EvalPosition *pp, Cell *);
EvalPosition *eval_pos_cell (EvalPosition *pp, Cell const * cell);
EvalPosition *eval_pos_cellref (EvalPosition *dest,
EvalPosition const *src, CellRef const *);
ParsePosition *parse_pos_init (ParsePosition *pp, Workbook *wb, Sheet *sheet, int col, int row);
ParsePosition *parse_pos_cell (ParsePosition *pp, Cell *);
ParsePosition *parse_pos_cell (ParsePosition *pp, Cell const * cell);
ParsePosition *parse_pos_evalpos (ParsePosition *pp, EvalPosition const *pos);
/*
......
......@@ -148,6 +148,7 @@ CurrencySymbol const currency_symbols[] =
{ "", "None" }, /* These fist three elements */
{ "$", "$" }, /* Must stay in this order */
{ "", "" },
/* TODO : Add yen and euro */
/* The first column has three letter acronyms
* for each currency. They MUST start with '[$'
......@@ -196,6 +197,7 @@ CurrencySymbol const currency_symbols[] =
{N_("[$EGP]"), N_("Egyptian pound") },
{N_("[$ESP]"), N_("Spanish peseta") },
{N_("[$ETB]"), N_("Ethiopian birr") },
{N_("[$EUR]"), N_("Euro") },
{N_("[$FIM]"), N_("Finnish markka") },
{N_("[$FJD]"), N_("Fiji dollar") },
{N_("[$FKP]"), N_("Falkland Islands pound") },
......
......@@ -10,6 +10,7 @@
#include "parse-util.h"
#include "func.h"
#include "cell.h"
#include "rendered-value.h"
/* Type definitions */
......
......@@ -29,6 +29,8 @@
#include "cell.h"
#include "sheet.h"
#include "format.h"
#include "value.h"
#include "parse-util.h"
#include "sheet-view.h"
/*
......
......@@ -676,14 +676,14 @@ sheet_range_apply_style (Sheet *sheet,
const Range *range,
MStyle *style)
{
gboolean const size_change =
gboolean const font_change =
(mstyle_is_element_set (style, MSTYLE_FONT_NAME) ||
mstyle_is_element_set (style, MSTYLE_FONT_BOLD) ||
mstyle_is_element_set (style, MSTYLE_FONT_ITALIC) ||
mstyle_is_element_set (style, MSTYLE_FONT_UNDERLINE) ||
mstyle_is_element_set (style, MSTYLE_FONT_SIZE));
gboolean const format_change =
mstyle_is_element_set (style, MSTYLE_FORMAT)
mstyle_is_element_set (style, MSTYLE_FORMAT);
SpanCalcFlags spanflags =
format_change ? SPANCALC_RENDER|SPANCALC_RESIZE
......@@ -695,7 +695,7 @@ sheet_range_apply_style (Sheet *sheet,
sheet_range_calc_spans (sheet, *range, spanflags);
if (format_change || font_change)
rows_height_update (me->sheet, l->data);
rows_height_update (sheet, range);
sheet_redraw_range (sheet, range);
}
......
......@@ -13,6 +13,7 @@
#include "workbook-view.h"
#include "parse-util.h"
#include "sort.h"
#include "rendered-value.h"
#include "value.h"
#include <stdlib.h>
......
......@@ -38,6 +38,7 @@
#include "widgets/gtk-combo-text.h"
#include "wizard.h"
#include "gutils.h"
#include "rendered-value.h"
#ifdef ENABLE_BONOBO
#include <bonobo/bonobo-persist-file.h>
......
......@@ -23,6 +23,7 @@
#include "sheet-object-graphic.h"
#include "print-info.h"
#include "xml-io.h"
#include "rendered-value.h"
#include "file.h"
#include "expr.h"
#include "expr-name.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment