← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/excel/ms-container.h

  • 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:
plugins/excel/ms-container.h
66
66
GOFormat        *ms_container_get_fmt     (MSContainer const *c, unsigned indx);
67
67
PangoAttrList   *ms_container_get_markup  (MSContainer const *c, unsigned indx);
68
68
PangoAttrList   *ms_container_read_markup (MSContainer const *c,
69
 
                                           guint8 const *data, int txo_len,
 
69
                                           guint8 const *data, size_t txo_len,
70
70
                                           char const *str);
71
71
 
72
72
#endif /* GNM_EXCEL_CONTAINER_H */