Avoid crash in html item test

mhugent · mhugent · commit ce84b5608e3c · 2012-08-08T17:28:16.000+02:00
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.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 );
   }
 }
diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -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 );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,9 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen`
`463`	`463`	`for ( int i = 0; i < composerHtmlList.size(); ++i )`
`464`	`464`	`{`
`465`	`465`	`QDomElement currentHtmlElem = composerHtmlList.at( i ).toElement();`
`466`		`- QgsComposerHtml* newHtml = new QgsComposerHtml( this, true );`
	`466`	`+ QgsComposerHtml* newHtml = new QgsComposerHtml( this, false );`
`467`	`467`	`newHtml->readXML( currentHtmlElem, doc );`
	`468`	`+ newHtml->setCreateUndoCommands( true );`
`468`	`469`	`this->addMultiFrame( newHtml );`
`469`	`470`	`}`
`470`	`471`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void TestQgsComposerHtml::table()`
`67`	`67`	`"control_images" + QDir::separator() + "expected_composerhtml" + QDir::separator() + "composerhtml_table.png" ) );`
`68`	`68`	`bool result = checker.testComposition();`
`69`	`69`	`mComposition->removeMultiFrame( htmlItem );`
`70`		`- delete htmlItem;`
	`70`	`+ //delete htmlItem;`
`71`	`71`	`QVERIFY( result );`
`72`	`72`	`}`
`73`	`73`