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

Committer: Bazaar Package Importer
Author(s): Gauvain Pocentek
Date: 2009-06-22 13:37:20 UTC
mfrom: (1.1.20 upstream) (2.1.3 sid)
Revision ID: james.westby@ubuntu.com-20090622133720-rtdazsiz2lx5q8l7

Tags: 1.9.9-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
    o debian/gnumeric-plugins-extra.install: don't install the psiconv
      plugin

files added:
plugins/excel/xls-read-pivot.c

plugins/excel/xls-write-pivot.c

plugins/excel/xlsx-write-pivot.c

src/dialogs/chi-squared.glade

src/dialogs/data-slicer.glade

src/dialogs/dialog-analysis-tool-chi-squared.c

src/dialogs/dialog-data-slicer.c

src/gnm-cell-combo.c

src/gnm-cell-combo.h

src/gnm-command-impl.h

src/gnm-commands-slicer.c

src/gnm-commands-slicer.h

src/gnm-data-cache-source.c

src/gnm-data-cache-source.h

src/gnm-sheet-slicer-combo.c

src/gnm-sheet-slicer-combo.h

src/gnm-sheet-slicer.c

src/gnm-sheet-slicer.h

src/go-data-cache-field-impl.h

src/go-data-cache-field.c

src/go-data-cache-field.h

src/go-data-cache-impl.h

src/go-data-cache-source.c

src/go-data-cache-source.h

src/go-data-cache.c

src/go-data-cache.h

src/go-data-slicer-field-impl.h

src/go-data-slicer-field.c

src/go-data-slicer-field.h

src/go-data-slicer-impl.h

src/go-data-slicer.c

src/go-data-slicer.h

src/go-val.c

src/go-val.h

src/goffice-data.h

src/sheet-utils.c

src/sheet-utils.h

src/tools/analysis-anova.c

src/tools/analysis-anova.h

src/tools/analysis-chi-squared.c

src/tools/analysis-chi-squared.h

src/widgets/gnm-sheet-slicer-combo-foo-view.c

src/widgets/gnm-sheet-slicer-combo-foo-view.h

files removed:
plugins/excel/ms-pivot.c

plugins/excel/ms-pivot.h

src/str.c

src/str.h

files modified:
BUGS

ChangeLog

NEWS

component/gnumeric.c

configure

configure.in

debian/changelog

debian/control

doc/C/ChangeLog

doc/ChangeLog

gnumeric.spec

plugins/applix/ChangeLog

plugins/applix/applix-read.c

plugins/applix/applix-write.c

plugins/applix/boot.c

plugins/corba/ChangeLog

plugins/corba/corba-application.c

plugins/corba/corba-workbook.c

plugins/derivatives/ChangeLog

plugins/derivatives/options.c

plugins/dif/ChangeLog

plugins/dif/dif.c

plugins/excel/ChangeLog

plugins/excel/Makefile.am

plugins/excel/Makefile.in

plugins/excel/biff-types.h

plugins/excel/boot.c

plugins/excel/excel-xml-read.c

plugins/excel/excel.h

plugins/excel/ms-biff.c

plugins/excel/ms-chart.c

plugins/excel/ms-excel-read.c

plugins/excel/ms-excel-read.h

plugins/excel/ms-excel-util.c

plugins/excel/ms-excel-write.c

plugins/excel/ms-excel-write.h

plugins/excel/ms-formula-read.c

plugins/excel/ms-formula-write.c

plugins/excel/ms-obj.c

plugins/excel/plugin.xml.in

plugins/excel/xlsx-read-pivot.c

plugins/excel/xlsx-read.c

plugins/excel/xlsx-utils.c

plugins/excel/xlsx-utils.h

plugins/excel/xlsx-write.c

plugins/fn-complex/ChangeLog

plugins/fn-complex/functions.c

plugins/fn-database/ChangeLog

plugins/fn-database/functions.c

plugins/fn-date/ChangeLog

plugins/fn-date/functions.c

plugins/fn-eng/ChangeLog

plugins/fn-eng/functions.c

plugins/fn-erlang/ChangeLog

plugins/fn-erlang/functions.c

plugins/fn-financial/ChangeLog

plugins/fn-financial/functions.c

plugins/fn-info/ChangeLog

plugins/fn-info/functions.c

plugins/fn-logical/ChangeLog

plugins/fn-logical/functions.c

plugins/fn-lookup/ChangeLog

plugins/fn-lookup/functions.c

plugins/fn-math/ChangeLog

plugins/fn-math/functions.c

plugins/fn-math/plugin.xml.in

plugins/fn-r/ChangeLog

plugins/fn-r/functions.c

plugins/fn-random/ChangeLog

plugins/fn-random/functions.c

plugins/fn-stat/ChangeLog

plugins/fn-stat/functions.c

plugins/fn-string/ChangeLog

plugins/fn-string/functions.c

plugins/fn-tsa/ChangeLog

plugins/fn-tsa/functions.c

plugins/fn-tsa/plugin.xml.in

plugins/gda/ChangeLog

plugins/gda/plugin-gda.c

plugins/gnome-db/ChangeLog

plugins/gnome-glossary/ChangeLog

plugins/html/ChangeLog

plugins/html/boot.c

plugins/html/boot.h

plugins/html/html.c

plugins/html/html.h

plugins/html/html_read.c

plugins/html/latex.c

plugins/html/latex.h

plugins/html/roff.c

plugins/lotus-123/ChangeLog

plugins/lotus-123/boot.c

plugins/mps/ChangeLog

plugins/mps/mps.c

plugins/mps/parser.c

plugins/numtheory/ChangeLog

plugins/numtheory/numtheory.c

plugins/oleo/ChangeLog

plugins/oleo/boot.c

plugins/openoffice/ChangeLog

plugins/openoffice/openoffice-read.c

plugins/openoffice/openoffice-write.c

plugins/openoffice/plugin.xml.in

plugins/paradox/ChangeLog

plugins/paradox/paradox.c

plugins/perl-func/ChangeLog

plugins/perl-loader/ChangeLog

plugins/perl-loader/boot.c

plugins/perl-loader/perl-gnumeric.c

plugins/perl-loader/perl-gnumeric.h

plugins/perl-loader/perl-loader.c

plugins/plan-perfect/ChangeLog

plugins/plan-perfect/pln.c

plugins/plan-perfect/pln.h

plugins/psiconv/ChangeLog

plugins/psiconv/boot.c

plugins/psiconv/psiconv-plugin.h

plugins/psiconv/psiconv-read.c

plugins/py-func/ChangeLog

plugins/python-loader/ChangeLog

plugins/python-loader/boot.c

plugins/python-loader/gnm-py-interpreter.c

plugins/python-loader/gnm-python.c

plugins/python-loader/py-command-line.c

plugins/python-loader/py-console.c

plugins/python-loader/py-gnumeric.c

plugins/python-loader/py-gnumeric.h

plugins/python-loader/py-interpreter-selector.c

plugins/python-loader/py-interpreter-selector.h

plugins/python-loader/python-loader.c

plugins/qpro/ChangeLog

plugins/qpro/qpro-read.c

plugins/sample_datasource/ChangeLog

plugins/sample_datasource/sample_datasource.c

plugins/sc/ChangeLog

plugins/sc/sc.c

plugins/sylk/ChangeLog

plugins/sylk/sylk-write.c

plugins/sylk/sylk.c

plugins/uihello/ChangeLog

plugins/xbase/ChangeLog

plugins/xbase/boot.c

plugins/xbase/xbase.c

po-functions/ChangeLog

po-functions/POTFILES.in

po-functions/POTFILES.skip

po/ChangeLog

po/POTFILES.in

po/POTFILES.skip

po/es.po

po/he.po

samples/regress.gnumeric

schemas/gnumeric-general.schemas.in

src/GNOME_Gnumeric-gtk.xml.in

src/Makefile.am

src/Makefile.in

src/application.c

src/application.h

src/auto-format.c

src/cell-draw.c

src/cell.c

src/cellspan.h

src/clipboard.c

src/clipboard.h

src/cmd-edit.h

src/collect.c

src/command-context-stderr.c

src/command-context.h

src/commands.c

src/consolidate.c

src/dependent.c

src/dependent.h

src/dialogs/ChangeLog

src/dialogs/Makefile.am

src/dialogs/Makefile.in

src/dialogs/dialog-about.c

src/dialogs/dialog-analysis-tools.c

src/dialogs/dialog-autocorrect.c

src/dialogs/dialog-autoformat.c

src/dialogs/dialog-autosave.c

src/dialogs/dialog-cell-format.c

src/dialogs/dialog-cell-sort.c

src/dialogs/dialog-doc-metadata.c

src/dialogs/dialog-formula-guru.c

src/dialogs/dialog-function-select.c

src/dialogs/dialog-goto-cell.c

src/dialogs/dialog-hyperlink.c

src/dialogs/dialog-plugin-manager.c

src/dialogs/dialog-preferences.c

src/dialogs/dialog-printer-setup.c

src/dialogs/dialog-quit.c

src/dialogs/dialog-recent.c

src/dialogs/dialog-scenarios.c

src/dialogs/dialog-search-replace.c

src/dialogs/dialog-search.c

src/dialogs/dialog-sheet-order.c

src/dialogs/dialog-so-styled.c

src/dialogs/dialog-solver.c

src/dialogs/dialog-stf-csv-page.c

src/dialogs/dialog-stf-export.c

src/dialogs/dialog-stf-main-page.c

src/dialogs/dialog-stf.h

src/dialogs/dialogs.h

src/dialogs/help.h

src/dialogs/search.glade

src/expr-name.c

src/expr-name.h

src/expr.c

src/expr.h

src/file-autoft.c

src/file-autoft.h

src/format-template.c

src/format-template.h

src/func-builtin.c

src/func.c

src/func.h

src/gnm-datetime.c

src/gnm-datetime.h

src/gnm-format.c

src/gnm-format.h

src/gnm-graph-window.c

src/gnm-graph-window.h

src/gnm-pane.c

src/gnm-pane.h

src/gnm-plugin.c

src/gnm-plugin.h

src/gnm-so-filled.c

src/gnm-so-line.c

src/gnm-so-polygon.c

src/gnm-style-impl.h

src/gnumeric-gconf-priv.h

src/gnumeric-gconf.c

src/gnumeric-gconf.h

src/gnumeric-simple-canvas.h

src/gnumeric.h

src/graph.c

src/graph.h

src/gui-clipboard.c

src/gui-file.c

src/gui-file.h

src/gui-util.c

src/gui-util.h

src/gutils.c

src/gutils.h

src/history.c

src/hlink.c

src/hlink.h

src/input-msg.c

src/io-context-gtk.c

src/io-context-gtk.h

src/item-cursor.c

src/item-edit.c

src/libgnumeric.c

src/main-application.c

src/mathfunc.c

src/mathfunc.h

src/mstyle.c

src/mstyle.h

src/number-match.c

src/numbers.h

src/parse-util.c

src/parse-util.h

src/parser.c

src/parser.y

src/print-info.c

src/print-info.h

src/print.c

src/print.h

src/rangefunc.h

src/ranges.c

src/ranges.h

src/regression.h

src/rendered-value.c

src/rendered-value.h

src/search.c

src/search.h

src/selection.c

src/selection.h

src/session.c

src/sheet-autofill.c

src/sheet-control-gui-priv.h

src/sheet-control-gui.c

src/sheet-control-priv.h

src/sheet-control.h

src/sheet-filter-combo.h

src/sheet-filter.c

src/sheet-filter.h

src/sheet-merge.c

src/sheet-object-cell-comment.c

src/sheet-object-graph.c

src/sheet-object-graph.h

src/sheet-object-image.c

src/sheet-object-widget.c

src/sheet-object.c

src/sheet-object.h

src/sheet-style.c

src/sheet-style.h

src/sheet-view.c

src/sheet-view.h

src/sheet.c

src/sheet.h

src/solver.h

src/sort.c

src/sort.h

src/ssconvert.c

src/ssgrep.c

src/ssindex.c

src/sstest.c

src/stf-export.c

src/stf-export.h

src/stf-parse.c

src/stf.c

src/style-border.h

src/style-color.h

src/style-font.h

src/style.c

src/symbol.c

src/test-pango.c

src/tools/ChangeLog

src/tools/Makefile.am

src/tools/Makefile.in

src/tools/analysis-exp-smoothing.c

src/tools/analysis-frequency.c

src/tools/analysis-histogram.c

src/tools/analysis-kaplan-meier.c

src/tools/analysis-kaplan-meier.h

src/tools/analysis-tools.c

src/tools/analysis-tools.h

src/tools/auto-correct.c

src/tools/auto-correct.h

src/tools/dao.c

src/tools/dao.h

src/tools/data-shuffling.c

src/tools/fill-series.c

src/tools/scenarios.c

src/tools/solver/ChangeLog

src/tools/solver/glpk/ChangeLog

src/tools/solver/lp_solve/ChangeLog

src/tools/solver/solver.c

src/validation-combo.h

src/validation.c

src/validation.h

src/value-sheet.c

src/value.c

src/value.h

src/wbc-gtk-actions.c

src/wbc-gtk-edit.c

src/wbc-gtk-impl.h

src/wbc-gtk.c

src/wbc-gtk.h

src/widgets/ChangeLog

src/widgets/Makefile.am

src/widgets/Makefile.in

src/widgets/gnm-cell-combo-foo-view-impl.h

src/widgets/gnm-cell-combo-foo-view.c

src/widgets/gnm-dao.c

src/widgets/gnm-dao.h

src/widgets/gnm-filter-combo-foo-view.c

src/widgets/gnm-format-sel.h

src/widgets/gnm-notebook.c

src/widgets/gnm-validation-combo-foo-view.c

src/widgets/gnumeric-dashed-canvas-line.c

src/widgets/gnumeric-expr-entry.c

src/widgets/gnumeric-expr-entry.h

src/widgets/widget-editable-label.c

src/widgets/widget-font-selector.c

src/widgets/widget-font-selector.h

src/workbook-control-priv.h

src/workbook-control.c

src/workbook-control.h

src/workbook-priv.h

src/workbook-view.c

src/workbook-view.h

src/workbook.c

src/workbook.h

src/xml-io.c

src/xml-io.h

src/xml-sax-read.c

src/xml-sax-write.c

test/ChangeLog

test/t5900-sc.pl

test/t5901-qpro.pl

test/t5902-applix.pl

test/t5903-sylk.pl

tools/ChangeLog

Show diffs side-by-side

added added

removed removed

src/tools/dao.c

#include "workbook-control.h"

#include "command-context.h"

#include "gnm-format.h"

#include "sheet-merge.h"

#include "sheet-object-cell-comment.h"

#include "style-color.h"

#include "style-border.h"

#include "graph.h"

#include <goffice/app/go-doc.h>

#include <goffice/utils/go-glib-extras.h>

#include <goffice/goffice.h>

#include <glib.h>

#include <glib/gi18n-lib.h>

196

197

void

197

198

dao_adjust (data_analysis_output_t *dao, gint cols, gint rows)

198

199

{

199

int max_rows = gnm_sheet_get_max_rows (dao->sheet) - dao->start_row;

200

int max_cols = gnm_sheet_get_max_cols (dao->sheet) - dao->start_col;

200

int max_rows, max_cols;

201

202

if (dao->cols == 1 && dao->rows == 1) {

203

if (cols != -1)

211

dao->rows = MIN (rows, dao->rows);

212

}

213

214

if (dao->sheet) {

215

max_rows = gnm_sheet_get_max_rows (dao->sheet) - dao->start_row;

216

max_cols = gnm_sheet_get_max_cols (dao->sheet) - dao->start_col;

217

} else {

218

/* In case of NewSheetOutput and NewWorkbookOutput */

219

/* this is called before we actually create the */

220

/* new sheet and/or workbook */

221

Sheet *old_sheet = wb_control_cur_sheet (dao->wbc);

222

max_rows = gnm_sheet_get_max_rows (old_sheet) - dao->start_row;

223

max_cols = gnm_sheet_get_max_cols (old_sheet) - dao->start_col;

224

}

225

214

226

if (dao->cols > max_cols)

215

227

dao->cols = max_cols;

216

228

if (dao->rows > max_rows)

308

320

}

309

321

310

322

323

static gboolean

324

adjust_range (data_analysis_output_t *dao, GnmRange *r)

325

{

326

range_normalize (r);

327

328

r->start.col += dao->offset_col + dao->start_col;

329

r->end.col += dao->offset_col + dao->start_col;

330

r->start.row += dao->offset_row + dao->start_row;

331

r->end.row += dao->offset_row + dao->start_row;

332

333

if (dao->type == RangeOutput && (dao->cols > 1 || dao->rows > 1)) {

334

if (r->end.col >= dao->start_col + dao->cols)

335

r->end.col = dao->start_col + dao->cols - 1;

336

if (r->end.row >= dao->start_row + dao->rows)

337

r->end.row = dao->start_row + dao->rows - 1;

338

}

339

340

range_ensure_sanity (r, dao->sheet);

341

342

return ((r->start.col <= r->end.col) && (r->start.row <= r->end.row));

343

344

}

345

311

346

gboolean

312

347

dao_cell_is_visible (data_analysis_output_t *dao, int col, int row)

313

348

{

336

371

GnmExpr const *expr)

337

372

{

338

373

GnmExprTop const *texpr;

339

int col_end;

340

int row_end;

341

342

col += dao->offset_col;

343

row += dao->offset_row;

344

col_end = col + cols - 1;

345

row_end = row + rows - 1;

346

347

/* Check that the output is in the given range, but allow singletons

348

* to expand

349

350

if (dao->type == RangeOutput && (dao->cols > 1 || dao->rows > 1)) {

351

if (col >= dao->cols || row >= dao->rows) {

352

gnm_expr_free (expr);

353

return;

354

}

355

if (col_end >= dao->cols)

356

col_end = dao->cols - 1;

357

if (row_end >= dao->rows)

358

row_end = dao->rows - 1;

359

}

360

361

col += dao->start_col;

362

row += dao->start_row;

363

col_end += dao->start_col;

364

row_end += dao->start_row;

365

if (col >= gnm_sheet_get_max_cols (dao->sheet)

366

|| row >= gnm_sheet_get_max_rows (dao->sheet)) {

374

GnmRange r;

375

376

range_init (&r, col, row, col + cols - 1, row + rows -1);

377

378

if (!adjust_range (dao, &r)) {

367

379

gnm_expr_free (expr);

368

380

return;

369

381

}

370

if (col_end >= gnm_sheet_get_max_cols (dao->sheet))

371

col_end = gnm_sheet_get_last_col (dao->sheet);

372

if (row_end >= gnm_sheet_get_max_rows (dao->sheet))

373

row_end = gnm_sheet_get_last_row (dao->sheet);

374

382

375

383

texpr = gnm_expr_top_new (expr);

376

384

gnm_cell_set_array_formula (dao->sheet,

377

col, row,

378

col_end, row_end,

385

r.start.col, r.start.row,

386

r.end.col, r.end.row,

379

387

texpr);

380

388

}

381

389

400

408

{

401

409

GnmCell *cell;

402

410

GnmExprTop const *texpr;

403

404

col += dao->offset_col;

405

row += dao->offset_row;

406

407

/* Check that the output is in the given range, but allow singletons

408

* to expand

409

410

if (dao->type == RangeOutput &&

411

(dao->cols > 1 || dao->rows > 1) &&

412

(col >= dao->cols || row >= dao->rows)) {

411

GnmRange r;

412

413

range_init (&r, col, row, col, row);

414

415

if (!adjust_range (dao, &r)) {

413

416

gnm_expr_free (expr);

414

417

return;

415

418

}

416

419

417

col += dao->start_col;

418

row += dao->start_row;

419

if (col >= gnm_sheet_get_max_cols (dao->sheet) || row >= gnm_sheet_get_max_rows (dao->sheet)) {

420

gnm_expr_free (expr);

421

return;

422

}

423

424

cell = sheet_cell_fetch (dao->sheet, col, row);

420

cell = sheet_cell_fetch (dao->sheet, r.start.col, r.start.row);

425

421

texpr = gnm_expr_top_new (expr);

426

422

gnm_cell_set_expr (cell, texpr);

427

423

gnm_expr_top_unref (texpr);

447

443

dao_set_cell_value (data_analysis_output_t *dao, int col, int row, GnmValue *v)

448

444

{

449

445

GnmCell *cell;

450

451

col += dao->offset_col;

452

row += dao->offset_row;

453

454

/* Check that the output is in the given range, but allow singletons

455

* to expand

456

457

if (dao->type == RangeOutput &&

458

(dao->cols > 1 || dao->rows > 1) &&

459

(col >= dao->cols || row >= dao->rows)) {

446

GnmRange r;

447

448

range_init (&r, col, row, col, row);

449

450

if (!adjust_range (dao, &r)) {

460

451

value_release (v);

461

452

return;

462

453

}

463

454

464

col += dao->start_col;

465

row += dao->start_row;

466

if (col >= gnm_sheet_get_max_cols (dao->sheet) || row >= gnm_sheet_get_max_rows (dao->sheet)) {

467

value_release (v);

468

return;

469

}

470

471

cell = sheet_cell_fetch (dao->sheet, col, row);

455

cell = sheet_cell_fetch (dao->sheet, r.start.col, r.start.row);

472

456

473

457

sheet_cell_set_value (cell, v);

474

458

}

612

596

dao_set_cell_comment (data_analysis_output_t *dao, int col, int row,

613

597

const char *comment)

614

598

{

615

GnmCellPos pos;

616

599

char const *author = NULL;

617

618

/* Check that the output is in the given range, but allow singletons

619

* to expand

620

621

if (dao->type == RangeOutput &&

622

(dao->cols > 1 || dao->rows > 1) &&

623

(col >= dao->cols || row >= dao->rows))

624

return;

625

626

col += dao->start_col;

627

row += dao->start_row;

628

if (col >= gnm_sheet_get_max_cols (dao->sheet) || row >= gnm_sheet_get_max_rows (dao->sheet))

629

return;

630

631

pos.col = col;

632

pos.row = row;

633

cell_set_comment (dao->sheet, &pos, author, comment, NULL);

600

GnmRange r;

601

602

range_init (&r, col, row, col, row);

603

604

if (adjust_range (dao, &r))

605

cell_set_comment (dao->sheet, &r.start, author, comment, NULL);

634

606

}

635

607

636

608

714

686

dao_set_style (data_analysis_output_t *dao, int col1, int row1,

715

687

int col2, int row2, GnmStyle *mstyle)

716

688

{

717

GnmRange range;

718

719

range.start.col = col1 + dao->start_col + dao->offset_col;

720

range.start.row = row1 + dao->start_row + dao->offset_row;

721

range.end.col = col2 + dao->start_col + dao->offset_col;

722

range.end.row = row2 + dao->start_row + dao->offset_row;

723

724

if (range.end.col > dao->start_col + dao->cols)

725

range.end.col = dao->start_col + dao->cols;

726

if (range.end.row > dao->start_row + dao->rows)

727

range.end.row = dao->start_row + dao->rows;

728

729

if (range.end.col < range.start.col) {

730

gnm_style_unref (mstyle);

731

return;

732

}

733

if (range.end.row < range.start.row) {

734

gnm_style_unref (mstyle);

735

return;

736

}

737

738

sheet_style_apply_range (dao->sheet, &range, mstyle);

689

GnmRange r;

690

691

range_init (&r, col1, row1, col2, row2);

692

693

if (!adjust_range (dao, &r)) {

694

gnm_style_unref (mstyle);

695

return;

696

}

697

698

sheet_style_apply_range (dao->sheet, &r, mstyle);

739

699

}

740

700

741

701

/**

755

715

int col2, int row2)

756

716

{

757

717

GnmStyle *mstyle = gnm_style_new ();

758

GnmRange range;

759

760

range.start.col = col1 + dao->start_col;

761

range.start.row = row1 + dao->start_row;

762

range.end.col = col2 + dao->start_col;

763

range.end.row = row2 + dao->start_row;

764

718

765

719

gnm_style_set_font_bold (mstyle, TRUE);

766

sheet_style_apply_range (dao->sheet, &range, mstyle);

720

721

dao_set_style (dao, col1, row1, col2, row2, mstyle);

767

722

}

768

723

769

724

/**

783

738

int col2, int row2)

784

739

{

785

740

GnmStyle *mstyle = gnm_style_new ();

786

GnmRange range;

787

788

range.start.col = col1 + dao->start_col;

789

range.start.row = row1 + dao->start_row;

790

range.end.col = col2 + dao->start_col;

791

range.end.row = row2 + dao->start_row;

792

741

793

742

gnm_style_set_font_uline (mstyle, TRUE);

794

sheet_style_apply_range (dao->sheet, &range, mstyle);

743

744

dao_set_style (dao, col1, row1, col2, row2, mstyle);

795

745

}

796

746

797

747

/**

936

886

dao_set_style (dao, col1, row1, col2, row2, mstyle);

937

887

}

938

888

889

/**

890

* dao_set_border:

891

* @dao:

892

* @col1:

893

* @row1:

894

* @col2:

895

* @row2:

896

897

898

899

**/

900

void

901

dao_set_border (data_analysis_output_t *dao, int col1, int row1,

902

int col2, int row2,

903

GnmStyleElement elem, GnmStyleBorderType border,

904

GnmColor *color,

905

GnmStyleBorderOrientation orientation)

906

{

907

GnmStyle *mstyle;

908

909

mstyle = gnm_style_new ();

910

gnm_style_set_border (mstyle, elem,

911

gnm_style_border_fetch (border,

912

color,

913

orientation));

914

dao_set_style (dao, col1, row1, col2, row2, mstyle);

915

}

916

917

939

918

940

919

/**

941

920

* dao_get_colrow_state_list:

1002

981

GTimeVal t;

1003

982

g_get_current_time (&t);

1004

983

now = t.tv_sec;

1005

g_date_set_time (&date, t.tv_sec);

984

g_date_set_time (&date, t.tv_sec);

1006

985

#endif

1007

986

g_date_to_struct_tm (&date, &tm_s);

1008

987

tm_s.tm_sec = now % 60;

1216

1195

{

1217

1196

dao->omit_so = omit;

1218

1197

}

1198

1199

1200

1201

void

1202

dao_set_merge (data_analysis_output_t *dao, int col1, int row1,

1203

int col2, int row2)

1204

{

1205

GnmRange r;

1206

1207

range_init (&r, col1, row1, col2, row2);

1208

if (adjust_range (dao, &r))

1209

gnm_sheet_merge_add (dao->sheet, &r, TRUE, NULL);

1210

}

Older »