← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/rendered-value.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/rendered-value.c
5
5
 *     colored text.
6
6
 *
7
7
 * Copyright (C) 2000, 2001 Jody Goldberg (jody@gnome.org)
 
8
 * Copyright (C) 2001-2009 Morten Welinder (terra@gnome.org)
8
9
 *
9
10
 * This program is free software; you can redistribute it and/or
10
11
 * modify it under the terms of the GNU General Public License as
343
344
        if (displayed_formula) {
344
345
                GnmParsePos pp;
345
346
                GnmConventionsOut out;
 
347
                gboolean is_array = gnm_expr_top_is_array (cell->base.texpr);
346
348
 
347
 
                out.accum = g_string_new ("=");
 
349
                out.accum = g_string_new (is_array ? "{=" : "=");
348
350
                out.convs = sheet->convs;
349
351
                out.pp    = &pp;
350
352
 
351
353
                parse_pos_init_cell (&pp, cell),
352
354
                gnm_expr_top_as_gstring (cell->base.texpr, &out);
 
355
                if (is_array)
 
356
                        g_string_append_c (out.accum, '}');
353
357
                pango_layout_set_text (layout, out.accum->str, out.accum->len);
354
358
                g_string_free (out.accum, TRUE);
355
359
                fore = 0;
360
364
                res->might_overflow = FALSE;
361
365
        } else {
362
366
                int col_width = -1;
363
 
                GOFormat *format = gnm_style_get_format (mstyle);
 
367
                GOFormat const *format = gnm_style_get_format (mstyle);
364
368
                GODateConventions const *date_conv = sheet->workbook
365
369
                        ? workbook_date_conv (sheet->workbook)
366
370
                        : NULL;
486
490
        pango_layout_set_auto_dir (layout, pango_layout_get_auto_dir (olayout));
487
491
        pango_layout_set_ellipsize (layout, pango_layout_get_ellipsize (olayout));
488
492
        pango_layout_set_font_description (layout, pango_layout_get_font_description (olayout));
489
 
        // ignore tabs
 
493
        /* ignore tabs */
490
494
 
491
495
        /*
492
496
         * We really want to keep the line breaks, but currently pango