|
|
@ -1429,8 +1429,10 @@ void KHTMLPart::clear()
|
|
|
|
d->m_decoder = 0;
|
|
|
|
d->m_decoder = 0;
|
|
|
|
|
|
|
|
|
|
|
|
// We don't want to change between parts if we are going to delete all of them anyway
|
|
|
|
// We don't want to change between parts if we are going to delete all of them anyway
|
|
|
|
|
|
|
|
if (partManager()) {
|
|
|
|
disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
|
|
|
|
disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
|
|
|
|
this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
|
|
|
|
this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (d->m_frames.count())
|
|
|
|
if (d->m_frames.count())
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1462,8 +1464,10 @@ void KHTMLPart::clear()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Listen to part changes again
|
|
|
|
// Listen to part changes again
|
|
|
|
|
|
|
|
if (partManager()) {
|
|
|
|
connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
|
|
|
|
connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
|
|
|
|
this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
|
|
|
|
this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
d->m_delayRedirect = 0;
|
|
|
|
d->m_delayRedirect = 0;
|
|
|
|
d->m_redirectURL = TQString();
|
|
|
|
d->m_redirectURL = TQString();
|
|
|
@ -5593,16 +5597,18 @@ void KHTMLPart::restoreState( TQDataStream &stream )
|
|
|
|
|
|
|
|
|
|
|
|
if ( (*childFrame)->m_part )
|
|
|
|
if ( (*childFrame)->m_part )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if ( (*childFrame)->m_extension )
|
|
|
|
if ( (*childFrame)->m_extension ) {
|
|
|
|
if ( (*childFrame)->m_extension && !(*fBufferIt).isEmpty() )
|
|
|
|
if ( (*childFrame)->m_extension && !(*fBufferIt).isEmpty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQDataStream frameStream( *fBufferIt, IO_ReadOnly );
|
|
|
|
TQDataStream frameStream( *fBufferIt, IO_ReadOnly );
|
|
|
|
(*childFrame)->m_extension->restoreState( frameStream );
|
|
|
|
(*childFrame)->m_extension->restoreState( frameStream );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else {
|
|
|
|
(*childFrame)->m_part->openURL( *fURLIt );
|
|
|
|
(*childFrame)->m_part->openURL( *fURLIt );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
KParts::URLArgs args( d->m_extension->urlArgs() );
|
|
|
|
KParts::URLArgs args( d->m_extension->urlArgs() );
|
|
|
|
args.xOffset = xOffset;
|
|
|
|
args.xOffset = xOffset;
|
|
|
|