← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/koffice/oneiric-updates

« back to all changes in this revision

Viewing changes to kword/part/KWPage.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kword/part/KWPage.cpp
70
70
        return;
71
71
    KWPageManagerPrivate::Page page = priv->pages[n];
72
72
 
 
73
    if (page.pageSide == ps)
 
74
        return;
 
75
 
73
76
    const bool needsRenumbering = (page.pageSide == PageSpread && ps != PageSpread) || ps == PageSpread;
74
77
    page.pageSide = ps;
75
78
    priv->pages.insert(n, page);
249
252
    if (! isValid())
250
253
        return KWPage();
251
254
    QMap<int,int>::const_iterator iter = priv->pageNumbers.constFind(pageNumber());
 
255
    Q_ASSERT(iter != priv->pageNumbers.constEnd());
252
256
    ++iter;
253
 
    if (priv->pages[n].pageSide == PageSpread) // one more
 
257
    if (priv->pages[n].pageSide == PageSpread) {// one more
 
258
        Q_ASSERT(iter != priv->pageNumbers.constEnd());
254
259
        ++iter;
 
260
    }
255
261
    if (iter == priv->pageNumbers.constEnd())
256
262
        return KWPage();
257
263
    return KWPage(priv, iter.value());