← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/sheet-merge.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/sheet-merge.c
315
315
        g_return_if_fail (IS_SHEET (ri->target_sheet));
316
316
 
317
317
        dest = ri->origin;
318
 
        range_translate (&dest, ri->col_offset, ri->row_offset);
 
318
        range_translate (&dest, ri->target_sheet, ri->col_offset, ri->row_offset);
319
319
        change_sheets = (ri->origin_sheet != ri->target_sheet);
320
320
 
321
321
        /* Clear the destination range on the target sheet */
337
337
 
338
338
                        /* Toss any merges that would be clipped. */
339
339
                        gnm_sheet_merge_remove (ri->origin_sheet, r, NULL);
340
 
                        if (!range_translate (&tmp, ri->col_offset, ri->row_offset))
 
340
                        if (!range_translate (&tmp, ri->target_sheet,
 
341
                                              ri->col_offset, ri->row_offset))
341
342
                                to_move = g_slist_prepend (to_move, range_dup (&tmp));
342
343
                } else if (!change_sheets &&
343
344
                           range_contains (&dest, r->start.col, r->start.row))