#65020

eclipse-birt · Sep 2, 2013 · 2ed749d · 2ed749d
1 parent a8632d3
commit 2ed749d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...art.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/ReportDataServiceProvider.java b/...art.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/ReportDataServiceProvider.java
@@ -2214,7 +2214,9 @@ protected void addValueSeriesAggregateBindingForGrouping(
 				for ( Query qry : series.getDataDefinition( ) )
 				{
 					String expr = qry.getDefinition( );
-					if ( expr == null || "".equals( expr ) ) //$NON-NLS-1$
+
+					if ( expr == null
+							|| "".equals( expr ) || isDataBinding( expr ) ) //$NON-NLS-1$
 					{
 						continue;
 					}

diff --git a/...art.reportitem/src/org/eclipse/birt/chart/reportitem/AbstractChartBaseQueryGenerator.java b/...art.reportitem/src/org/eclipse/birt/chart/reportitem/AbstractChartBaseQueryGenerator.java
@@ -168,7 +168,7 @@ protected void addValueSeriesAggregateBindingForGrouping(
 			for ( Query qry : series.getDataDefinition( ) )
 			{
 				String expr = qry.getDefinition( );
-				if ( expr == null || "".equals( expr ) ) //$NON-NLS-1$
+				if ( expr == null || "".equals( expr ) || isDataBinding( expr ) ) //$NON-NLS-1$
 				{
 					continue;
 				}
@@ -319,6 +319,14 @@ protected void addValueSeriesAggregateBindingForGrouping(
 			}
 		}
 	}
+
+	protected boolean isDataBinding(String expr){
+		ExpressionCodec exprCodec = ChartModelHelper.instance( )
+				.createExpressionCodec( );
+		exprCodec.decode( expr );
+		String returnExpr = exprCodec.getExpression( );	
+		return exprCodec.isCubeBinding( returnExpr, true );
+	}
 
 	/**
 	 * Generate a unique binding name.