summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/tabview2.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view/tabview2.cxx')
-rw-r--r--sc/source/ui/view/tabview2.cxx108
1 files changed, 54 insertions, 54 deletions
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 76b820cb3fbf..160945c72864 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -73,8 +73,8 @@ void ScTabView::PaintMarks(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
if (!ValidCol(nEndCol)) nEndCol = MAXCOL;
if (!ValidRow(nEndRow)) nEndRow = MAXROW;
- BOOL bLeft = (nStartCol==0 && nEndCol==MAXCOL);
- BOOL bTop = (nStartRow==0 && nEndRow==MAXROW);
+ sal_Bool bLeft = (nStartCol==0 && nEndCol==MAXCOL);
+ sal_Bool bTop = (nStartRow==0 && nEndRow==MAXROW);
if (bLeft)
PaintLeftArea( nStartRow, nEndRow );
@@ -86,7 +86,7 @@ void ScTabView::PaintMarks(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
PaintArea( nStartCol, nStartRow, nEndCol, nEndRow, SC_UPDATE_MARKS );
}
-BOOL ScTabView::IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScTabView::IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
{
return bIsBlockMode
&& nBlockStartX == nCol
@@ -102,7 +102,7 @@ void ScTabView::InitOwnBlockMode()
ScMarkData& rMark = aViewData.GetMarkData();
if (!rMark.IsMarked() && !rMark.IsMultiMarked())
- GetSelEngine()->CursorPosChanging( FALSE, FALSE );
+ GetSelEngine()->CursorPosChanging( false, false );
bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen!
nBlockStartX = 0;
@@ -117,7 +117,7 @@ void ScTabView::InitOwnBlockMode()
}
void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
- BOOL bTestNeg, BOOL bCols, BOOL bRows )
+ sal_Bool bTestNeg, sal_Bool bCols, sal_Bool bRows )
{
if (!bIsBlockMode)
{
@@ -138,7 +138,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
bBlockNeg = rMark.IsCellMarked( nCurX, nCurY );
}
else
- bBlockNeg = FALSE;
+ bBlockNeg = false;
rMark.SetMarkNegative(bBlockNeg);
bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen!
@@ -169,7 +169,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
}
}
-void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE
+void ScTabView::DoneBlockMode( sal_Bool bContinue ) // Default FALSE
{
// Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
// wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat.
@@ -178,8 +178,8 @@ void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE
if (bIsBlockMode && !bMoveIsShift)
{
ScMarkData& rMark = aViewData.GetMarkData();
- BOOL bFlag = rMark.GetMarkingFlag();
- rMark.SetMarking(FALSE);
+ sal_Bool bFlag = rMark.GetMarkingFlag();
+ rMark.SetMarking(false);
if (bBlockNeg && !bContinue)
rMark.MarkToMulti();
@@ -195,19 +195,19 @@ void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE
SCTAB nTab = aViewData.GetTabNo();
ScDocument* pDoc = aViewData.GetDocument();
if ( pDoc->HasTable(nTab) )
- PaintBlock( TRUE ); // TRUE -> Block loeschen
+ PaintBlock( sal_True ); // sal_True -> Block loeschen
else
rMark.ResetMark();
}
bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen!
rMark.SetMarking(bFlag);
- rMark.SetMarkNegative(FALSE);
+ rMark.SetMarkNegative(false);
}
}
void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
- BOOL bCols, BOOL bRows, BOOL bCellSelection )
+ sal_Bool bCols, sal_Bool bRows, sal_Bool bCellSelection )
{
if (!ValidCol(nCurX)) nCurX = MAXCOL;
if (!ValidRow(nCurY)) nCurY = MAXROW;
@@ -215,7 +215,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
if (!bIsBlockMode)
{
OSL_FAIL( "MarkCursor nicht im BlockMode" );
- InitBlockMode( nCurX, nCurY, nCurZ, FALSE, bCols, bRows );
+ InitBlockMode( nCurX, nCurY, nCurZ, false, bCols, bRows );
}
if (bCols)
@@ -235,9 +235,9 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
// (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde)
// oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert...
- BOOL bOldShift = bMoveIsShift;
- bMoveIsShift = FALSE; // wirklich umsetzen
- DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker)
+ sal_Bool bOldShift = bMoveIsShift;
+ bMoveIsShift = false; // wirklich umsetzen
+ DoneBlockMode(false); //! direkt Variablen setzen? (-> kein Geflacker)
bMoveIsShift = bOldShift;
InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
@@ -264,7 +264,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
SCsCOL nBlockStartXOffset = 0;
SCsROW nCurYOffset = 0;
SCsROW nBlockStartYOffset = 0;
- BOOL bBlockStartMerged = FALSE;
+ sal_Bool bBlockStartMerged = false;
const ScMergeAttr* pMergeAttr = NULL;
ScDocument* pDocument = aViewData.GetDocument();
@@ -290,7 +290,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nBlockStartXOrig - nCurX + nColSpan - 1 : 0;
nCurYOffset = nCurY >= nBlockStartYOrig && nCurY < nBlockStartYOrig + nRowSpan - 1 ?
nBlockStartYOrig - nCurY + nRowSpan - 1 : 0;
- bBlockStartMerged = TRUE;
+ bBlockStartMerged = sal_True;
}
}
@@ -365,7 +365,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
}
if ( !bCols && !bRows )
- aHdrFunc.SetAnchorFlag( FALSE );
+ aHdrFunc.SetAnchorFlag( false );
}
void ScTabView::GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY)
@@ -813,21 +813,21 @@ void ScTabView::UpdateCopySourceOverlay()
void ScTabView::UpdateSelectionOverlay()
{
- for (USHORT i=0; i<4; i++)
+ for (sal_uInt16 i=0; i<4; i++)
if ( pGridWin[i] && pGridWin[i]->IsVisible() )
pGridWin[i]->UpdateSelectionOverlay();
}
void ScTabView::UpdateShrinkOverlay()
{
- for (USHORT i=0; i<4; i++)
+ for (sal_uInt16 i=0; i<4; i++)
if ( pGridWin[i] && pGridWin[i]->IsVisible() )
pGridWin[i]->UpdateShrinkOverlay();
}
void ScTabView::UpdateAllOverlays()
{
- for (USHORT i=0; i<4; i++)
+ for (sal_uInt16 i=0; i<4; i++)
if ( pGridWin[i] && pGridWin[i]->IsVisible() )
pGridWin[i]->UpdateAllOverlays();
}
@@ -836,20 +836,20 @@ void ScTabView::UpdateAllOverlays()
//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae.
//!
-void ScTabView::PaintBlock( BOOL bReset )
+void ScTabView::PaintBlock( sal_Bool bReset )
{
ScMarkData& rMark = aViewData.GetMarkData();
SCTAB nTab = aViewData.GetTabNo();
- BOOL bMark = rMark.IsMarked();
- BOOL bMulti = rMark.IsMultiMarked();
+ sal_Bool bMark = rMark.IsMarked();
+ sal_Bool bMulti = rMark.IsMultiMarked();
if (bMark || bMulti)
{
ScRange aMarkRange;
HideAllCursors();
if (bMulti)
{
- BOOL bFlag = rMark.GetMarkingFlag();
- rMark.SetMarking(FALSE);
+ sal_Bool bFlag = rMark.GetMarkingFlag();
+ rMark.SetMarking(false);
rMark.MarkToMulti();
rMark.GetMultiMarkArea(aMarkRange);
rMark.MarkToSimple();
@@ -867,7 +867,7 @@ void ScTabView::PaintBlock( BOOL bReset )
nBlockEndY = aMarkRange.aEnd.Row();
nBlockEndZ = aMarkRange.aEnd.Tab();
- BOOL bDidReset = FALSE;
+ sal_Bool bDidReset = false;
if ( nTab>=nBlockStartZ && nTab<=nBlockEndZ )
{
@@ -878,7 +878,7 @@ void ScTabView::PaintBlock( BOOL bReset )
{
rMark.ResetMark();
UpdateSelectionOverlay();
- bDidReset = TRUE;
+ bDidReset = true;
}
}
else
@@ -892,7 +892,7 @@ void ScTabView::PaintBlock( BOOL bReset )
}
}
-void ScTabView::SelectAll( BOOL bContinue )
+void ScTabView::SelectAll( sal_Bool bContinue )
{
ScMarkData& rMark = aViewData.GetMarkData();
SCTAB nTab = aViewData.GetTabNo();
@@ -921,7 +921,7 @@ void ScTabView::SelectAllTables()
if (nCount>1)
{
for (SCTAB i=0; i<nCount; i++)
- rMark.SelectTable( i, TRUE );
+ rMark.SelectTable( i, sal_True );
aViewData.GetDocShell()->PostPaintExtras();
SfxBindings& rBind = aViewData.GetBindings();
@@ -946,7 +946,7 @@ void ScTabView::DeselectAllTables()
rBind.Invalidate( FID_TAB_DESELECTALL );
}
-BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
+sal_Bool lcl_FitsInWindow( double fScaleX, double fScaleY, sal_uInt16 nZoom,
long nWindowX, long nWindowY, ScDocument* pDoc, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
SCCOL nFixPosX, SCROW nFixPosY )
@@ -960,22 +960,22 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
for (nCol=0; nCol<nFixPosX; nCol++)
{
// for frozen panes, add both parts
- USHORT nColTwips = pDoc->GetColWidth( nCol, nTab );
+ sal_uInt16 nColTwips = pDoc->GetColWidth( nCol, nTab );
if (nColTwips)
{
nBlockX += (long)(nColTwips * fScaleX);
if (nBlockX > nWindowX)
- return FALSE;
+ return false;
}
}
for (nCol=nStartCol; nCol<=nEndCol; nCol++)
{
- USHORT nColTwips = pDoc->GetColWidth( nCol, nTab );
+ sal_uInt16 nColTwips = pDoc->GetColWidth( nCol, nTab );
if (nColTwips)
{
nBlockX += (long)(nColTwips * fScaleX);
if (nBlockX > nWindowX)
- return FALSE;
+ return false;
}
}
@@ -986,31 +986,31 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
continue;
// for frozen panes, add both parts
- USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
+ sal_uInt16 nRowTwips = pDoc->GetRowHeight(nRow, nTab);
if (nRowTwips)
{
nBlockY += (long)(nRowTwips * fScaleY);
if (nBlockY > nWindowY)
- return FALSE;
+ return false;
}
}
for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
{
- USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
+ sal_uInt16 nRowTwips = pDoc->GetRowHeight(nRow, nTab);
if (nRowTwips)
{
nBlockY += (long)(nRowTwips * fScaleY);
if (nBlockY > nWindowY)
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return sal_True;
}
-USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
+sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
{
- USHORT nZoom = 0; // Ergebnis
+ sal_uInt16 nZoom = 0; // Ergebnis
switch ( eType )
{
@@ -1081,11 +1081,11 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
double nPPTX = ScGlobal::nScreenPPTX / pDocSh->GetOutputFactor();
double nPPTY = ScGlobal::nScreenPPTY;
- USHORT nMin = MINZOOM;
- USHORT nMax = MAXZOOM;
+ sal_uInt16 nMin = MINZOOM;
+ sal_uInt16 nMax = MAXZOOM;
while ( nMax > nMin )
{
- USHORT nTest = (nMin+nMax+1)/2;
+ sal_uInt16 nTest = (nMin+nMax+1)/2;
if ( lcl_FitsInWindow(
nPPTX, nPPTY, nTest, aWinSize.Width(), aWinSize.Height(),
pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow,
@@ -1127,7 +1127,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
if ( pStyleSheet )
{
ScPrintFunc aPrintFunc( aViewData.GetDocShell(),
- aViewData.GetViewShell()->GetPrinter(TRUE),
+ aViewData.GetViewShell()->GetPrinter(sal_True),
nCurTab );
Size aPageSize = aPrintFunc.GetDataSize();
@@ -1183,7 +1183,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
if (eType == SVX_ZOOM_WHOLEPAGE && nZoomY < nNew)
nNew = nZoomY;
- nZoom = (USHORT) nNew;
+ nZoom = (sal_uInt16) nNew;
}
}
break;
@@ -1215,7 +1215,7 @@ void ScTabView::StopMarking()
void ScTabView::HideNoteMarker()
{
- for (USHORT i=0; i<4; i++)
+ for (sal_uInt16 i=0; i<4; i++)
if (pGridWin[i] && pGridWin[i]->IsVisible())
pGridWin[i]->HideNoteMarker();
}
@@ -1240,7 +1240,7 @@ void ScTabView::MakeDrawLayer()
}
}
-void ScTabView::ErrorMessage( USHORT nGlobStrId )
+void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
{
if ( SC_MOD()->IsInExecuteDrop() )
{
@@ -1252,7 +1252,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId )
Window* pParent = aViewData.GetDialogParent();
ScWaitCursorOff aWaitOff( pParent );
- BOOL bFocus = pParent && pParent->HasFocus();
+ sal_Bool bFocus = pParent && pParent->HasFocus();
if(nGlobStrId==STR_PROTECTIONERR)
{
@@ -1268,7 +1268,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId )
pParent->GrabFocus();
}
-Window* ScTabView::GetParentOrChild( USHORT nChildId )
+Window* ScTabView::GetParentOrChild( sal_uInt16 nChildId )
{
SfxViewFrame* pViewFrm = aViewData.GetViewShell()->GetViewFrame();
@@ -1286,7 +1286,7 @@ Window* ScTabView::GetParentOrChild( USHORT nChildId )
return aViewData.GetDialogParent();
}
-void ScTabView::UpdatePageBreakData( BOOL bForcePaint )
+void ScTabView::UpdatePageBreakData( sal_Bool bForcePaint )
{
ScPageBreakData* pNewData = NULL;
@@ -1296,7 +1296,7 @@ void ScTabView::UpdatePageBreakData( BOOL bForcePaint )
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = aViewData.GetTabNo();
- USHORT nCount = pDoc->GetPrintRangeCount(nTab);
+ sal_uInt16 nCount = pDoc->GetPrintRangeCount(nTab);
if (!nCount)
nCount = 1;
pNewData = new ScPageBreakData(nCount);