[Libreoffice-commits] core.git: 2 commits - sc/source
Takeshi Abe
tabe at fixedpoint.jp
Fri Aug 16 16:06:10 PDT 2013
sc/source/core/tool/consoli.cxx | 22 +++++------
sc/source/core/tool/interpr1.cxx | 2 -
sc/source/ui/app/rfindlst.cxx | 2 -
sc/source/ui/navipi/content.cxx | 28 +++++++--------
sc/source/ui/unoobj/styleuno.cxx | 30 ++++++++--------
sc/source/ui/view/output.cxx | 72 +++++++++++++++++++--------------------
6 files changed, 78 insertions(+), 78 deletions(-)
New commits:
commit 92eaf78fd4485037f8721cba04affc947dd92a71
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Aug 17 08:03:41 2013 +0900
sal_Bool to bool
Change-Id: I85995bc3e1fc3c1f01b4d9bded3707ea0b296fa9
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 137f5f3..8630a01 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -267,10 +267,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB nTab,
aTitle = pSrcDoc->GetString(nCol, nRow1, nTab);
if (aTitle.Len())
{
- sal_Bool bFound = false;
+ bool bFound = false;
for (SCSIZE i=0; i<nColCount && !bFound; i++)
if ( *ppColHeaders[i] == aTitle )
- bFound = sal_True;
+ bFound = true;
if (!bFound)
lcl_AddString( ppColHeaders, nColCount, aTitle );
}
@@ -284,10 +284,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB nTab,
aTitle = pSrcDoc->GetString(nCol1, nRow, nTab);
if (aTitle.Len())
{
- sal_Bool bFound = false;
+ bool bFound = false;
for (SCSIZE i=0; i<nRowCount && !bFound; i++)
if ( *ppRowHeaders[i] == aTitle )
- bFound = sal_True;
+ bFound = true;
if (!bFound)
lcl_AddString( ppRowHeaders, nRowCount, aTitle );
}
@@ -539,12 +539,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
SCCOL nPos = SC_CONS_NOTFOUND;
if (aTitle.Len())
{
- sal_Bool bFound = false;
+ bool bFound = false;
for (SCSIZE i=0; i<nColCount && !bFound; i++)
if ( *ppColHeaders[i] == aTitle )
{
nPos = static_cast<SCCOL>(i);
- bFound = sal_True;
+ bFound = true;
}
OSL_ENSURE(bFound, "column not found");
}
@@ -560,12 +560,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
SCROW nPos = SC_CONS_NOTFOUND;
if (aTitle.Len())
{
- sal_Bool bFound = false;
+ bool bFound = false;
for (SCSIZE i=0; i<nRowCount && !bFound; i++)
if ( *ppRowHeaders[i] == aTitle )
{
nPos = static_cast<SCROW>(i);
- bFound = sal_True;
+ bFound = true;
}
OSL_ENSURE(bFound, "row not found");
}
@@ -577,7 +577,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
// Daten
- sal_Bool bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
+ bool bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
for (nCol=nCol1; nCol<=nCol2; nCol++)
{
SCCOL nArrX = nCol-nCol1;
@@ -794,7 +794,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
for (SCSIZE nPos=0; nPos<nDataCount; nPos++)
{
SCSIZE nTPos = ppTitlePos[nArrY][nPos];
- sal_Bool bDo = sal_True;
+ bool bDo = true;
if (nPos+1<nDataCount)
if (ppTitlePos[nArrY][nPos+1] == nTPos)
bDo = false; // leer
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index a464d77..bf275d1 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -348,7 +348,7 @@ void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt )
void ScContentTree::KeyInput( const KeyEvent& rKEvt )
{
- sal_Bool bUsed = false;
+ bool bUsed = false;
const KeyCode aCode = rKEvt.GetKeyCode();
if (aCode.GetCode() == KEY_RETURN)
@@ -357,7 +357,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
{
case KEY_MOD1:
ToggleRoot(); // toggle root mode (as in Writer)
- bUsed = sal_True;
+ bUsed = true;
break;
case 0:
{
@@ -379,7 +379,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
ContentDoubleClickHdl(0); // select content as if double clicked
}
- bUsed = sal_True;
+ bUsed = true;
}
break;
}
@@ -411,7 +411,7 @@ void ScContentTree::DragFinished( sal_Int8 /* nAction */ )
void ScContentTree::Command( const CommandEvent& rCEvt )
{
- sal_Bool bDone = false;
+ bool bDone = false;
switch ( rCEvt.GetCommand() )
{
@@ -423,7 +423,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
Application::PostUserEvent( STATIC_LINK( this, ScContentTree, ExecDragHdl ) );
- bDone = sal_True;
+ bDone = true;
break;
case COMMAND_CONTEXTMENU:
@@ -1035,8 +1035,8 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uI
ScDrawLayer* pModel = pSrcDoc->GetDrawLayer();
if (pModel)
{
- sal_Bool bOle = ( nType == SC_CONTENT_OLEOBJECT );
- sal_Bool bGraf = ( nType == SC_CONTENT_GRAPHIC );
+ bool bOle = ( nType == SC_CONTENT_OLEOBJECT );
+ bool bGraf = ( nType == SC_CONTENT_GRAPHIC );
sal_uInt16 nDrawId = sal::static_int_cast<sal_uInt16>( bOle ? OBJ_OLE2 : ( bGraf ? OBJ_GRAF : OBJ_GRUP ) );
SCTAB nTab = 0;
SdrObject* pObject = pModel->GetNamedObject( rName, nDrawId, nTab );
@@ -1136,7 +1136,7 @@ void ScContentTree::DoDrag()
}
}
- sal_Bool bDoLinkTrans = false; // use ScLinkTransferObj
+ bool bDoLinkTrans = false; // use ScLinkTransferObj
String aLinkURL; // for ScLinkTransferObj
String aLinkText;
@@ -1159,7 +1159,7 @@ void ScContentTree::DoDrag()
aLinkURL = aUrl;
aLinkText = aText;
}
- bDoLinkTrans = sal_True;
+ bDoLinkTrans = true;
}
break;
case SC_DROPMODE_LINK:
@@ -1172,12 +1172,12 @@ void ScContentTree::DoDrag()
{
case SC_CONTENT_TABLE:
pScMod->SetDragLink( aDocName, aText, EMPTY_STRING );
- bDoLinkTrans = sal_True;
+ bDoLinkTrans = true;
break;
case SC_CONTENT_RANGENAME:
case SC_CONTENT_DBAREA:
pScMod->SetDragLink( aDocName, EMPTY_STRING, aText );
- bDoLinkTrans = sal_True;
+ bDoLinkTrans = true;
break;
// other types cannot be linked
@@ -1397,7 +1397,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li
if ( rName.Copy( nNotActiveStart ) == pParentWindow->aStrNotActive )
aRealName = rName.Copy( 0, nNotActiveStart );
- sal_Bool bLoaded = false;
+ bool bLoaded = false;
// ist es ein normal geladenes Doc ?
@@ -1406,7 +1406,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li
{
if ( pSh->ISA(ScDocShell) )
if ( pSh->GetTitle() == aRealName )
- bLoaded = sal_True;
+ bLoaded = true;
pSh = SfxObjectShell::GetNext( *pSh );
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 5e7de70..eaf2c05 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -398,12 +398,12 @@ SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.styl
//------------------------------------------------------------------------
-static sal_Bool lcl_AnyTabProtected( ScDocument& rDoc )
+static bool lcl_AnyTabProtected( ScDocument& rDoc )
{
SCTAB nTabCount = rDoc.GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
if (rDoc.IsTabProtected(i))
- return sal_True;
+ return true;
return false;
}
@@ -664,7 +664,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::
lang::WrappedTargetException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- sal_Bool bDone = false;
+ bool bDone = false;
// Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY);
if ( xInterface.is() )
@@ -691,7 +691,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::
pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden
pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht
- bDone = sal_True;
+ bDone = true;
}
else
throw container::ElementExistException();
@@ -720,7 +720,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName )
lang::WrappedTargetException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- sal_Bool bFound = false;
+ bool bFound = false;
if ( pDocShell )
{
String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<sal_uInt16>(eFamily) ));
@@ -734,7 +734,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName )
SfxStyleSheetBase* pStyle = pStylePool->Find( aString, eFamily );
if (pStyle)
{
- bFound = sal_True;
+ bFound = true;
if ( eFamily == SFX_STYLE_FAMILY_PARA )
{
// wie ScViewFunc::RemoveStyleSheetInUse
@@ -1539,7 +1539,7 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt
throw uno::RuntimeException();
SfxItemSet& rSet = pStyle->GetItemSet(); // direkt im lebenden Style aendern...
- sal_Bool bDone = false;
+ bool bDone = false;
if ( eFamily == SFX_STYLE_FAMILY_PAGE )
{
if(pEntry->nWID == SC_WID_UNO_HEADERSET)
@@ -1553,7 +1553,7 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt
else
aNewHeader.GetItemSet().ClearItem( pHeaderEntry->nWID );
rSet.Put( aNewHeader );
- bDone = sal_True;
+ bDone = true;
}
}
else if(pEntry->nWID == SC_WID_UNO_FOOTERSET)
@@ -1567,7 +1567,7 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt
else
aNewFooter.GetItemSet().ClearItem( pFooterEntry->nWID );
rSet.Put( aNewFooter );
- bDone = sal_True;
+ bDone = true;
}
}
}
@@ -1687,13 +1687,13 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt
case ATTR_PAGE_PAPERBIN:
{
sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS;
- sal_Bool bFound = false;
+ bool bFound = false;
OUString aName;
if ( *pValue >>= aName )
{
if ( aName == SC_PAPERBIN_DEFAULTNAME )
- bFound = sal_True;
+ bFound = true;
else
{
Printer* pPrinter = pDocShell->GetPrinter();
@@ -1704,7 +1704,7 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt
if ( aName == pPrinter->GetPaperBinName(i) )
{
nTray = (sal_uInt8) i;
- bFound = sal_True;
+ bFound = true;
break;
}
}
@@ -1986,7 +1986,7 @@ OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeExceptio
sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName )
throw(uno::RuntimeException)
{
- sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
+ bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SCSTYLE_SERVICE ) )||
rServiceName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE ));
@@ -1995,7 +1995,7 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName )
uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
throw(uno::RuntimeException)
{
- sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
+ bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = OUString(SCSTYLE_SERVICE );
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 21c471b..a8acd70 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -514,7 +514,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
}
}
- sal_Bool bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
+ bool bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
sal_Bool bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
bSingle = !bNextYisNextRow; // Hidden
@@ -574,7 +574,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData )
{
- bPagebreakMode = sal_True;
+ bPagebreakMode = true;
if (!pPageData)
return; // noch nicht initialisiert -> alles "nicht gedruckt"
@@ -722,8 +722,8 @@ static const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCR
// ----------------------------------------------------------------------------
-static sal_Bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
- SCCOL nX1, SCCOL nX2, sal_Bool bShowProt, sal_Bool bPagebreakMode )
+static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
+ SCCOL nX1, SCCOL nX2, bool bShowProt, bool bPagebreakMode )
{
if ( rFirst.bChanged != rOther.bChanged ||
rFirst.bEmptyBack != rOther.bEmptyBack )
@@ -785,7 +785,7 @@ static sal_Bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
return false;
}
- return sal_True;
+ return true;
}
void ScOutputData::DrawDocumentBackground()
@@ -985,10 +985,10 @@ void ScOutputData::DrawBackground()
mpDev->SetLineColor();
- sal_Bool bShowProt = mbSyntaxMode && mpDoc->IsTabProtected(nTab);
- sal_Bool bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
+ bool bShowProt = mbSyntaxMode && mpDoc->IsTabProtected(nTab);
+ bool bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
- sal_Bool bCellContrast = mbUseStyleColor &&
+ bool bCellContrast = mbUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
long nPosY = nScrY;
@@ -1090,7 +1090,7 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
mpDev->SetLineColor();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
+ bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
Color aAutoTextColor;
if ( bCellContrast )
aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
@@ -1107,8 +1107,8 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
long nPosY = nScrY - pRowInfo[0].nHeight;
for (SCSIZE nArrY=0; nArrY<nArrCount; nArrY++)
{
- sal_Bool bCornerY = ( nArrY == 0 ) || ( nArrY+1 == nArrCount );
- sal_Bool bSkipY = ( nArrY==0 && !bTop ) || ( nArrY+1 == nArrCount && !bBottom );
+ bool bCornerY = ( nArrY == 0 ) || ( nArrY+1 == nArrCount );
+ bool bSkipY = ( nArrY==0 && !bTop ) || ( nArrY+1 == nArrCount && !bBottom );
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
long nRowHeight = pThisRowInfo->nHeight;
@@ -1118,8 +1118,8 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
long nPosX = nInitPosX - pRowInfo[0].pCellInfo[nX1].nWidth * nLayoutSign;
for (SCCOL nArrX=nX1; nArrX<=nX2+2; nArrX++)
{
- sal_Bool bCornerX = ( nArrX==nX1 || nArrX==nX2+2 );
- sal_Bool bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight );
+ bool bCornerX = ( nArrX==nX1 || nArrX==nX2+2 );
+ bool bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight );
for (sal_uInt16 nPass=0; nPass<2; nPass++) // horizontal / vertikal
{
@@ -1132,7 +1132,7 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
pThisRowInfo->pCellInfo[nArrX].eVShadowPart :
pThisRowInfo->pCellInfo[nArrX].eHShadowPart;
- sal_Bool bDo = sal_True;
+ bool bDo = true;
if ( (nPass==0 && bCornerX) || (nPass==1 && bCornerY) )
if ( ePart != SC_SHADOW_CORNER )
bDo = false;
@@ -1319,9 +1319,9 @@ void ScOutputData::DrawFrame()
sal_uLong nOldDrawMode = mpDev->GetDrawMode();
Color aSingleColor;
- sal_Bool bUseSingleColor = false;
+ bool bUseSingleColor = false;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
+ bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
// if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used
// for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines
@@ -1332,18 +1332,18 @@ void ScOutputData::DrawFrame()
{
mpDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_WHITEFILL) );
aSingleColor.SetColor( COL_BLACK );
- bUseSingleColor = sal_True;
+ bUseSingleColor = true;
}
else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) )
{
mpDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE
- bUseSingleColor = sal_True;
+ bUseSingleColor = true;
}
else if ( bCellContrast )
{
aSingleColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
- bUseSingleColor = sal_True;
+ bUseSingleColor = true;
}
const Color* pForceColor = bUseSingleColor ? &aSingleColor : 0;
@@ -1443,12 +1443,12 @@ void ScOutputData::DrawFrame()
static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc,
SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nRotDir,
- sal_Bool bTopLine )
+ bool bTopLine )
{
if ( nRotDir != SC_ROTDIR_LEFT && nRotDir != SC_ROTDIR_RIGHT )
return NULL;
- sal_Bool bFound = false;
+ bool bFound = false;
while (!bFound)
{
if ( nRotDir == SC_ROTDIR_LEFT )
@@ -1472,7 +1472,7 @@ static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc,
if ( !pPattern->GetRotateVal( pCondSet ) ||
((const SvxRotateModeItem&)pPattern->GetItem(
ATTR_ROTATE_MODE, pCondSet)).GetValue() == SVX_ROTATE_MODE_STANDARD )
- bFound = sal_True;
+ bFound = true;
}
if (bTopLine)
@@ -1519,7 +1519,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
const SfxItemSet* pCondSet;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
+ bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
// color (pForceColor) is determined externally, including DrawMode changes
@@ -1800,7 +1800,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
sal_uInt16 nDir = rInfo.nRotateDir;
if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() )
{
- svx::frame::Style aStyle( lcl_FindHorLine( mpDoc, nX, nY, nTab, nDir, sal_True ), mnPPTY );
+ svx::frame::Style aStyle( lcl_FindHorLine( mpDoc, nX, nY, nTab, nDir, true ), mnPPTY );
rArray.SetCellStyleTop( nCol, nRow, aStyle );
if( nRow > 0 )
rArray.SetCellStyleBottom( nCol, nRow - 1, aStyle );
@@ -1917,7 +1917,7 @@ sal_Bool ScOutputData::SetChangedClip()
aDrawingRect.Left() = nScrX;
aDrawingRect.Right() = nScrX+nScrW-1;
- sal_Bool bHad = false;
+ bool bHad = false;
long nPosY = nScrY;
SCSIZE nArrY;
for (nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -1929,7 +1929,7 @@ sal_Bool ScOutputData::SetChangedClip()
if (!bHad)
{
aDrawingRect.Top() = nPosY;
- bHad = sal_True;
+ bHad = true;
}
aDrawingRect.Bottom() = nPosY + pRowInfo[nArrY].nHeight - 1;
}
@@ -2035,8 +2035,8 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
sal_Bool bRight = false;
long nPosY = nScrY;
- sal_Bool bNoStartY = ( nY1 < nRefStartY );
- sal_Bool bNoEndY = false;
+ bool bNoStartY = ( nY1 < nRefStartY );
+ bool bNoEndY = false;
for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check
{
SCROW nY = pRowInfo[nArrY].nRowNo;
@@ -2163,8 +2163,8 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
sal_Bool bRight = false;
long nPosY = nScrY;
- sal_Bool bNoStartY = ( nY1 < nRefStartY );
- sal_Bool bNoEndY = false;
+ bool bNoStartY = ( nY1 < nRefStartY );
+ bool bNoEndY = false;
for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check
{
SCROW nY = pRowInfo[nArrY].nRowNo;
@@ -2320,7 +2320,7 @@ void ScOutputData::DrawChangeTrack()
void ScOutputData::DrawNoteMarks()
{
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
long nInitPosX = nScrX;
if ( bLayoutRTL )
@@ -2337,12 +2337,12 @@ void ScOutputData::DrawNoteMarks()
for (SCCOL nX=nX1; nX<=nX2; nX++)
{
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
- sal_Bool bIsMerged = false;
+ bool bIsMerged = false;
if ( nX==nX1 && pInfo->bHOverlapped && !pInfo->bVOverlapped )
{
// find start of merged cell
- bIsMerged = sal_True;
+ bIsMerged = true;
SCROW nY = pRowInfo[nArrY].nRowNo;
SCCOL nMergeX = nX;
SCROW nMergeY = nY;
@@ -2413,7 +2413,7 @@ void ScOutputData::AddPDFNotes()
for (SCCOL nX=nX1; nX<=nX2; nX++)
{
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
- sal_Bool bIsMerged = false;
+ bool bIsMerged = false;
SCROW nY = pRowInfo[nArrY].nRowNo;
SCCOL nMergeX = nX;
SCROW nMergeY = nY;
@@ -2421,7 +2421,7 @@ void ScOutputData::AddPDFNotes()
if ( nX==nX1 && pInfo->bHOverlapped && !pInfo->bVOverlapped )
{
// find start of merged cell
- bIsMerged = sal_True;
+ bIsMerged = true;
mpDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
// use origin's pCell for NotePtr test below
}
commit bfe4074ecbb66cb48f1959102cfa9e4a3756a902
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Aug 17 08:00:48 2013 +0900
Mark as const
Change-Id: I95844f01d3f7ed6e22b8d78b7a2366b131bd325b
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index f7795ca..137f5f3 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -33,7 +33,7 @@
// STATIC DATA -----------------------------------------------------------
-static OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc
+static const OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc
ocBad, // none
ocAverage,
ocCount,
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index da14d42..3d57326 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7992,7 +7992,7 @@ typedef struct {
UBlockCode to;
} UBlockScript;
-static UBlockScript scriptList[] = {
+static const UBlockScript scriptList[] = {
{UBLOCK_HANGUL_JAMO, UBLOCK_HANGUL_JAMO},
{UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES},
{UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS,UBLOCK_CJK_RADICALS_SUPPLEMENT },
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 625814f..cb326e7 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -23,7 +23,7 @@
#define SC_RANGECOLORS 8
-static ColorData aColNames[SC_RANGECOLORS] =
+static const ColorData aColNames[SC_RANGECOLORS] =
{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN };
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 0d3dfed..a464d77 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -62,7 +62,7 @@ using namespace com::sun::star;
// Reihenfolge der Kategorien im Navigator -------------------------------------
-static sal_uInt16 pTypeList[SC_CONTENT_COUNT] =
+static const sal_uInt16 pTypeList[SC_CONTENT_COUNT] =
{
SC_CONTENT_ROOT, // ROOT (0) muss vorne stehen
SC_CONTENT_TABLE,
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 163c5a8..5e7de70 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -376,7 +376,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
#define SC_FAMILYNAME_CELL "CellStyles"
#define SC_FAMILYNAME_PAGE "PageStyles"
-static sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE };
+static const sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE };
//------------------------------------------------------------------------
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 37b8c31..21c471b 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -78,7 +78,7 @@ using namespace com::sun::star;
#define SC_AUTHORCOLORCOUNT 9
-static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
+static const ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA,
COL_GREEN, COL_RED, COL_BLUE,
COL_BROWN, COL_MAGENTA, COL_CYAN };
More information about the Libreoffice-commits
mailing list