diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:05:46 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:05:46 +0000 |
| commit | 16842b48df2c6290415be28b060e0460d46d9787 (patch) | |
| tree | 7ce2f2c58123d0fdc0801f5db0ad7f3ffe0406ba /sc/source/ui/view/gridwin4.cxx | |
| parent | 1cf3e0f7e9ae88872f87bb0f4ed1529d650e9dc2 (diff) | |
INTEGRATION: CWS dr14 (1.21.20); FILE MERGED
2004/06/14 09:36:53 dr 1.21.20.4: #100000# merge error
2004/06/10 18:42:56 dr 1.21.20.3: RESYNC: (1.22-1.23); FILE MERGED
2004/04/21 09:29:33 dr 1.21.20.2: RESYNC: (1.21-1.22); FILE MERGED
2004/04/08 14:53:49 dr 1.21.20.1: #i23675# diagonal borders step 7c: draw cell borders with svx::frmlnk::Array
Diffstat (limited to 'sc/source/ui/view/gridwin4.cxx')
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 3610ebd10..2b0697ae9 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gridwin4.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: obo $ $Date: 2004-06-04 12:01:48 $ + * last change: $Author: hr $ $Date: 2004-08-02 17:05:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,6 +108,7 @@ #include "invmerge.hxx" #include "editutil.hxx" #include "inputopt.hxx" +#include "fillinfo.hxx" //#include "tabvwsh.hxx" //! Test !!!! @@ -526,8 +527,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod // Datenblock - RowInfo* pRowInfo = new RowInfo[ROWINFO_MAX]; - SCSIZE nArrCount = pDoc->FillInfo( pRowInfo, nX1, nY1, nX2, nY2, nTab, + ScTableInfo aTabInfo; + pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, nPPTX, nPPTY, FALSE, bFormulaMode, &pViewData->GetMarkData() ); @@ -535,7 +536,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod Fraction aZoomX = pViewData->GetZoomX(); Fraction aZoomY = pViewData->GetZoomY(); - ScOutputData aOutputData( this, OUTTYPE_WINDOW, pRowInfo, nArrCount, pDoc, nTab, + ScOutputData aOutputData( this, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, nScrX, nScrY, nX1, nY1, nX2, nY2, nPPTX, nPPTY, &aZoomX, &aZoomY ); @@ -650,7 +651,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod // Autofilter- und Pivot-Buttons - DrawButtons( nX1, nY1, nX2, nY2, pRowInfo, nArrCount ); // Pixel + DrawButtons( nX1, nY1, nX2, nY2, aTabInfo ); // Pixel // Notiz-Anzeiger @@ -716,7 +717,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod DrawSdrGrid( aDrawingRect ); { - // call RefreshAllIAOManagers only once in paint, so do it here + // call RefreshAllIAOManagers only once in paint, so do it here // and not in DrawOneLayer(). But after DrawGrid... ScTabViewShell* pTabViewShell = pViewData->GetViewShell(); @@ -871,10 +872,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if (bCurVis) ShowCursor(); - for (SCSIZE i=0; i<nArrCount; i++) - delete[] pRowInfo[i].pCellInfo; - delete[] pRowInfo; - if (pViewData->HasEditView(eWhich)) SetMapMode(pViewData->GetLogicMode()); else @@ -1173,7 +1170,7 @@ void ScGridWindow::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, } void ScGridWindow::DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, - RowInfo* pRowInfo, SCSIZE nArrCount ) + ScTableInfo& rTabInfo ) { SCCOL nCol; SCROW nRow; @@ -1184,6 +1181,9 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScDBData* pDBData = NULL; ScQueryParam* pQueryParam = NULL; + RowInfo* pRowInfo = rTabInfo.mpRowInfo; + USHORT nArrCount = rTabInfo.mnArrCount; + BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up |