Skip to content
Permalink
Browse files

Avoid crash in html item test

  • Loading branch information
mhugent committed Aug 8, 2012
1 parent 9a3d6ab commit ce84b5608e3cff4cfea22f336773d93e573ea4b8
Showing with 3 additions and 2 deletions.
  1. +2 −1 src/core/composer/qgscomposition.cpp
  2. +1 −1 tests/src/core/testqgscomposerhtml.cpp
@@ -463,8 +463,9 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
for ( int i = 0; i < composerHtmlList.size(); ++i )
{
QDomElement currentHtmlElem = composerHtmlList.at( i ).toElement();
QgsComposerHtml* newHtml = new QgsComposerHtml( this, true );
QgsComposerHtml* newHtml = new QgsComposerHtml( this, false );
newHtml->readXML( currentHtmlElem, doc );
newHtml->setCreateUndoCommands( true );
this->addMultiFrame( newHtml );
}
}
@@ -67,7 +67,7 @@ void TestQgsComposerHtml::table()
"control_images" + QDir::separator() + "expected_composerhtml" + QDir::separator() + "composerhtml_table.png" ) );
bool result = checker.testComposition();
mComposition->removeMultiFrame( htmlItem );
delete htmlItem;
//delete htmlItem;
QVERIFY( result );
}

0 comments on commit ce84b56

Please sign in to comment.
You can’t perform that action at this time.