Commit 57ea5800 authored by Fabio D'Urso's avatar Fabio D'Urso

Merge remote-tracking branch 'origin/KDE/4.11'

parents 358fc756 68439221
......@@ -4221,7 +4221,7 @@ void PageView::slotRequestVisiblePixmaps( int newValue )
Okular::VisiblePageRect * vItem = new Okular::VisiblePageRect( i->pageNumber(), Okular::NormalizedRect( intersectionRect.translated( -i->uncroppedGeometry().topLeft() ), i->uncroppedWidth(), i->uncroppedHeight() ) );
visibleRects.push_back( vItem );
#ifdef PAGEVIEW_DEBUG
kWarning() << "checking for pixmap for page" << i->pageNumber() << "=" << i->page()->hasPixmap( Document::OBS_PAGEVIEW, i->uncroppedWidth(), i->uncroppedHeight() );
kWarning() << "checking for pixmap for page" << i->pageNumber() << "=" << i->page()->hasPixmap( this, i->uncroppedWidth(), i->uncroppedHeight() );
kWarning() << "checking for text for page" << i->pageNumber() << "=" << i->page()->hasTextPage();
#endif
......
......@@ -96,6 +96,7 @@ void TOC::prepareForReload()
TOCModel *m = m_model;
m_model = new TOCModel( m_document, m_treeView );
m_model->setOldModelData( m, list );
m->setParent( 0 );
}
void TOC::rollbackReload()
......@@ -105,12 +106,14 @@ void TOC::rollbackReload()
TOCModel *m = m_model;
m_model = m->clearOldModelData();
m_model->setParent( m_treeView );
delete m;
}
void TOC::finishReload()
{
m_treeView->setModel( m_model );
m_model->setParent( m_treeView );
}
QVector<QModelIndex> TOC::expandedNodes( const QModelIndex &parent ) const
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment