Skip to content
Permalink
Browse files
Follow up 6b973e1
  • Loading branch information
nyalldawson committed Jun 7, 2014
1 parent 476faee commit 4750211bb0b3a7bd863972aab2feacc6ac11ef61
Showing with 4 additions and 3 deletions.
  1. +2 −1 src/core/composer/qgscomposerpicture.cpp
  2. +2 −2 src/core/composer/qgscomposertablecolumn.cpp
@@ -697,7 +697,8 @@ bool QgsComposerPicture::readXML( const QDomElement& itemElem, const QDomDocumen
mPictureWidth = itemElem.attribute( "pictureWidth", "10" ).toDouble();
mPictureHeight = itemElem.attribute( "pictureHeight", "10" ).toDouble();
mResizeMode = QgsComposerPicture::ResizeMode( itemElem.attribute( "resizeMode", "0" ).toInt() );
mPictureAnchor = QgsComposerItem::ItemPositionMode( itemElem.attribute( "anchorPoint", QString( QgsComposerItem::UpperLeft ) ).toInt() );
//when loading from xml, default to anchor point of middle to match pre 2.4 behaviour
mPictureAnchor = ( QgsComposerItem::ItemPositionMode ) itemElem.attribute( "anchorPoint", QString::number( QgsComposerItem::Middle ) ).toInt();

QDomNodeList composerItemList = itemElem.elementsByTagName( "ComposerItem" );
if ( composerItemList.size() > 0 )
@@ -54,11 +54,11 @@ bool QgsComposerTableColumn::writeXML( QDomElement& columnElem, QDomDocument& do

bool QgsComposerTableColumn::readXML( const QDomElement& columnElem )
{
mHAlignment = ( Qt::AlignmentFlag )columnElem.attribute( "hAlignment", QString( Qt::AlignLeft ) ).toInt();
mHAlignment = ( Qt::AlignmentFlag )columnElem.attribute( "hAlignment", QString::number( Qt::AlignLeft ) ).toInt();
mHeading = columnElem.attribute( "heading", "" );
mAttribute = columnElem.attribute( "attribute", "" );
mSortByRank = columnElem.attribute( "sortByRank", "0" ).toInt();
mSortOrder = ( Qt::SortOrder )columnElem.attribute( "sortOrder", QString( Qt::AscendingOrder ) ).toInt();
mSortOrder = ( Qt::SortOrder )columnElem.attribute( "sortOrder", QString::number( Qt::AscendingOrder ) ).toInt();

QDomNodeList bgColorList = columnElem.elementsByTagName( "backgroundColor" );
if ( bgColorList.size() > 0 )

0 comments on commit 4750211

Please sign in to comment.