← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to words/part/KWRootAreaProvider.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-08-08 11:05:31 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20120808110531-43wco1j5sdm8n47s
Tags: 1:2.5.0-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
words/part/KWRootAreaProvider.cpp
154
154
    if (rootAreaPage && m_textFrameSet->textFrameSetType() == Words::MainTextFrameSet) {
155
155
        Q_ASSERT(rootAreaPage->page.isValid());
156
156
        Q_ASSERT(rootAreaPage->page.pageStyle().isValid());
157
 
        requiredRootAreaCount = rootAreaPage->page.pageStyle().columns().columns;
 
157
        requiredRootAreaCount = rootAreaPage->page.pageStyle().columns().count;
158
158
    }
159
159
    if (rootAreaPage && rootAreaPage->rootAreas.count() < requiredRootAreaCount) {
160
160
        pageNumber = m_pages.count(); // the root-area is still on the same page