Commit f6b62c13 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

Remove inclusion of cell.h. Adjust includes to loosen things a bit more.


2000-02-10  Jody Goldberg <jgoldberg@home.com>

	* src/sheet.h : Remove inclusion of cell.h.  Adjust includes to loosen
	  things a bit more.

	* src/colrow.h : Remove margin_a_pt margin_b_pt.  Margins are NOT
	  scaled by resolution or zoom.
	  Rename units -> size_pts and store as float rather than double.
	  Rename pixels-> size_pixels
	  hard_size -> use gboolean rather than a 1 element bitfield

	* src/style.h : Move the typedefs from here.
	* src/gnumeric.h : to here.

	*.[ch] : Catch up with the renames and include changes.
parent 4dfac701
2000-02-10 Jody Goldberg <jgoldberg@home.com>
* src/sheet.h : Remove inclusion of cell.h. Adjust includes to loosen
things a bit more.
* src/colrow.h : Remove margin_a_pt margin_b_pt. Margins are NOT
scaled by resolution or zoom.
Rename units -> size_pts and store as float rather than double.
Rename pixels-> size_pixels
hard_size -> use gboolean rather than a 1 element bitfield
* src/style.h : Move the typedefs from here.
* src/gnumeric.h : to here.
*.[ch] : Catch up with the renames and include changes.
2000-02-09 Jody Goldberg <jgoldberg@home.com>
* src/workbook.c (change_displayed_zoom_cb) : Add a '%' at the end of
......
2000-02-10 Jody Goldberg <jgoldberg@home.com>
* src/sheet.h : Remove inclusion of cell.h. Adjust includes to loosen
things a bit more.
* src/colrow.h : Remove margin_a_pt margin_b_pt. Margins are NOT
scaled by resolution or zoom.
Rename units -> size_pts and store as float rather than double.
Rename pixels-> size_pixels
hard_size -> use gboolean rather than a 1 element bitfield
* src/style.h : Move the typedefs from here.
* src/gnumeric.h : to here.
*.[ch] : Catch up with the renames and include changes.
2000-02-09 Jody Goldberg <jgoldberg@home.com>
* src/workbook.c (change_displayed_zoom_cb) : Add a '%' at the end of
......
......@@ -18,6 +18,7 @@
#include <gnome.h>
#include "plugin.h"
#include "gnumeric.h"
#include "cell.h"
#include "workbook.h"
#include "file.h"
#include "command-context.h"
......
......@@ -16,6 +16,8 @@
#include "ms-excel-read.h"
#include "ms-escher.h"
#include "utils.h"
#include "style.h"
#include "expr.h"
#include "gnumeric-chart.h"
/* #define NO_DEBUG_EXCEL */
......
......@@ -21,6 +21,7 @@
#include "selection.h"
#include "utils.h" /* for cell_name */
#include "ranges.h"
#include "style.h"
#include "workbook.h"
#include "ms-excel-util.h"
#include "ms-excel-xf.h"
......@@ -2459,7 +2460,7 @@ get_units_net_of_margins (double units, const ColRowInfo * cri)
/* Return an arbitary non 0 value on catastrophic failure */
g_return_val_if_fail (cri != NULL, 1.);
units -= (cri->margin_a_pt + cri->margin_b_pt);
units -= (cri->margin_a + cri->margin_b);
if (units < 0)
units = 1.;
return units;
......@@ -2556,7 +2557,7 @@ ms_excel_read_colinfo (BiffQuery *q, ExcelSheet *sheet)
(col_width, sheet_col_get_info (sheet->gnum_sheet, firstcol));
} else
/* Columns are of default width */
col_width = sheet->gnum_sheet->cols.default_style.units;
col_width = sheet->gnum_sheet->cols.default_style.size_pts;
/* NOTE : seems like this is inclusive firstcol, inclusive lastcol */
if (lastcol >= SHEET_MAX_COLS)
......
......@@ -10,8 +10,11 @@
#include "config.h"
#include <glib.h>
#include "style.h"
#include "ms-excel-util.h"
#include <stdio.h>
/*
* TwoWayTable
*
......
......@@ -33,6 +33,7 @@
#include "gnumeric-util.h"
#include "format.h"
#include "color.h"
#include "cell.h"
#include "sheet-object.h"
#include "style.h"
#include "main.h"
......
......@@ -66,15 +66,15 @@ object_anchor_to_position (double points[4], MSObj*obj, Sheet const * sheet,
if (i & 1) { /* odds are rows */
ColRowInfo const *ri = sheet_row_get_info (sheet, pos);
points[i] = (int)ri->units;
points[i] = ri->size_pts;
points[i] *= nths / row_denominator;
points[i] += ri->margin_a_pt +
points[i] += ri->margin_a +
sheet_row_get_unit_distance (sheet, 0, pos);
} else {
ColRowInfo const *ci = sheet_col_get_info (sheet, pos);
points[i] = (int)ci->units;
points[i] = ci->size_pts;
points[i] *= nths / 1024.;
points[i] += ci->margin_a_pt +
points[i] += ci->margin_a +
sheet_col_get_unit_distance (sheet, 0, pos);
}
}
......
......@@ -19,6 +19,7 @@
#include "plugin.h"
#include "gnumeric.h"
#include "workbook.h"
#include "cell.h"
#include "file.h"
#include "command-context.h"
......
......@@ -3,6 +3,7 @@
#include "dialog-stf.h"
#include "stf-util.h"
#include "cell.h"
#include "dialog-stf-preview.h"
......
......@@ -36,7 +36,7 @@
#include "plugin.h"
#include "gnumeric.h"
#include "file.h"
#include "mstyle.h"
#include "style.h"
#include "formats.h"
#include "workbook.h"
#include "command-context.h"
......
#ifndef GNUMERIC_STF_H
#define GNUMERIC_STF_H
#include "sheet.h"
#include "cell.h"
#include "plugin.h"
typedef struct {
......
......@@ -9,7 +9,7 @@
#include <glib.h>
#include "utils.h"
#include "func.h"
#include "sheet.h"
#include "cell.h"
/* Type definitions */
......
......@@ -9,6 +9,7 @@
#include <math.h>
#include "gnumeric.h"
#include "utils.h"
#include "cell.h"
#include "func.h"
#include "datetime.h"
#include "auto-format.h"
......
......@@ -11,6 +11,7 @@
#include <math.h>
#include "gnumeric.h"
#include "utils.h"
#include "cell.h"
#include "func.h"
#include "goal-seek.h"
#include "collect.h"
......
......@@ -10,6 +10,7 @@
#include "gnumeric.h"
#include "utils.h"
#include "func.h"
#include "cell.h"
#include "number-match.h"
#include <sys/utsname.h>
......
......@@ -9,6 +9,7 @@
#include <config.h>
#include "gnumeric.h"
#include "utils.h"
#include "cell.h"
#include "func.h"
#include "auto-format.h"
......
......@@ -10,6 +10,7 @@
#include "gnumeric.h"
#include "utils.h"
#include "func.h"
#include "cell.h"
#include "mathfunc.h"
#include "collect.h"
#include "auto-format.h"
......
......@@ -13,6 +13,7 @@
#include "numbers.h"
#include "utils.h"
#include "func.h"
#include "cell.h"
#include "collect.h"
#include "auto-format.h"
......
......@@ -12,6 +12,7 @@
#include "gnumeric.h"
#include "utils.h"
#include "func.h"
#include "cell.h"
#include "format.h"
#include "number-match.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