[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/filter/excel/excrecds.cxx |   23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 074b151857fe41f539ecb2bbfdd45877de4f70e1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 25 22:16:02 2011 +0200

    support export of sheet local anonymous db data to excel binary

diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 0239ac8..619d48a 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -856,31 +856,18 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
     pFilterInfo( NULL )
     , mbAutoFilter (false)
 {
-    ScDBCollection& rDBColl = GetDatabaseRanges();
     XclExpNameManager& rNameMgr = GetNameManager();
 
-    // search for first DB-range with filter
-    sal_uInt16		nIndex	= 0;
     sal_Bool		bFound	= false;
     sal_Bool		bAdvanced = false;
-    ScDBData*	pData	= NULL;
+    ScDBData*	pData	= rRoot.GetDoc().GetAnonymousDBData(nTab);
     ScRange		aAdvRange;
-    while( (nIndex < rDBColl.GetCount()) && !bFound )
+    if (pData)
     {
-        pData = rDBColl[ nIndex ];
-        if( pData )
-        {
-            ScRange aRange;
-            pData->GetArea( aRange );
-            bAdvanced = pData->GetAdvancedQuerySource( aAdvRange );
-            bFound = (aRange.aStart.Tab() == nTab) &&
-                (pData->HasQueryParam() || pData->HasAutoFilter() || bAdvanced);
-        }
-        if( !bFound )
-            nIndex++;
+        bAdvanced = pData->GetAdvancedQuerySource( aAdvRange );
+        bFound = (pData->HasQueryParam() || pData->HasAutoFilter() || bAdvanced);
     }
-
-    if( pData && bFound )
+    if( bFound )
     {
         ScQueryParam	aParam;
         pData->GetQueryParam( aParam );