Cleanup class ScDBDocFunc a little

Please note that GetSubTotalParam(), GetAdvancedQuerySource(),
GetQueryParam(), GetSortParam() have no side effects.

3 files changed, 0 insertions, 90 deletions

diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index c6302e823..fc9170f4c 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -227,39 +227,6 @@ namespace binfilter {
 /*N*/               pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
 /*N*/           }
 /*N*/
-/*N*/           if (bSort && bSubTotal)
-/*N*/           {
-/*N*/               //  Sortieren ohne SubTotals
-/*N*/
-/*N*/               aSubTotalParam.bRemoveOnly = TRUE;      // wird unten wieder zurueckgesetzt
-/*N*/               DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
-/*N*/           }
-/*N*/
-/*N*/           if (bSort)
-/*N*/           {
-/*N*/               pDBData->GetSortParam( aSortParam );            // Bereich kann sich geaendert haben
-/*N*/               Sort( nTab, aSortParam, FALSE, FALSE, bApi );
-/*N*/           }
-/*N*/           if (bQuery)
-/*N*/           {
-/*N*/               pDBData->GetQueryParam( aQueryParam );          // Bereich kann sich geaendert haben
-/*N*/               ScRange aAdvSource;
-/*N*/               if (pDBData->GetAdvancedQuerySource(aAdvSource))
-/*N*/                   Query( nTab, aQueryParam, &aAdvSource, FALSE, bApi );
-/*N*/               else
-/*N*/                   Query( nTab, aQueryParam, NULL, FALSE, bApi );
-/*N*/
-/*N*/               //  bei nicht-inplace kann die Tabelle umgestellt worden sein
-/*N*/ //                if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
-/*N*/ //                    SetTabNo( nTab );
-/*N*/           }
-/*N*/           if (bSubTotal)
-/*N*/           {
-/*N*/               pDBData->GetSubTotalParam( aSubTotalParam );    // Bereich kann sich geaendert haben
-/*N*/               aSubTotalParam.bRemoveOnly = FALSE;
-/*N*/               DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
-/*N*/           }
-/*N*/
 /*N*/           rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
 /*N*/                                   PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
 /*N*/           bDone = TRUE;
@@ -270,32 +237,6 @@ namespace binfilter {
 /*N*/ }
 
 
-/*N*/ BOOL ScDBDocFunc::Sort( USHORT /* nTab */, const ScSortParam& /* rSortParam */,
-/*N*/                           BOOL /* bRecord */, BOOL /* bPaint */, BOOL )
-/*N*/ {
-        DBG_BF_ASSERT(0, "STRIP");
-/*N*/   OSL_FAIL( "Sort: keine DBData" );
-/*N*/   return FALSE;
-/*N*/ }
-
-
-/*N*/ BOOL ScDBDocFunc::Query( USHORT /* nTab */, const ScQueryParam& /* rQueryParam */,
-/*N*/                       const ScRange* /* pAdvSource */, BOOL /* bRecord */, BOOL /* bApi */ )
-/*N*/ {
-        DBG_BF_ASSERT(0, "STRIP");
-/*N*/   OSL_FAIL( "Query: keine DBData" );
-/*N*/   return FALSE;
-/*N*/ }
-
-
-/*N*/ BOOL ScDBDocFunc::DoSubTotals( USHORT /* nTab */, const ScSubTotalParam& /* rParam */,
-/*N*/                               const ScSortParam* /*pForceNewSort*/, BOOL /* bRecord */, BOOL )
-/*N*/ {
-        DBG_BF_ASSERT(0, "STRIP");
-/*N*/   OSL_FAIL( "SubTotals: keine DBData" );
-/*N*/   return FALSE;
-/*N*/ }
-
 /*N*/ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
 /*N*/                                       BOOL bRecord, BOOL )
 /*N*/ {
diff --git a/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx b/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
index 1f83775a2..aa25da5cf 100644
--- a/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
+++ b/binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
@@ -77,16 +77,6 @@ public:
                         const SbaSelectionList* pSelection, BOOL bRecord,
                         BOOL bAddrInsert = FALSE );
 
-    BOOL            Sort( USHORT nTab, const ScSortParam& rSortParam,
-                            BOOL bRecord, BOOL bPaint, BOOL bApi );
-
-    BOOL            Query( USHORT nTab, const ScQueryParam& rQueryParam,
-                            const ScRange* pAdvSource, BOOL bRecord, BOOL bApi );
-
-    BOOL            DoSubTotals( USHORT nTab, const ScSubTotalParam& rParam,
-                                    const ScSortParam* pForceNewSort,
-                                    BOOL bRecord, BOOL bApi );
-
     BOOL            AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi );
     BOOL            DeleteDBRange( const String& rName, BOOL bApi );
     BOOL            RenameDBRange( const String& rOld, const String& rNew, BOOL bApi );
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index a5f7bb41b..bbfbdd40e 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -4840,16 +4840,12 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
         for (i=0; i<MAXSORT; i++)
             aParam.nField[i] += nFieldStart;
 
-        USHORT nTab = aRange.aStart.Tab();
         aParam.nCol1 = aRange.aStart.Col();
         aParam.nRow1 = aRange.aStart.Row();
         aParam.nCol2 = aRange.aEnd.Col();
         aParam.nRow2 = aRange.aEnd.Row();
 
         pDocSh->GetDBData( aRange, SC_DB_MAKE, TRUE );      // ggf. Bereich anlegen
-
-        ScDBDocFunc aFunc(*pDocSh);                         // Bereich muss angelegt sein
-        aFunc.Sort( nTab, aParam, TRUE, TRUE, TRUE );
     }
 }
 
@@ -4928,19 +4924,12 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
             }
         }
 
-        USHORT nTab = aRange.aStart.Tab();
         aParam.nCol1 = aRange.aStart.Col();
         aParam.nRow1 = aRange.aStart.Row();
         aParam.nCol2 = aRange.aEnd.Col();
         aParam.nRow2 = aRange.aEnd.Row();
 
         pDocSh->GetDBData( aRange, SC_DB_MAKE, TRUE );  // ggf. Bereich anlegen
-
-        //! keep source range in filter descriptor
-        //! if created by createFilterDescriptorByObject ???
-
-        ScDBDocFunc aFunc(*pDocSh);
-        aFunc.Query( nTab, aParam, NULL, TRUE, TRUE );  // Bereich muss angelegt sein
     }
 }
 
@@ -5051,17 +5040,12 @@ void SAL_CALL ScCellRangeObj::applySubTotals(
         }
 
         aParam.bReplace = bReplace;
-
-        USHORT nTab = aRange.aStart.Tab();
         aParam.nCol1 = aRange.aStart.Col();
         aParam.nRow1 = aRange.aStart.Row();
         aParam.nCol2 = aRange.aEnd.Col();
         aParam.nRow2 = aRange.aEnd.Row();
 
         pDocSh->GetDBData( aRange, SC_DB_MAKE, TRUE );  // ggf. Bereich anlegen
-
-        ScDBDocFunc aFunc(*pDocSh);
-        aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE );    // Bereich muss angelegt sein
     }
 }
 
@@ -5078,17 +5062,12 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException)
             pData->GetSubTotalParam(aParam);    // auch bei Remove die Feld-Eintraege behalten
 
         aParam.bRemoveOnly = TRUE;
-
-        USHORT nTab = aRange.aStart.Tab();
         aParam.nCol1 = aRange.aStart.Col();
         aParam.nRow1 = aRange.aStart.Row();
         aParam.nCol2 = aRange.aEnd.Col();
         aParam.nRow2 = aRange.aEnd.Row();
 
         pDocSh->GetDBData( aRange, SC_DB_MAKE, TRUE );  // ggf. Bereich anlegen
-
-        ScDBDocFunc aFunc(*pDocSh);
-        aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE );    // Bereich muss angelegt sein
     }
 }