← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gnumeric/feisty

« back to all changes in this revision

Viewing changes to src/stf.c

  • Committer: Bazaar Package Importer
  • Author(s): Gauvain Pocentek
  • Date: 2006-12-06 13:55:23 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061206135523-6bh02cebuk0hduva
Tags: 1.7.5-1ubuntu1
* Merge with debian experimental:
  - debian/control, debian/*-gtk-*, debian/rules,
    debian/shlibs.local: Xubuntu changes for
    gtk/gnome multibuild.
  - run intltool-update in po*
  - Build Depend on intltool

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/stf.c
26
26
#include "stf.h"
27
27
 
28
28
#include <goffice/app/file.h>
 
29
#include "cell.h"
29
30
#include "sheet.h"
30
31
#include "sheet-view.h"
31
32
#include "sheet-style.h"
34
35
#include <goffice/app/io-context-priv.h>
35
36
#include <goffice/utils/go-glib-extras.h>
36
37
#include "command-context.h"
37
 
#include "workbook-control.h"
 
38
#include "workbook-control-gui.h"
38
39
#include "workbook-view.h"
39
40
#include "workbook.h"
40
41
#include "dialog-stf.h"
230
231
 
231
232
        if (NULL != (cell = iter->cell)) {
232
233
                char *tmp;
233
 
                if (cell_has_expr (cell))
 
234
                if (gnm_cell_has_expr (cell))
234
235
                        tmp = gnm_expr_top_as_string (cell->base.texpr,
235
236
                                &iter->pp, iter->pp.sheet->convs);
236
237
                else if (VALUE_FMT (cell->value) != NULL)
414
415
        }
415
416
 
416
417
        g_object_set (G_OBJECT (result), "sink", output, NULL);
417
 
        if (stf_export (result) == FALSE)
 
418
        if (gnm_stf_export (result) == FALSE)
418
419
                go_cmd_context_error_import (GO_CMD_CONTEXT (context),
419
420
                        _("Error while trying to export file as text"));
420
421
        g_object_unref (result);
429
430
                 "sink", output,
430
431
                 "quoting-triggers", ", \t\n\"",
431
432
                 NULL);
432
 
        stf_export_options_sheet_list_add (config,
 
433
        gnm_stf_export_options_sheet_list_add (config,
433
434
                                           wb_view_cur_sheet (wbv));
434
435
 
435
 
        if (stf_export (config) == FALSE)
 
436
        if (gnm_stf_export (config) == FALSE)
436
437
                go_cmd_context_error_import (GO_CMD_CONTEXT (context),
437
438
                        _("Error while trying to write CSV file"));
438
439