From 98fea4dfd232b274ac9e8959fb21e17e5a807dce Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 9 Sep 2015 19:17:59 +1000
Subject: [PATCH] Try to shortcut some labeling data defined routines

---
 src/core/qgspallabeling.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index ffc40348254..0e2fc1790df 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -1137,6 +1137,9 @@ QString QgsPalLayerSettings::updateDataDefinedString( const QString& value )
 
 QgsDataDefined* QgsPalLayerSettings::dataDefinedProperty( DataDefinedProperties p )
 {
+  if ( dataDefinedProperties.isEmpty() )
+    return 0;
+
   QMap< QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined* >::const_iterator it = dataDefinedProperties.find( p );
   if ( it != dataDefinedProperties.constEnd() )
   {
@@ -1158,7 +1161,7 @@ QMap<QString, QString> QgsPalLayerSettings::dataDefinedMap( DataDefinedPropertie
 
 QVariant QgsPalLayerSettings::dataDefinedValue( DataDefinedProperties p, QgsFeature& f, const QgsFields& fields, const QgsExpressionContext *context ) const
 {
-  if ( !dataDefinedProperties.contains( p ) )
+  if ( dataDefinedProperties.isEmpty() || !dataDefinedProperties.contains( p ) )
   {
     return QVariant();
   }
@@ -1227,6 +1230,8 @@ bool QgsPalLayerSettings::dataDefinedEvaluate( DataDefinedProperties p, QVariant
 {
   // null passed-around QVariant
   exprVal.clear();
+  if ( dataDefinedProperties.isEmpty() )
+    return false;
 
   //try to keep < 2.12 API - handle no passed expression context
   QScopedPointer< QgsExpressionContext > scopedEc;
@@ -1254,7 +1259,11 @@ bool QgsPalLayerSettings::dataDefinedEvaluate( DataDefinedProperties p, QVariant
 
 bool QgsPalLayerSettings::dataDefinedIsActive( DataDefinedProperties p ) const
 {
+  if ( dataDefinedProperties.isEmpty() )
+    return false;
+
   bool isActive = false;
+
   QMap< DataDefinedProperties, QgsDataDefined* >::const_iterator it = dataDefinedProperties.find( p );
   if ( it != dataDefinedProperties.constEnd() )
   {
@@ -1266,6 +1275,9 @@ bool QgsPalLayerSettings::dataDefinedIsActive( DataDefinedProperties p ) const
 
 bool QgsPalLayerSettings::dataDefinedUseExpression( DataDefinedProperties p ) const
 {
+  if ( dataDefinedProperties.isEmpty() )
+    return false;
+
   bool useExpression = false;
   QMap< DataDefinedProperties, QgsDataDefined* >::const_iterator it = dataDefinedProperties.find( p );
   if ( it != dataDefinedProperties.constEnd() )