Fix scalebar alignment in composer (ticket #6317)

mhugent · mhugent · commit c0ee7f0ee99a · 2012-09-15T08:19:07.000+02:00
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -465,6 +465,9 @@ bool QgsComposerScaleBar::readXML( const QDomElement& itemElem, const QDomDocume
   QString styleString = itemElem.attribute( "style", "" );
   setStyle( tr( styleString.toLocal8Bit().data() ) );
 
+  mUnits = ( ScaleBarUnits )itemElem.attribute( "units" ).toInt();
+  mAlignment = ( Alignment )( itemElem.attribute( "alignment", "0" ).toInt() );
+
   //map
   int mapId = itemElem.attribute( "mapId", "-1" ).toInt();
   if ( mapId >= 0 )
@@ -478,12 +481,7 @@ bool QgsComposerScaleBar::readXML( const QDomElement& itemElem, const QDomDocume
     }
   }
 
-  mUnits = ( ScaleBarUnits )itemElem.attribute( "units" ).toInt();
-
-  refreshSegmentMillimeters();
-
-  //alignment
-  mAlignment = ( Alignment )( itemElem.attribute( "alignment", "0" ).toInt() );
+  updateSegmentSize();
 
   //restore general composer item properties
   QDomNodeList composerItemList = itemElem.elementsByTagName( "ComposerItem" );
