Skip to content

C
core
Kaydet (Commit) 0793a830 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

sal_Bool->bool 

Change-Id: Ia73bd33beaaea1ff41292006c04ff7fb582fd938
üst c2f24276
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 70 deletions
sc/source/ui/inc/output.hxx
Dosyayı görüntüle @ 0793a830
......@@ -176,7 +176,7 @@ private:
// #114135#
FmFormView* pDrawView; // SdrView to paint to
sal_Bool bEditMode; // InPlace edited cell - do not output
bool bEditMode; // InPlace edited cell - do not output
SCCOL nEditCol;
SCROW nEditRow;
......@@ -189,7 +189,7 @@ private:
bool mbUseStyleColor;
bool mbForceAutoColor;
sal_Bool mbSyntaxMode; // Syntax highlighting
bool mbSyntaxMode; // Syntax highlighting
Color* pValueColor;
Color* pTextColor;
Color* pFormulaColor;
......@@ -215,8 +215,8 @@ private:
// private methods
sal_Bool GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
SCCOL& rOverX, SCROW& rOverY, sal_Bool bVisRowChanged );
bool GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
SCCOL& rOverX, SCROW& rOverY, bool bVisRowChanged );
bool IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY );
void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScRefCellValue& rCell );
......@@ -231,7 +231,7 @@ private:
void ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlignRect,
long nLeftM, long nTopM, long nRightM, long nBottomM,
sal_Bool bWidth, sal_uInt16 nOrient, long nAttrRotate, sal_Bool bPixelToLogic,
bool bWidth, sal_uInt16 nOrient, long nAttrRotate, bool bPixelToLogic,
long& rEngineWidth, long& rEngineHeight, long& rNeededPixel,
bool& rLeftClip, bool& rRightClip );
......@@ -280,37 +280,37 @@ public:
// #114135#
void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; }
void SetSolidBackground( sal_Bool bSet ) { bSolidBackground = bSet; }
void SetUseStyleColor( sal_Bool bSet ) { mbUseStyleColor = bSet; }
void SetSolidBackground( bool bSet ) { bSolidBackground = bSet; }
void SetUseStyleColor( bool bSet ) { mbUseStyleColor = bSet; }
void SetEditCell( SCCOL nCol, SCROW nRow );
void SetSyntaxMode( sal_Bool bNewMode );
void SetMetaFileMode( sal_Bool bNewMode );
void SetSingleGrid( sal_Bool bNewMode );
void SetSyntaxMode( bool bNewMode );
void SetMetaFileMode( bool bNewMode );
void SetSingleGrid( bool bNewMode );
void SetGridColor( const Color& rColor );
void SetMarkClipped( sal_Bool bSet );
void SetShowNullValues ( sal_Bool bSet = sal_True );
void SetShowFormulas ( sal_Bool bSet = sal_True );
void SetShowSpellErrors( sal_Bool bSet = sal_True );
void SetMarkClipped( bool bSet );
void SetShowNullValues ( bool bSet = true );
void SetShowFormulas ( bool bSet = true );
void SetShowSpellErrors( bool bSet = true );
void SetMirrorWidth( long nNew );
long GetScrW() const { return nScrW; }
long GetScrH() const { return nScrH; }
void SetSnapPixel( sal_Bool bSet = sal_True );
void SetSnapPixel( bool bSet = true );
void DrawGrid( sal_Bool bGrid, sal_Bool bPage );
void DrawStrings( sal_Bool bPixelToLogic = false );
void DrawGrid( bool bGrid, bool bPage );
void DrawStrings( bool bPixelToLogic = false );
void DrawDocumentBackground();
void DrawBackground();
void DrawShadow();
void DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom);
void DrawExtraShadow(bool bLeft, bool bTop, bool bRight, bool bBottom);
void DrawFrame();
// with logic MapMode set!
void DrawEdit(sal_Bool bPixelToLogic);
void DrawEdit(bool bPixelToLogic);
void FindRotated();
void DrawRotated(sal_Bool bPixelToLogic); // logical
void DrawRotated(bool bPixelToLogic); // logical
void DrawClear();
......@@ -323,14 +323,14 @@ public:
void DrawingSingle(const sal_uInt16 nLayer);
void DrawSelectiveObjects(const sal_uInt16 nLayer);
sal_Bool SetChangedClip(); // sal_False = not
Region GetChangedAreaRegion();
bool SetChangedClip(); // sal_False = not
Region GetChangedAreaRegion();
void FindChanged();
void SetPagebreakMode( ScPageBreakData* pPageData );
void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, sal_Bool bHandle );
const Color& rColor, bool bHandle );
void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, sal_uInt16 nType );
......
sc/source/ui/view/gridwin4.cxx
Dosyayı görüntüle @ 0793a830
......@@ -541,7 +541,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
if ( eMode == SC_UPDATE_CHANGED )
{
aOutputData.FindChanged();
aOutputData.SetSingleGrid(sal_True);
aOutputData.SetSingleGrid(true);
}
sal_Bool bPageMode = pViewData->IsPagebreakMode();
......@@ -679,7 +679,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
DrawRedraw( aOutputData, eMode, SC_LAYER_BACK );
}
else
aOutputData.SetSolidBackground(sal_True);
aOutputData.SetSolidBackground(true);
pContentDev->SetMapMode(MAP_PIXEL);
aOutputData.DrawDocumentBackground();
......@@ -712,8 +712,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
pContentDev->SetMapMode(pViewData->GetLogicMode(eWhich));
if ( bLogicText )
aOutputData.DrawStrings(sal_True); // in logic MapMode if bTextWysiwyg is set
aOutputData.DrawEdit(sal_True);
aOutputData.DrawStrings(true); // in logic MapMode if bTextWysiwyg is set
aOutputData.DrawEdit(true);
pContentDev->SetMapMode(MAP_PIXEL);
// Autofilter- und Pivot-Buttons
......@@ -806,7 +806,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
aOutputData.DrawRefMark( aRef.aStart.Col(), aRef.aStart.Row(),
aRef.aEnd.Col(), aRef.aEnd.Row(),
Color( pData->nColorData ),
sal_True );
true );
}
}
}
......
sc/source/ui/view/output.cxx
Dosyayı görüntüle @ 0793a830
......@@ -251,27 +251,27 @@ void ScOutputData::SetGridColor( const Color& rColor )
aGridColor = rColor;
}
void ScOutputData::SetMarkClipped( sal_Bool bSet )
void ScOutputData::SetMarkClipped( bool bSet )
{
bMarkClipped = bSet;
}
void ScOutputData::SetShowNullValues( sal_Bool bSet )
void ScOutputData::SetShowNullValues( bool bSet )
{
mbShowNullValues = bSet;
}
void ScOutputData::SetShowFormulas( sal_Bool bSet )
void ScOutputData::SetShowFormulas( bool bSet )
{
mbShowFormulas = bSet;
}
void ScOutputData::SetShowSpellErrors( sal_Bool bSet )
void ScOutputData::SetShowSpellErrors( bool bSet )
{
bShowSpellErrors = bSet;
}
void ScOutputData::SetSnapPixel( sal_Bool bSet )
void ScOutputData::SetSnapPixel( bool bSet )
{
bSnapPixel = bSet;
}
......@@ -280,20 +280,20 @@ void ScOutputData::SetEditCell( SCCOL nCol, SCROW nRow )
{
nEditCol = nCol;
nEditRow = nRow;
bEditMode = sal_True;
bEditMode = true;
}
void ScOutputData::SetMetaFileMode( sal_Bool bNewMode )
void ScOutputData::SetMetaFileMode( bool bNewMode )
{
bMetaFile = bNewMode;
}
void ScOutputData::SetSingleGrid( sal_Bool bNewMode )
void ScOutputData::SetSingleGrid( bool bNewMode )
{
bSingleGrid = bNewMode;
}
void ScOutputData::SetSyntaxMode( sal_Bool bNewMode )
void ScOutputData::SetSyntaxMode( bool bNewMode )
{
mbSyntaxMode = bNewMode;
if (bNewMode)
......@@ -305,7 +305,7 @@ void ScOutputData::SetSyntaxMode( sal_Bool bNewMode )
}
}
void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
void ScOutputData::DrawGrid( bool bGrid, bool bPage )
{
SCCOL nX;
SCROW nY;
......@@ -315,7 +315,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
ScBreakType nBreak = BREAK_NONE;
ScBreakType nBreakOld = BREAK_NONE;
sal_Bool bSingle;
bool bSingle;
Color aPageColor;
Color aManualColor;
......@@ -387,7 +387,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
}
}
sal_Bool bDraw = bGrid || nBreakOld; // simple grid only if set that way
bool bDraw = bGrid || nBreakOld; // simple grid only if set that way
sal_uInt16 nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth;
bSingle = bSingleGrid; //! get into Fillinfo !!!!!
......@@ -397,9 +397,9 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
for (nArrY=1; nArrY+1<nArrCount && !bSingle; nArrY++)
{
if (pRowInfo[nArrY].pCellInfo[nXplus2].bHOverlapped)
bSingle = sal_True;
bSingle = true;
if (pRowInfo[nArrY].pCellInfo[nXplus1].bHideGrid)
bSingle = sal_True;
bSingle = true;
}
}
......@@ -418,7 +418,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
nNextY = nPosY + pThisRowInfo->nHeight;
sal_Bool bHOver = pThisRowInfo->pCellInfo[nXplus1].bHideGrid;
bool bHOver = pThisRowInfo->pCellInfo[nXplus1].bHideGrid;
if (!bHOver)
{
if (nWidthXplus2)
......@@ -496,12 +496,12 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
bool bDraw = bGrid || nBreakOld; // simple grid only if set so
sal_Bool bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
bool bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
bSingle = !bNextYisNextRow; // Hidden
for (SCCOL i=nX1; i<=nX2 && !bSingle; i++)
{
if (pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped)
bSingle = sal_True;
bSingle = true;
}
if (bDraw)
......@@ -520,7 +520,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
nNextX = nPosX + pRowInfo[0].pCellInfo[i+1].nWidth * nLayoutSign;
if (nNextX != nPosX) // visible
{
sal_Bool bVOver;
bool bVOver;
if ( bNextYisNextRow )
bVOver = pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped;
else
......@@ -1061,7 +1061,7 @@ void ScOutputData::DrawShadow()
DrawExtraShadow( false, false, false, false );
}
void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom)
void ScOutputData::DrawExtraShadow(bool bLeft, bool bTop, bool bRight, bool bBottom)
{
mpDev->SetLineColor();
......@@ -1856,7 +1856,7 @@ Region ScOutputData::GetChangedAreaRegion()
return aRegion;
}
sal_Bool ScOutputData::SetChangedClip()
bool ScOutputData::SetChangedClip()
{
PolyPolygon aPoly;
......@@ -1891,7 +1891,7 @@ sal_Bool ScOutputData::SetChangedClip()
if (bHad)
aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) );
sal_Bool bRet = (aPoly.Count() != 0);
bool bRet = (aPoly.Count() != 0);
if (bRet)
mpDev->SetClipRegion(Region(aPoly));
return bRet;
......@@ -1953,7 +1953,7 @@ void ScOutputData::FindChanged()
void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, sal_Bool bHandle )
const Color& rColor, bool bHandle )
{
PutInOrder( nRefStartX, nRefEndX );
PutInOrder( nRefStartY, nRefEndY );
......@@ -1976,10 +1976,10 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
}
long nLayoutSign = bLayoutRTL ? -1 : 1;
sal_Bool bTop = false;
sal_Bool bBottom = false;
sal_Bool bLeft = false;
sal_Bool bRight = false;
bool bTop = false;
bool bBottom = false;
bool bLeft = false;
bool bRight = false;
long nPosY = nScrY;
bool bNoStartY = ( nY1 < nRefStartY );
......@@ -1991,17 +1991,17 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
if ( nY==nRefStartY || (nY>nRefStartY && bNoStartY) )
{
nMinY = nPosY;
bTop = sal_True;
bTop = true;
}
if ( nY==nRefEndY )
{
nMaxY = nPosY + pRowInfo[nArrY].nHeight - 2;
bBottom = sal_True;
bBottom = true;
}
if ( nY>nRefEndY && bNoEndY )
{
nMaxY = nPosY-2;
bBottom = sal_True;
bBottom = true;
}
bNoStartY = ( nY < nRefStartY );
bNoEndY = ( nY < nRefEndY );
......@@ -2017,12 +2017,12 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
if ( nX==nRefStartX )
{
nMinX = nPosX;
bLeft = sal_True;
bLeft = true;
}
if ( nX==nRefEndX )
{
nMaxX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 2 ) * nLayoutSign;
bRight = sal_True;
bRight = true;
}
nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
}
......@@ -2104,10 +2104,10 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
}
long nLayoutSign = bLayoutRTL ? -1 : 1;
sal_Bool bTop = false;
sal_Bool bBottom = false;
sal_Bool bLeft = false;
sal_Bool bRight = false;
bool bTop = false;
bool bBottom = false;
bool bLeft = false;
bool bRight = false;
long nPosY = nScrY;
bool bNoStartY = ( nY1 < nRefStartY );
......@@ -2119,17 +2119,17 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
if ( nY==nRefStartY || (nY>nRefStartY && bNoStartY) )
{
nMinY = nPosY - 1;
bTop = sal_True;
bTop = true;
}
if ( nY==nRefEndY )
{
nMaxY = nPosY + pRowInfo[nArrY].nHeight - 1;
bBottom = sal_True;
bBottom = true;
}
if ( nY>nRefEndY && bNoEndY )
{
nMaxY = nPosY - 1;
bBottom = sal_True;
bBottom = true;
}
bNoStartY = ( nY < nRefStartY );
bNoEndY = ( nY < nRefEndY );
......@@ -2145,12 +2145,12 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
if ( nX==nRefStartX )
{
nMinX = nPosX - nLayoutSign;
bLeft = sal_True;
bLeft = true;
}
if ( nX==nRefEndX )
{
nMaxX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 1 ) * nLayoutSign;
bRight = sal_True;
bRight = true;
}
nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
}
......
sc/source/ui/view/output2.cxx
Dosyayı görüntüle @ 0793a830
This diff is collapsed.
sc/source/ui/view/printfun.cxx
Dosyayı görüntüle @ 0793a830
......@@ -554,7 +554,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
if (!bMetaFile && pViewData)
pDev->SetMapMode(aMode);
aOutputData.DrawGrid( sal_True, false ); // no page breaks
aOutputData.DrawGrid( true, false ); // no page breaks
pDev->SetLineColor( COL_BLACK );
......@@ -1615,7 +1615,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
if (aTableParam.bGrid)
aOutputData.DrawGrid( sal_True, false ); // no page breaks
aOutputData.DrawGrid( true, false ); // no page breaks
aOutputData.AddPDFNotes(); // has no effect if not rendering PDF with notes enabled
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment