- if(!aData || aData->Label.isEmpty()) continue;
- if (( theDim < 0 || aData->Dim.contains( theDim )) &&
- ( isAlgo || aData->IsAuxOrNeedHyp == isAux ) &&
- ( aData->Context == "ANY" || aData->Context == context ))
+ if (( aData && !aData->Label.isEmpty() ) &&
+ ( theDim < 0 || aData->Dim.contains( theDim )) &&
+ ( isAlgo || aData->IsAuxOrNeedHyp == isAux ) &&
+ ( aData->Context == "ANY" || aData->Context == context ) &&
+ ( !checkGeometry || aData->IsNeedGeometry == isNeedGeometry ))