← Back to branch summary

~ubuntu-branches/ubuntu/raring/calligra/raring-proposed

« back to all changes in this revision

Viewing changes to words/part/tests/TestPageCommands.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-08-08 11:05:31 UTC
  • mto: (39.1.1 raring-proposed)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20120808110531-pwqn96dxajv0lhq1
Tags: upstream-2.5.0
Import upstream version 2.5.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
words/part/tests/TestPageCommands.cpp
450
450
    style.setPageLayout(oldLayout);
451
451
 
452
452
    KoColumns oldColumns;
453
 
    oldColumns.columns = 4;
454
 
    oldColumns.columnSpacing = 21;
 
453
    oldColumns.count = 4;
 
454
    oldColumns.gapWidth = 21;
455
455
    style.setColumns(oldColumns);
456
456
    KWPage page1 = manager->appendPage(style);
457
457
    page1.setDirectionHint(KoText::LeftRightTopBottom);
462
462
    QCOMPARE(page1.leftMargin(), 13.); // its a right-sided page
463
463
    QCOMPARE(page1.pageEdgeMargin(), 7.);
464
464
    QCOMPARE(page1.directionHint(), KoText::LeftRightTopBottom);
465
 
    QCOMPARE(page1.pageStyle().columns().columns, 4);
 
465
    QCOMPARE(page1.pageStyle().columns().count, 4);
466
466
    QCOMPARE(page1.pageSide(), KWPage::Right);
467
467
 
468
468
    // new ;)
476
476
    newLayout.bindingSide = -1;
477
477
    style2.setPageLayout(newLayout);
478
478
    KoColumns newColumns;
479
 
    newColumns.columns = 2;
480
 
    newColumns.columnSpacing = 12;
 
479
    newColumns.count = 2;
 
480
    newColumns.columnData.append(ColumnDatum(1.0, 2.0, 1.0, 1.0, 25));
 
481
    newColumns.columnData.append(ColumnDatum(1.0, 1.0, 1.0, 1.0, 50));
481
482
    style2.setColumns(newColumns);
482
483
    style2.setDirection(KoText::RightLeftTopBottom);
483
484
 
502
503
    page1.setDirectionHint(KoText::InheritDirection); // reset to what the style says
503
504
    QCOMPARE(page1.directionHint(), KoText::RightLeftTopBottom);
504
505
    QCOMPARE(style.pageLayout().width, 401.); // style changed
505
 
    QCOMPARE(page1.pageStyle().columns().columns, 2);
 
506
    QCOMPARE(page1.pageStyle().columns().count, 2);
506
507
    QCOMPARE(page1.pageNumber(), 1);
507
508
    QCOMPARE(page1.pageSide(), KWPage::Right);
508
509
 
526
527
    QCOMPARE(page1.leftMargin(), 13.);
527
528
    QCOMPARE(page1.directionHint(), KoText::AutoDirection);
528
529
    QCOMPARE(style.pageLayout().width, 101.);
529
 
    QCOMPARE(page1.pageStyle().columns().columns, 4);
 
530
    QCOMPARE(page1.pageStyle().columns().count, 4);
530
531
    QCOMPARE(page1.pageNumber(), 1);
531
532
    QCOMPARE(page1.pageSide(), KWPage::Right);
532
533
    QCOMPARE(manager->pageCount(), 2);