diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-04-01 15:24:18 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-04-01 15:24:18 -0400 |
| commit | f2384d6f10178c3bec96e96009255f61e083cda6 (patch) | |
| tree | ffd0114c01d3a0600ef8253e44b56dd6d9ea9e3d /sc/source/ui/view | |
| parent | d99726db9fa723e6c418690d158d619034f2a581 (diff) | |
Removed the dynamic row bits from the db range. It was a hack.
This concept was there before the Hamburg added their own mechanism
to allow dynamic expansion of db ranges. There is no need to have
two of them, or it would cause weird problems.
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/dbfunc.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshc.cxx | 6 |
3 files changed, 5 insertions, 14 deletions
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index a7b86d102c34..a34dff3982f3 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -100,7 +100,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) // aktuellen Datenbereich fuer Sortieren / Filtern suchen -ScDBData* ScDBFunc::GetDBData( sal_Bool bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool /*bShrinkToData*/, bool bExpandRows ) +ScDBData* ScDBFunc::GetDBData( sal_Bool bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool /*bShrinkToData*/ ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDBData* pData = NULL; @@ -181,16 +181,10 @@ ScDBData* ScDBFunc::GetDBData( sal_Bool bMark, ScGetDBMode eMode, ScGetDBSelecti if (!pData) return NULL; - if (bExpandRows) - { - // Dynamically expand rows to include any new data rows that are - // immediately below the original range. - GetViewData()->GetDocument()->UpdateDynamicEndRow(*pData); - } if (bMark) { ScRange aFound; - pData->GetArea(aFound, bExpandRows); + pData->GetArea(aFound); MarkRange( aFound, false ); } return pData; @@ -369,7 +363,7 @@ void ScDBFunc::ToggleAutoFilter() ScQueryParam aParam; ScDocument* pDoc = GetViewData()->GetDocument(); - ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); + ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false); pDBData->SetByRow( sal_True ); //! Undo, vorher abfragen ?? pDBData->GetQueryParam( aParam ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 8a2a0eab3b3d..985240bd248d 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1300,7 +1300,6 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, pViewData->GetViewShell()->UpdateInputHandler(); } - aParam.bUseDynamicRange = true; pViewData->GetView()->Query( aParam, NULL, true ); pDBData->SetQueryParam( aParam ); // speichern } diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 8e3bf1c4d24f..1abfe983bf23 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -175,9 +175,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( SCITEM_QUERYDATA, SCITEM_QUERYDATA ); - ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, true, true); + ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, true); pDBData->GetQueryParam( aQueryParam ); - aQueryParam.bUseDynamicRange = true; ScQueryItem aItem( SCITEM_QUERYDATA, GetViewData(), &aQueryParam ); ScRange aAdvSource; @@ -201,9 +200,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( SCITEM_QUERYDATA, SCITEM_QUERYDATA ); - ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, true, true); + ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, true); pDBData->GetQueryParam( aQueryParam ); - aQueryParam.bUseDynamicRange = true; aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA, GetViewData(), |