sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

[composer] Ensure url is correctly loaded for html items on project load (fix #9374)

Browse Source
This commit is contained in:
Nyall Dawson 2014-02-01 20:52:45 +11:00
parent a9f4596f4d
commit 9ba28b386f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/composer/qgscomposerhtml.cpp
View File

@ -133,10 +133,18 @@ bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool igno
bool QgsComposerHtml::readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames ) bool QgsComposerHtml::readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames )
{ {
deleteFrames(); deleteFrames();
//first create the frames
if ( !_readXML( itemElem, doc, ignoreFrames ) )
{
return false;
}
//then load the set url
QString urlString = itemElem.attribute( "url" ); QString urlString = itemElem.attribute( "url" );
if ( !urlString.isEmpty() ) if ( !urlString.isEmpty() )
{ {
setUrl( QUrl( urlString ) ); setUrl( QUrl( urlString ) );
} }
return _readXML( itemElem, doc, ignoreFrames ); return true;
} }