Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSCPP/OTSRptCalculate/Model/ReportMgr.cpp

@@ -166,7 +166,7 @@ namespace OTSMODEL {
 		// reset property parameters
 		ResetPropertyParams();
 
-		// ok, return TRUE
+		listGBFields.clear();
 		return TRUE;
 	}
 	void CReportMgr::ClearSmplResults()
@@ -259,7 +259,8 @@ namespace OTSMODEL {
 	
 	CGBFieldList CReportMgr::GetAllGBFields(CPropParamPtr thePropParam)
 	{
-		static	CGBFieldList listGBFields;
+		
+		
 		if (listGBFields.size() == 0)
 		{
 			CGBCalculate GBCal(this);

OTSCPP/OTSRptCalculate/Model/ReportMgr.h

@@ -98,7 +98,7 @@ namespace OTSMODEL {
 
 		BOOL EstimateShowColumn(CString a_strColName);
 
-	
+			CGBFieldList listGBFields;
 
 		
 	};