← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnumeric/quantal

« back to all changes in this revision

Viewing changes to src/dialogs/dialog-insert-cells.c

  • Committer: Bazaar Package Importer
  • Author(s): Gauvain Pocentek
  • Date: 2009-06-07 11:10:47 UTC
  • mfrom: (1.1.19 upstream) (2.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090607111047-l3rtbzfjxvmi1kx0
Tags: 1.9.8-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Promoted gnumeric-doc to Recommends in gnumeric package for help to be
    installed automatically
  - gnumeric-gtk is a transitional package
  - gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1
  - call initltool-update in po*
  - remove psiconv support (psiconv is in universe):
    o debian/control: remove B-D on libpsiconv-dev
    o debian/rules: don't pass --with-psiconv to ./configure

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dialogs/dialog-insert-cells.c
37
37
#include <command-context.h>
38
38
 
39
39
#include <glade/glade.h>
40
 
#include <gtk/gtkradiobutton.h>
 
40
#include <gtk/gtk.h>
41
41
 
42
42
#define INSERT_CELL_DIALOG_KEY "insert-cells-dialog"
43
43
 
117
117
        InsertCellState *state;
118
118
        WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
119
119
        SheetView       *sv = wb_control_cur_sheet_view (wbc);
 
120
        Sheet *sheet = sv_sheet (sv);
120
121
        GnmRange const *sel;
121
122
        int  cols, rows;
122
123
 
127
128
        cols = sel->end.col - sel->start.col + 1;
128
129
        rows = sel->end.row - sel->start.row + 1;
129
130
 
130
 
        if (range_is_full (sel, FALSE)) {
131
 
                cmd_insert_cols (wbc, sv_sheet (sv), sel->start.col, cols);
 
131
        if (range_is_full (sel, sheet, FALSE)) {
 
132
                cmd_insert_cols (wbc, sheet, sel->start.col, cols);
132
133
                return;
133
134
        }
134
 
        if (range_is_full (sel, TRUE)) {
135
 
                cmd_insert_rows (wbc, sv_sheet (sv), sel->start.row, rows);
 
135
        if (range_is_full (sel, sheet, TRUE)) {
 
136
                cmd_insert_rows (wbc, sheet, sel->start.row, rows);
136
137
                return;
137
138
        }
138
139