#i102750# More refactoring of query parameter code.

3 files changed, 1 insertions, 51 deletions

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 939f06327bb3..49768fa10e5e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -136,8 +136,6 @@ class ScLookupCache;
 struct ScLookupCacheMapImpl;
 class SfxUndoManager;
 class ScFormulaParserPool;
-class ScDBRangeBase;
-class ScDBQueryParamBase;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
@@ -1369,9 +1367,6 @@ public:
     BOOL            ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL );
     SC_DLLPUBLIC BOOL           CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                         SCTAB nTab, ScQueryParam& rQueryParam );
-    bool            FillQueryEntries( ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
-                                      SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab );
-
     void            GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
 
     BOOL            GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 67eb4b85391e..9aa264e38931 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -812,48 +812,7 @@ struct ScQueryEntry
     ScQueryEntry&   operator=( const ScQueryEntry& r );
     BOOL            operator==( const ScQueryEntry& r ) const;
 };
-#if 0
-struct SC_DLLPUBLIC ScQueryParam
-{
-    SCCOL           nCol1;
-    SCROW           nRow1;
-    SCCOL           nCol2;
-    SCROW           nRow2;
-    SCTAB           nTab;
-    BOOL            bHasHeader;
-    BOOL            bByRow;
-    BOOL            bInplace;
-    BOOL            bCaseSens;
-    BOOL            bRegExp;
-    BOOL            bMixedComparison;   // whether numbers are smaller than strings
-    BOOL            bDuplicate;
-    BOOL            bDestPers;          // nicht gespeichert
-    SCTAB           nDestTab;
-    SCCOL           nDestCol;
-    SCROW           nDestRow;
 
-private:
-    SCSIZE          nEntryCount;
-    ScQueryEntry*   pEntries;
-
-public:
-    ScQueryParam();
-    ScQueryParam( const ScQueryParam& r );
-    ~ScQueryParam();
-
-    SCSIZE          GetEntryCount() const           { return nEntryCount; }
-    ScQueryEntry&   GetEntry(SCSIZE n) const        { return pEntries[n]; }
-    void            Resize(SCSIZE nNew);
-
-    ScQueryParam&   operator=   ( const ScQueryParam& r );
-    BOOL            operator==  ( const ScQueryParam& rOther ) const;
-    void            Clear       ();
-    void            DeleteQuery( SCSIZE nPos );
-
-    void            MoveToDest();
-    void            FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
-};
-#endif
 // -----------------------------------------------------------------------
 
 struct SC_DLLPUBLIC ScSubTotalParam
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index d6410f1ec424..6b6bed1db28f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -77,8 +77,6 @@ struct ScFunctionData;
 struct ScLineFlags;
 class CollatorWrapper;
 struct ScDBQueryParamInternal;
-struct ScQueryParamBase;
-class ScDBRangeBase;
 
 class ScTable
 {
@@ -640,7 +638,7 @@ public:
     void        TopTenQuery( ScQueryParam& );
     SCSIZE      Query(ScQueryParam& rQueryParam, BOOL bKeepSub);
     BOOL        CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
-    bool        FillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
+
     void        GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings);
     void        GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings );
     BOOL        GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
@@ -719,9 +717,7 @@ private:
     void        SortReorder( ScSortInfoArray*, ScProgress& );
 
     BOOL        CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
-    bool        CreateExcelQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
     BOOL        CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
-    bool        CreateStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
     void        GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr);
 
     BOOL        RefVisible(ScFormulaCell* pCell);