ooo-build r15243 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 18:46:08 2009
New Revision: 15243
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15243&view=rev

Log:
2009-01-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-dp-custom-names-sc.diff: removed a duplicate
	function definition that caused a build breakage.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-dp-custom-names-sc.diff

Modified: trunk/patches/dev300/calc-dp-custom-names-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-dp-custom-names-sc.diff	(original)
+++ trunk/patches/dev300/calc-dp-custom-names-sc.diff	Thu Jan 29 18:46:08 2009
@@ -1054,62 +1054,6 @@
  
  	//	empty for more than one measure
  
-@@ -769,6 +789,55 @@ void ScDPSource::FilterCacheTableByPageDimensions()
-     }
- }
- 
-+void ScDPSource::FilterCacheTableByPageDimensions()
-+{
-+    ScSimpleSharedString& rSharedString = GetData()->GetSharedString();
-+
-+    // filter table by page dimensions.
-+    vector<ScDPCacheTable::Criterion> aCriteria;
-+    for (long i = 0; i < nPageDimCount; ++i)
-+    {
-+        ScDPDimension* pDim = GetDimensionsObject()->getByIndex(nPageDims[i]);
-+        long nField = pDim->GetDimension();
-+
-+        ScDPMembers* pMems = pDim->GetHierarchiesObject()->getByIndex(0)->
-+            GetLevelsObject()->getByIndex(0)->GetMembersObject();
-+
-+        long nMemCount = pMems->getCount();
-+        ScDPCacheTable::Criterion aFilter;
-+        aFilter.mnFieldIndex = static_cast<sal_Int32>(nField);
-+        aFilter.mpFilter.reset(new ScDPCacheTable::GroupFilter(rSharedString));
-+        ScDPCacheTable::GroupFilter* pGrpFilter = 
-+            static_cast<ScDPCacheTable::GroupFilter*>(aFilter.mpFilter.get());
-+        for (long j = 0; j < nMemCount; ++j)
-+        {
-+            ScDPMember* pMem = pMems->getByIndex(j);
-+            if (pMem->getIsVisible())
-+            {
-+                ScDPItemData aData;
-+                pMem->FillItemData(aData);
-+                pGrpFilter->addMatchItem(aData.aString, aData.fValue, aData.bHasValue);
-+            }
-+        }
-+        if (pGrpFilter->getMatchItemCount() < static_cast<size_t>(nMemCount))
-+            // there is at least one invisible item.  Add this filter criterion to the mix.
-+            aCriteria.push_back(aFilter);
-+
-+        if (!pDim || !pDim->HasSelectedPage())
-+            continue;
-+
-+        const ScDPItemData& rData = pDim->GetSelectedData();
-+        aCriteria.push_back(ScDPCacheTable::Criterion());
-+        ScDPCacheTable::Criterion& r = aCriteria.back();
-+        r.mnFieldIndex = static_cast<sal_Int32>(nField);
-+        sal_Int32 nStrId = rSharedString.getStringId(rData.aString);
-+        r.mpFilter.reset(
-+            new ScDPCacheTable::SingleFilter(rSharedString, nStrId, rData.fValue, rData.bHasValue));
-+    }
-+    if (!aCriteria.empty())
-+        pData->FilterCacheTable(aCriteria);
-+}
-+
- void ScDPSource::CreateRes_Impl()
- {
- 	if ( !pResData )
 @@ -1128,6 +1197,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
  														throw(uno::RuntimeException)
  {