Commit d59eb822 authored by Miguel de Icaza's avatar Miguel de Icaza Committed by Arturo Espinosa

Reverted last plan. We do need a sheet_view_construct, as we require


1999-07-09  Miguel de Icaza  <miguel@gnu.org>

	* src/sheet-view.c (sheet_view_construct): Reverted last plan.  We
	do need a sheet_view_construct, as we require sheet_view->sheet to
	be set.

1999-07-08  Miguel de Icaza  <miguel@gnu.org>

	* src/cell.c (calc_text_dimensions): Use gdk_fonts for measuring
	the strings on the screen.  Basically, back out using GnomeFont here.

	* src/print-info.c (render_date, render_time): Finished
	implementing.
	(render_opcode): Enable argument mechanism to extend the number of
	possible formats.  Excel accepts stuff like &[DATE], we extend
	this to accept &[DATE:mmmm-yyyy].  The argument for &[DATE] and
	&[TIME] is a regular Gnumeric formatting code (ie, compattible
	with the cell formating in Excel).

	* src/sheet-view.h: Change style to suit forward declaration
	structure.

	* src/sheet.h: Use forward declaration for SheetView.

	* src/sheet.c (sheet_new_sheet_view, sheet_destroy_sheet_view):
	New routines for managing the sheet views.

	* src/sheet-view.c: Killed sheet_view_construct, there was nothing
	really required there.  Moved all the code to sheet_view_init.
	(sheet_view_scrollbar_display, sheet_view_set_header_visibility):
	New routines that control the visibility of the various gadgets of
	a SheetView.

	* embeddable-grid.c, embeddable-grid.h: New files.  They implement
	the Bonobo GnomeEmbeddable interfaces for embedding Gnumeric in
	applications.

	* src/workbook.c (workbook_new, workbook_core_new): Split this
	routine in two:  GUI independant and GUI dependant.  The next step
	is to provide multiple views of a workbook (although, I am not
	sure I want this).
	(workbook_new_with_sheets): Kill dead code.

	* src/corba-sheet.c (Sheet_row_height, Sheet_col_width,
	Sheet_max_cols_used, Sheet_max_rows_used): New methods.

	* src/Gnumeric.idl (Sheet): new methods max_cols_used,
	max_rows_used, col_width, row_height.

	(Grid): New interface for embeddable grids.

	* src/print-info.c (hf_format_render): Rendering routine for the
	header and footers formats.

1999-07-09  Miguel de Icaza  <miguel@gnu.org>

	* ms-excel-write.c (biff_put_text): Intiialize variable.
parent 7556936d
1999-07-09 Miguel de Icaza <miguel@gnu.org>
* src/sheet-view.c (sheet_view_construct): Reverted last plan. We
do need a sheet_view_construct, as we require sheet_view->sheet to
be set.
1999-07-08 Miguel de Icaza <miguel@gnu.org>
* src/cell.c (calc_text_dimensions): Use gdk_fonts for measuring
the strings on the screen. Basically, back out using GnomeFont here.
* src/print-info.c (render_date, render_time): Finished
implementing.
(render_opcode): Enable argument mechanism to extend the number of
possible formats. Excel accepts stuff like &[DATE], we extend
this to accept &[DATE:mmmm-yyyy]. The argument for &[DATE] and
&[TIME] is a regular Gnumeric formatting code (ie, compattible
with the cell formating in Excel).
* src/sheet-view.h: Change style to suit forward declaration
structure.
* src/sheet.h: Use forward declaration for SheetView.
* src/sheet.c (sheet_new_sheet_view, sheet_destroy_sheet_view):
New routines for managing the sheet views.
* src/sheet-view.c: Killed sheet_view_construct, there was nothing
really required there. Moved all the code to sheet_view_init.
(sheet_view_scrollbar_display, sheet_view_set_header_visibility):
New routines that control the visibility of the various gadgets of
a SheetView.
* embeddable-grid.c, embeddable-grid.h: New files. They implement
the Bonobo GnomeEmbeddable interfaces for embedding Gnumeric in
applications.
* src/workbook.c (workbook_new, workbook_core_new): Split this
routine in two: GUI independant and GUI dependant. The next step
is to provide multiple views of a workbook (although, I am not
sure I want this).
(workbook_new_with_sheets): Kill dead code.
* src/corba-sheet.c (Sheet_row_height, Sheet_col_width,
Sheet_max_cols_used, Sheet_max_rows_used): New methods.
* src/Gnumeric.idl (Sheet): new methods max_cols_used,
max_rows_used, col_width, row_height.
(Grid): New interface for embeddable grids.
* src/print-info.c (hf_format_render): Rendering routine for the
header and footers formats.
1999-07-09 Michael Meeks <michael@edenproject.org>
* src/Gnumeric.idl: Add GNOME::Unknown back in.
......
1999-07-09 Miguel de Icaza <miguel@gnu.org>
* src/sheet-view.c (sheet_view_construct): Reverted last plan. We
do need a sheet_view_construct, as we require sheet_view->sheet to
be set.
1999-07-08 Miguel de Icaza <miguel@gnu.org>
* src/cell.c (calc_text_dimensions): Use gdk_fonts for measuring
the strings on the screen. Basically, back out using GnomeFont here.
* src/print-info.c (render_date, render_time): Finished
implementing.
(render_opcode): Enable argument mechanism to extend the number of
possible formats. Excel accepts stuff like &[DATE], we extend
this to accept &[DATE:mmmm-yyyy]. The argument for &[DATE] and
&[TIME] is a regular Gnumeric formatting code (ie, compattible
with the cell formating in Excel).
* src/sheet-view.h: Change style to suit forward declaration
structure.
* src/sheet.h: Use forward declaration for SheetView.
* src/sheet.c (sheet_new_sheet_view, sheet_destroy_sheet_view):
New routines for managing the sheet views.
* src/sheet-view.c: Killed sheet_view_construct, there was nothing
really required there. Moved all the code to sheet_view_init.
(sheet_view_scrollbar_display, sheet_view_set_header_visibility):
New routines that control the visibility of the various gadgets of
a SheetView.
* embeddable-grid.c, embeddable-grid.h: New files. They implement
the Bonobo GnomeEmbeddable interfaces for embedding Gnumeric in
applications.
* src/workbook.c (workbook_new, workbook_core_new): Split this
routine in two: GUI independant and GUI dependant. The next step
is to provide multiple views of a workbook (although, I am not
sure I want this).
(workbook_new_with_sheets): Kill dead code.
* src/corba-sheet.c (Sheet_row_height, Sheet_col_width,
Sheet_max_cols_used, Sheet_max_rows_used): New methods.
* src/Gnumeric.idl (Sheet): new methods max_cols_used,
max_rows_used, col_width, row_height.
(Grid): New interface for embeddable grids.
* src/print-info.c (hf_format_render): Rendering routine for the
header and footers formats.
1999-07-09 Michael Meeks <michael@edenproject.org>
* src/Gnumeric.idl: Add GNOME::Unknown back in.
......
1999-07-09 Miguel de Icaza <miguel@gnu.org>
* src/sheet-view.c (sheet_view_construct): Reverted last plan. We
do need a sheet_view_construct, as we require sheet_view->sheet to
be set.
1999-07-08 Miguel de Icaza <miguel@gnu.org>
* src/cell.c (calc_text_dimensions): Use gdk_fonts for measuring
the strings on the screen. Basically, back out using GnomeFont here.
* src/print-info.c (render_date, render_time): Finished
implementing.
(render_opcode): Enable argument mechanism to extend the number of
possible formats. Excel accepts stuff like &[DATE], we extend
this to accept &[DATE:mmmm-yyyy]. The argument for &[DATE] and
&[TIME] is a regular Gnumeric formatting code (ie, compattible
with the cell formating in Excel).
* src/sheet-view.h: Change style to suit forward declaration
structure.
* src/sheet.h: Use forward declaration for SheetView.
* src/sheet.c (sheet_new_sheet_view, sheet_destroy_sheet_view):
New routines for managing the sheet views.
* src/sheet-view.c: Killed sheet_view_construct, there was nothing
really required there. Moved all the code to sheet_view_init.
(sheet_view_scrollbar_display, sheet_view_set_header_visibility):
New routines that control the visibility of the various gadgets of
a SheetView.
* embeddable-grid.c, embeddable-grid.h: New files. They implement
the Bonobo GnomeEmbeddable interfaces for embedding Gnumeric in
applications.
* src/workbook.c (workbook_new, workbook_core_new): Split this
routine in two: GUI independant and GUI dependant. The next step
is to provide multiple views of a workbook (although, I am not
sure I want this).
(workbook_new_with_sheets): Kill dead code.
* src/corba-sheet.c (Sheet_row_height, Sheet_col_width,
Sheet_max_cols_used, Sheet_max_rows_used): New methods.
* src/Gnumeric.idl (Sheet): new methods max_cols_used,
max_rows_used, col_width, row_height.
(Grid): New interface for embeddable grids.
* src/print-info.c (hf_format_render): Rendering routine for the
header and footers formats.
1999-07-09 Michael Meeks <michael@edenproject.org>
* src/Gnumeric.idl: Add GNOME::Unknown back in.
......
1999-07-09 Miguel de Icaza <miguel@gnu.org>
* src/sheet-view.c (sheet_view_construct): Reverted last plan. We
do need a sheet_view_construct, as we require sheet_view->sheet to
be set.
1999-07-08 Miguel de Icaza <miguel@gnu.org>
* src/cell.c (calc_text_dimensions): Use gdk_fonts for measuring
the strings on the screen. Basically, back out using GnomeFont here.
* src/print-info.c (render_date, render_time): Finished
implementing.
(render_opcode): Enable argument mechanism to extend the number of
possible formats. Excel accepts stuff like &[DATE], we extend
this to accept &[DATE:mmmm-yyyy]. The argument for &[DATE] and
&[TIME] is a regular Gnumeric formatting code (ie, compattible
with the cell formating in Excel).
* src/sheet-view.h: Change style to suit forward declaration
structure.
* src/sheet.h: Use forward declaration for SheetView.
* src/sheet.c (sheet_new_sheet_view, sheet_destroy_sheet_view):
New routines for managing the sheet views.
* src/sheet-view.c: Killed sheet_view_construct, there was nothing
really required there. Moved all the code to sheet_view_init.
(sheet_view_scrollbar_display, sheet_view_set_header_visibility):
New routines that control the visibility of the various gadgets of
a SheetView.
* embeddable-grid.c, embeddable-grid.h: New files. They implement
the Bonobo GnomeEmbeddable interfaces for embedding Gnumeric in
applications.
* src/workbook.c (workbook_new, workbook_core_new): Split this
routine in two: GUI independant and GUI dependant. The next step
is to provide multiple views of a workbook (although, I am not
sure I want this).
(workbook_new_with_sheets): Kill dead code.
* src/corba-sheet.c (Sheet_row_height, Sheet_col_width,
Sheet_max_cols_used, Sheet_max_rows_used): New methods.
* src/Gnumeric.idl (Sheet): new methods max_cols_used,
max_rows_used, col_width, row_height.
(Grid): New interface for embeddable grids.
* src/print-info.c (hf_format_render): Rendering routine for the
header and footers formats.
1999-07-09 Michael Meeks <michael@edenproject.org>
* src/Gnumeric.idl: Add GNOME::Unknown back in.
......
......@@ -2,6 +2,18 @@
Gnumeric Spread Sheet task list
* Component
Make sheet_selection_changed_hook execute a list of hooks
Remove the hardcoded workbook hooks from the sheet.
Initialize the hooks on the workbook_new routine.
The model is somewhat broken. sheet_new creates a sheet_view by
default.
I think we need something like: workbook_new and workbook_view_new
to split this sort of thing.
* Cell editing
Pressing F4 when editing a cell formula, should switch a cell
......@@ -46,6 +58,19 @@ Gnumeric Spread Sheet task list
** Cell data entry:
double click on cell allows editing as in main editing box.
** Headers for Columns and Rows
The captions should be customizable, ie instaed of "A1", it should
be possible to display "Sales". We can use this with Michael's
name support.
** Captions (ItemBar)
It should be possible to set the dimensions of the cols, rows to
contain information as "min_points", "max_points".
Interesting side effect: min_points == max_points means "fixed".
* Auditing
Write the sheet auditing code.
......
......@@ -9,3 +9,16 @@ type=factory
repo_id=IDL:GNOME/Gnumeric/Workbook:1.0 IDL:GNOME/Gnumeric/Sheet:1.0
description=Workbook component
location_info=IDL:GNOME:Gnumeric:WorkbookFactory:1.0
[GNOME:Gnumeric:GridFactory:1.0]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Embeddable Grid Component Factory
location-info=gnumeric-bonobo
[GNOME:Gnumeric:Grid:1.0]
type=factory
repo_id=IDL:GNOME/Gnumeric/Grid IDL:/GNOME/Embeddable:1.0
description=Embeddable Grid Component
location_info=GNOME:Gnumeric:GridFactory:1.0
......@@ -19,4 +19,4 @@ endif
#SUBDIRS = sample stat excel ff-csv text $(PYTHON) $(PERL) $(GUILE_DIR) xbase
SUBDIRS = sample stat excel ff-csv text xbase html
\ No newline at end of file
SUBDIRS = sample stat excel ff-csv text xbase html $(PYTHON) $(PERL) $(GUILE_DIR)
\ No newline at end of file
1999-07-09 Miguel de Icaza <miguel@gnu.org>
* ms-excel-write.c (biff_put_text): Intiialize variable.
1999-07-09 Jody Goldberg <jgoldberg@home.com>
......
......@@ -56,6 +56,7 @@ biff_put_text (BiffPut *bp, char *txt, eBiff_version ver,
g_return_val_if_fail (bp, 0);
g_return_val_if_fail (txt, 0);
ans = 0;
len = strlen (txt);
/* printf ("Write '%s' len = %d\n", txt, len); */
......
#include <gnome-factory.idl>
#include <gnome-unknown.idl>
#include <bonobo.idl>
module GNOME {
module Gnumeric {
......@@ -186,6 +185,13 @@ module GNOME {
in long start_row, in long end_row,
in long count);
//
// Information
//
long max_cols_used ();
long max_rows_used ();
double col_width (in long col);
double row_height (in long row);
};
interface Workbook : GNOME::Unknown {
......@@ -224,5 +230,12 @@ module GNOME {
interface WorkbookFactory : GNOME::GenericFactory {
Workbook read (in string filename);
};
interface Grid : GNOME::Embeddable {
Sheet get_sheet ();
void set_header_visibility (in boolean cols, in boolean rows);
void get_header_visibility (out boolean cols, out boolean rows);
};
};
};
......@@ -186,6 +186,8 @@ GNUMERIC_CORBA_GENERATED = \
Gnumeric.h
GNUMERIC_BONOBO_SOURCES = \
embeddable-grid.c \
embeddable-grid.h \
sheet-object-container.c \
sheet-object-container.h
......
......@@ -1342,10 +1342,10 @@ void
calc_text_dimensions (int is_number, Style *style, const char *text, int cell_w, int cell_h, int *h, int *w)
{
StyleFont *style_font = style->font;
GnomeFont *gnome_font = style_font->dfont->gnome_font;
GdkFont *gdk_font = style_font->dfont->gdk_font;
int text_width, font_height;
text_width = gnome_font_get_width_string (gnome_font, text);
text_width = gdk_string_measure (gdk_font, text);
font_height = style_font_get_height (style_font);
if (text_width < cell_w || is_number){
......@@ -1372,17 +1372,14 @@ calc_text_dimensions (int is_number, Style *style, const char *text, int cell_w,
if (last_was_cut_point && *p != ' ')
ideal_cut_spot = p;
len = gnome_font_get_width (gnome_font, *p);
len = gdk_text_measure (gdk_font, p, 1);
/* If we have overflowed the cell, wrap */
if (used + len > cell_w){
if (ideal_cut_spot){
int n = p - ideal_cut_spot;
char *copy = alloca (n + 1);
strncpy (copy, ideal_cut_spot, n);
copy [n] = 0;
used = gnome_font_get_width_string (gnome_font, copy);
used = gdk_text_measure (
gdk_font, ideal_cut_spot, n);
} else {
used = len;
}
......
......@@ -9,12 +9,11 @@
#include <config.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include "gnumeric.h"
#include <bonobo/gnome-bonobo.h>
#include "sheet.h"
#include "main.h"
#include "main.h"
#ifdef ENABLE_BONOBO
# include <bonobo/gnome-bonobo.h>
#endif
#include "embeddable-grid.h"
#include "corba.h"
void
gnumeric_arg_parse (int argc, char *argv [])
......@@ -33,4 +32,6 @@ gnumeric_arg_parse (int argc, char *argv [])
if (!WorkbookFactory_init ()){
g_warning (_("Could not initialize the Gnumeric Workbook factory"));
}
EmbeddableGridFactory_init ();
}
......@@ -84,7 +84,7 @@ Sheet_cursor_set (PortableServer_Servant servant,
const CORBA_long start_row,
const CORBA_long end_col,
const CORBA_long end_row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -97,7 +97,7 @@ Sheet_cursor_set (PortableServer_Servant servant,
}
static void
Sheet_cursor_move (PortableServer_Servant servant, const CORBA_long col, const CORBA_long row, CORBA_Environment * ev)
Sheet_cursor_move (PortableServer_Servant servant, const CORBA_long col, const CORBA_long row, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -108,7 +108,7 @@ Sheet_cursor_move (PortableServer_Servant servant, const CORBA_long col, const C
}
static void
Sheet_make_cell_visible (PortableServer_Servant servant, const CORBA_long col, const CORBA_long row, CORBA_Environment * ev)
Sheet_make_cell_visible (PortableServer_Servant servant, const CORBA_long col, const CORBA_long row, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -119,7 +119,7 @@ Sheet_make_cell_visible (PortableServer_Servant servant, const CORBA_long col, c
}
static void
Sheet_select_all (PortableServer_Servant servant, CORBA_Environment * ev)
Sheet_select_all (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -127,7 +127,7 @@ Sheet_select_all (PortableServer_Servant servant, CORBA_Environment * ev)
}
static CORBA_boolean
Sheet_is_all_selected (PortableServer_Servant servant, CORBA_Environment * ev)
Sheet_is_all_selected (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -135,7 +135,7 @@ Sheet_is_all_selected (PortableServer_Servant servant, CORBA_Environment * ev)
}
static void
Sheet_selection_reset (PortableServer_Servant servant, CORBA_Environment * ev)
Sheet_selection_reset (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -145,7 +145,7 @@ Sheet_selection_reset (PortableServer_Servant servant, CORBA_Environment * ev)
static void
Sheet_selection_append (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -159,7 +159,7 @@ static void
Sheet_selection_append_range (PortableServer_Servant servant,
const CORBA_long start_col, const CORBA_long start_row,
const CORBA_long end_col, const CORBA_long end_row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -171,7 +171,7 @@ Sheet_selection_append_range (PortableServer_Servant servant,
}
static void
Sheet_selection_copy (PortableServer_Servant servant, CORBA_Environment * ev)
Sheet_selection_copy (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -179,7 +179,7 @@ Sheet_selection_copy (PortableServer_Servant servant, CORBA_Environment * ev)
}
static void
Sheet_selection_cut (PortableServer_Servant servant, CORBA_Environment * ev)
Sheet_selection_cut (PortableServer_Servant servant, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -189,7 +189,7 @@ Sheet_selection_cut (PortableServer_Servant servant, CORBA_Environment * ev)
static void
Sheet_selection_paste (PortableServer_Servant servant,
const CORBA_long dest_col, const CORBA_long dest_row,
const CORBA_long paste_flags, CORBA_Environment * ev)
const CORBA_long paste_flags, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -203,7 +203,7 @@ static void
Sheet_clear_region (PortableServer_Servant servant,
const CORBA_long start_col, const CORBA_long start_row,
const CORBA_long end_col, const CORBA_long end_row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -216,7 +216,7 @@ static void
Sheet_clear_region_content (PortableServer_Servant servant,
const CORBA_long start_col, const CORBA_long start_row,
const CORBA_long end_col, const CORBA_long end_row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -228,7 +228,7 @@ static void
Sheet_clear_region_comments (PortableServer_Servant servant,
const CORBA_long start_col, const CORBA_long start_row,
const CORBA_long end_col, const CORBA_long end_row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -240,7 +240,7 @@ static void
Sheet_clear_region_formats (PortableServer_Servant servant,
const CORBA_long start_col, const CORBA_long start_row,
const CORBA_long end_col, const CORBA_long end_row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -252,7 +252,7 @@ static void
Sheet_cell_set_value (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const GNOME_Gnumeric_Value *value,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -357,7 +357,7 @@ fill_corba_value (GNOME_Gnumeric_Value *value, Sheet *sheet, CORBA_long col, COR
static GNOME_Gnumeric_Value *
Sheet_cell_get_value (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
GNOME_Gnumeric_Value *value;
......@@ -374,7 +374,7 @@ Sheet_cell_get_value (PortableServer_Servant servant,
static void
Sheet_cell_set_text (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const CORBA_char * text, CORBA_Environment * ev)
const CORBA_char * text, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -390,7 +390,7 @@ static CORBA_char *
Sheet_cell_get_text (PortableServer_Servant servant,
const CORBA_long col,
const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -414,7 +414,7 @@ Sheet_cell_set_formula (PortableServer_Servant servant,
const CORBA_long col,
const CORBA_long row,
const CORBA_char * formula,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -431,7 +431,7 @@ Sheet_cell_set_format (PortableServer_Servant servant,
const CORBA_long col,
const CORBA_long row,
const CORBA_char * format,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -447,7 +447,7 @@ static CORBA_char *
Sheet_cell_get_format (PortableServer_Servant servant,
const CORBA_long col,
const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -469,7 +469,7 @@ Sheet_cell_set_font (PortableServer_Servant servant,
const CORBA_long row,
const CORBA_char * font,
const CORBA_short points,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -482,7 +482,7 @@ Sheet_cell_set_font (PortableServer_Servant servant,
}
static CORBA_char *
Sheet_cell_get_font (PortableServer_Servant servant, const CORBA_long col, const CORBA_long row, CORBA_Environment * ev)
Sheet_cell_get_font (PortableServer_Servant servant, const CORBA_long col, const CORBA_long row, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -501,7 +501,7 @@ Sheet_cell_get_font (PortableServer_Servant servant, const CORBA_long col, const
static void
Sheet_cell_set_comment (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const CORBA_char * comment, CORBA_Environment * ev)
const CORBA_char * comment, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -516,7 +516,7 @@ Sheet_cell_set_comment (PortableServer_Servant servant,
static CORBA_char *
Sheet_cell_get_comment (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -534,7 +534,7 @@ Sheet_cell_get_comment (PortableServer_Servant servant,
static void
Sheet_cell_set_foreground (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const CORBA_char * color, CORBA_Environment * ev)
const CORBA_char * color, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -552,7 +552,7 @@ Sheet_cell_set_foreground (PortableServer_Servant servant,
static CORBA_char *
Sheet_cell_get_foreground (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -564,7 +564,7 @@ Sheet_cell_get_foreground (PortableServer_Servant servant,
static void
Sheet_cell_set_background (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const CORBA_char * color, CORBA_Environment * ev)
const CORBA_char * color, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -582,7 +582,7 @@ Sheet_cell_set_background (PortableServer_Servant servant,
static CORBA_char *
Sheet_cell_get_background (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -594,7 +594,7 @@ Sheet_cell_get_background (PortableServer_Servant servant,
static void
Sheet_cell_set_pattern (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const CORBA_long pattern, CORBA_Environment * ev)
const CORBA_long pattern, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -609,7 +609,7 @@ Sheet_cell_set_pattern (PortableServer_Servant servant,
static CORBA_long
Sheet_cell_get_pattern (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -629,7 +629,7 @@ Sheet_cell_set_alignment (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
const CORBA_long halign, const CORBA_long valign,
const CORBA_long orientation, const CORBA_boolean auto_return,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
......@@ -699,11 +699,10 @@ Sheet_cell_get_alignment (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long row,
CORBA_long * halign, CORBA_long * valign,
CORBA_long * orientation, CORBA_boolean * auto_return,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
Cell *cell;
int h, v;
verify_col (col);
verify_row (row);
......@@ -763,7 +762,7 @@ Sheet_cell_get_alignment (PortableServer_Servant servant,
}
static void
Sheet_set_dirty (PortableServer_Servant servant, const CORBA_boolean is_dirty, CORBA_Environment * ev)
Sheet_set_dirty (PortableServer_Servant servant, const CORBA_boolean is_dirty, CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -773,7 +772,7 @@ Sheet_set_dirty (PortableServer_Servant servant, const CORBA_boolean is_dirty, C
static void
Sheet_insert_col (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long count,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -784,7 +783,7 @@ Sheet_insert_col (PortableServer_Servant servant,
static void
Sheet_delete_col (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long count,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -795,7 +794,7 @@ Sheet_delete_col (PortableServer_Servant servant,
static void
Sheet_insert_row (PortableServer_Servant servant,
const CORBA_long row, const CORBA_long count,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -806,7 +805,7 @@ Sheet_insert_row (PortableServer_Servant servant,
static void
Sheet_delete_row (PortableServer_Servant servant,
const CORBA_long row, const CORBA_long count,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -818,7 +817,7 @@ static void
Sheet_shift_rows (PortableServer_Servant servant,
const CORBA_long col, const CORBA_long start_row,
const CORBA_long end_row, const CORBA_long count,
CORBA_Environment * ev)
CORBA_Environment *ev)
{
Sheet *sheet = sheet_from_servant (servant);
......@@ -833,7 +832,7 @@ static void
Sheet_shift_cols (PortableServer_Servant servant,
const CORBA_long col,
const CORBA_long start_row, const CORBA_long end_row,
const CORBA_long count, CORBA_Environment * ev)