refs #7408

Hugo Mercier · Hugo Mercier · commit aa43c9237669 · 2013-03-21T16:04:29.000+01:00
Fix error reporting when the filename expression is invalid
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -227,7 +227,7 @@ void QgsAtlasComposition::prepareForFeature( size_t featureI )
   if ( !mSingleFile && mFilenamePattern.size() > 0 )
   {
     QgsExpression::setSpecialColumn( "$feature", QVariant(( int )featureI + 1 ) );
-    QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature );
+    QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature, mCoverageLayer->pendingFields() );
     if ( mFilenameExpr->hasEvalError() )
     {
       throw std::runtime_error( tr( "Filename eval error: %1" ).arg( mFilenameExpr->evalErrorString() ).toLocal8Bit().data() );

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ void QgsAtlasComposition::prepareForFeature( size_t featureI )`
`227`	`227`	`if ( !mSingleFile && mFilenamePattern.size() > 0 )`
`228`	`228`	`{`
`229`	`229`	`QgsExpression::setSpecialColumn( "$feature", QVariant(( int )featureI + 1 ) );`
`230`		`- QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature );`
	`230`	`+ QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature, mCoverageLayer->pendingFields() );`
`231`	`231`	`if ( mFilenameExpr->hasEvalError() )`
`232`	`232`	`{`
`233`	`233`	`throw std::runtime_error( tr( "Filename eval error: %1" ).arg( mFilenameExpr->evalErrorString() ).toLocal8Bit().data() );`