src/core/composer/qgscomposerlabel.cpp

@@ -66,17 +66,7 @@ void QgsComposerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem*
   double penWidth = pen().widthF();
   QRectF painterRect( penWidth + mMargin, penWidth + mMargin, rect().width() - 2 * penWidth - 2 * mMargin, rect().height() - 2 * penWidth - 2 * mMargin );
 
-  QString textToDraw;
-  if ( mComposition->atlasMode() != QgsComposition::AtlasOff )
-  {
-    //render text with expressions evaluated
-    textToDraw = displayText();
-  }
-  else
-  {
-    //not outputing or using an atlas preview, so render text without expressions evaluated
-    textToDraw = mText;
-  }
+  QString textToDraw = displayText();
 
   if ( mHtmlState )
   {

src/core/composer/qgscomposition.cpp

@@ -603,22 +603,9 @@ bool QgsComposition::readXML( const QDomElement& compositionElem, const QDomDocu
   }
 
   //snapping
-  if ( compositionElem.attribute( "snapping" ) == "0" )
-  {
-    mSnapToGrid = false;
-  }
-  else
-  {
-    mSnapToGrid = true;
-  }
-  if ( compositionElem.attribute( "gridVisible" ) == "0" )
-  {
-    mGridVisible = false;
-  }
-  else
-  {
-    mGridVisible = true;
-  }
+  mSnapToGrid = compositionElem.attribute( "snapping", "0" ).toInt() == 0 ? false : true;
+  mGridVisible = compositionElem.attribute( "gridVisible", "0" ).toInt() == 0 ? false : true;
+
   mSnapGridResolution = compositionElem.attribute( "snapGridResolution" ).toDouble();
   mSnapGridTolerance = compositionElem.attribute( "snapGridTolerance", "2.0" ).toDouble();
   mSnapGridOffsetX = compositionElem.attribute( "snapGridOffsetX" ).toDouble();

src/gui/qgscomposerview.cpp

@@ -973,6 +973,9 @@ void QgsComposerView::pasteItems( PasteMode mode )
       }
     }
   }
+
+  //switch back to select tool so that pasted items can be moved/resized (#8958)
+  setCurrentTool( QgsComposerView::Select );
 }
 
 void QgsComposerView::deleteSelectedItems()