From e5fcbc39d3a12bcbd51c7c5c0a507065f8084257 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 22 May 2015 19:21:39 +1000 Subject: [PATCH] Small optimisation to data defined symbology --- src/core/symbology-ng/qgssymbollayerv2.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp index 00af3b99773f..d2be7afca73a 100644 --- a/src/core/symbology-ng/qgssymbollayerv2.cpp +++ b/src/core/symbology-ng/qgssymbollayerv2.cpp @@ -38,6 +38,9 @@ const QgsExpression* QgsSymbolLayerV2::dataDefinedProperty( const QString& prope QgsDataDefined *QgsSymbolLayerV2::getDataDefinedProperty( const QString &property ) const { + if ( mDataDefinedProperties.isEmpty() ) + return 0; + QMap< QString, QgsDataDefined* >::const_iterator it = mDataDefinedProperties.find( property ); if ( it != mDataDefinedProperties.constEnd() ) { @@ -106,6 +109,9 @@ bool QgsSymbolLayerV2::hasDataDefinedProperties() const bool QgsSymbolLayerV2::hasDataDefinedProperty( const QString& property ) const { + if ( mDataDefinedProperties.isEmpty() ) + return false; + QgsDataDefined* dd = getDataDefinedProperty( property ); return dd && dd->isActive(); }