[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 13 04:54:24 PST 2012
sw/inc/unochart.hxx | 2 -
sw/source/core/undo/rolbck.cxx | 14 +++----
sw/source/core/undo/undel.cxx | 10 ++---
sw/source/core/undo/undobj.cxx | 2 -
sw/source/core/undo/unmove.cxx | 2 -
sw/source/core/undo/unovwr.cxx | 2 -
sw/source/core/undo/untbl.cxx | 36 +++++++++---------
sw/source/core/undo/untblk.cxx | 2 -
sw/source/core/unocore/swunohelper.cxx | 8 ++--
sw/source/core/unocore/unochart.cxx | 63 ++++++++++++++++-----------------
10 files changed, 71 insertions(+), 70 deletions(-)
New commits:
commit 20f2aaced1dabbd62ea516368b85e0e881d42165
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Dec 13 21:52:13 2012 +0900
sal_Bool to bool
Change-Id: I56e3889774b13fc040f72d576b8ea530bf31f9a5
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index fce97d2..e40ac8e 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -66,7 +66,7 @@ class SwFrmFmt;
//////////////////////////////////////////////////////////////////////
-sal_Bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const String &rCellRangeName );
+bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const String &rCellRangeName );
//////////////////////////////////////////////////////////////////////
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index a991a5e..10664f4 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -738,7 +738,7 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
break;
pItem = aIter.NextItem();
pOrigItem = aOrigIter.NextItem();
- } while( sal_True );
+ } while( true );
}
void SwHistorySetAttrSet::SetInDoc( SwDoc* pDoc, bool )
@@ -775,7 +775,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const SfxItemSet& rSet,
SfxItemIter aIter( rSet );
bool bAutoStyle = false;
- while( sal_True )
+ while( true )
{
const sal_uInt16 nWhich = aIter.GetCurItem()->Which();
@@ -1195,7 +1195,7 @@ void SwHistory::CopyFmtAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx )
if( aIter.IsAtEnd() )
break;
aIter.NextItem();
- } while( sal_True );
+ } while( true );
}
}
@@ -1218,17 +1218,17 @@ void SwHistory::CopyAttr( SwpHints* pHts, sal_uLong nNodeIdx,
break;
// never copy Flys and Ftn !!
- sal_Bool bNextAttr = sal_False;
+ bool bNextAttr = false;
switch( pHt->Which() )
{
case RES_TXTATR_FIELD:
// no fields, ... copy ??
if( !bFields )
- bNextAttr = sal_True;
+ bNextAttr = true;
break;
case RES_TXTATR_FLYCNT:
case RES_TXTATR_FTN:
- bNextAttr = sal_True;
+ bNextAttr = true;
break;
}
@@ -1400,7 +1400,7 @@ void SwRegHistory::_MakeSetWhichIds()
{
SfxItemIter aIter( *pSet );
sal_uInt16 nW = aIter.FirstItem()->Which();
- while( sal_True )
+ while( true )
{
m_WhichIdSet.insert( nW );
if( aIter.IsAtEnd() )
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index dc92233..9a53e8c 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -154,8 +154,8 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, sal_Bool bFullPara, sal_Bool bCalledByT
: pEnd->nNode.GetNode().GetTxtNode();
}
- sal_Bool bMoveNds = *pStt == *pEnd // any area still existent?
- ? sal_False
+ bool bMoveNds = *pStt == *pEnd // any area still existent?
+ ? false
: ( SaveCntnt( pStt, pEnd, pSttTxtNd, pEndTxtNd ) || bFromTableCopy );
if( pSttTxtNd && pEndTxtNd && pSttTxtNd != pEndTxtNd )
@@ -342,7 +342,7 @@ sal_Bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd
// 1 - copy start in Start-String
if( pSttTxtNd )
{
- sal_Bool bOneNode = nSttNode == nEndNode;
+ bool bOneNode = nSttNode == nEndNode;
xub_StrLen nLen = bOneNode ? nEndCntnt - nSttCntnt
: pSttTxtNd->GetTxt().Len() - nSttCntnt;
SwRegHistory aRHst( *pSttTxtNd, pHistory );
@@ -467,7 +467,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
if( !FillSaveData( rDelPam, *pTmpSav, sal_False ))
delete pTmpSav, pTmpSav = 0;
- sal_Bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
+ bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
( pRedlSaveData && pTmpSav &&
SwUndo::CanRedlineGroup( *pRedlSaveData, *pTmpSav, bBackSp ));
delete pTmpSav;
@@ -762,7 +762,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
else
pInsNd = 0; // do not delete Node!
- sal_Bool bNodeMove = 0 != nNode;
+ bool bNodeMove = 0 != nNode;
if( pEndStr )
{
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 547bfbd..73e1d83 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -604,7 +604,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
const SwFrmFmts& rSpzArr = *pDoc->GetSpzFrmFmts();
if( !rSpzArr.empty() )
{
- const sal_Bool bDelFwrd = rMark.nNode.GetIndex() <= rPoint.nNode.GetIndex();
+ const bool bDelFwrd = rMark.nNode.GetIndex() <= rPoint.nNode.GetIndex();
SwFlyFrmFmt* pFmt;
const SwFmtAnchor* pAnchor;
sal_uInt16 n = rSpzArr.size();
diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx
index 6ff417d..0bfd5bf 100644
--- a/sw/source/core/undo/unmove.cxx
+++ b/sw/source/core/undo/unmove.cxx
@@ -245,7 +245,7 @@ void SwUndoMove::UndoImpl(::sw::UndoRedoContext & rContext)
pTxtNd->JoinNext();
}
- } while( sal_False );
+ } while( false );
if( pHistory )
{
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 05fd441..b242426 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -128,7 +128,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
if( !FillSaveData( aPam, *pTmpSav, sal_False ))
delete pTmpSav, pTmpSav = 0;
- sal_Bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
+ bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
( pRedlSaveData && pTmpSav &&
SwUndo::CanRedlineGroup( *pRedlSaveData, *pTmpSav,
nSttCntnt > rPos.nContent.GetIndex() ));
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 134d563..ce58074 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -119,24 +119,24 @@ class _SaveTable
SfxItemSets aSets;
SwFrmFmts aFrmFmts;
sal_uInt16 nLineCount;
- sal_Bool bModifyBox : 1;
- sal_Bool bSaveFormula : 1;
- sal_Bool bNewModel : 1;
+ bool bModifyBox : 1;
+ bool bSaveFormula : 1;
+ bool bNewModel : 1;
public:
_SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt = USHRT_MAX,
- sal_Bool bSaveFml = sal_True );
+ bool bSaveFml = true );
~_SaveTable();
sal_uInt16 AddFmt( SwFrmFmt* pFmt, bool bIsLine );
void NewFrmFmt( const SwTableLine* , const SwTableBox*, sal_uInt16 nFmtPos,
SwFrmFmt* pOldFmt );
- void RestoreAttr( SwTable& rTbl, sal_Bool bModifyBox = sal_False );
+ void RestoreAttr( SwTable& rTbl, bool bModifyBox = false );
void SaveCntntAttrs( SwDoc* pDoc );
- void CreateNew( SwTable& rTbl, sal_Bool bCreateFrms = sal_True,
- sal_Bool bRestoreChart = sal_True );
- sal_Bool IsNewModel() const { return bNewModel; }
+ void CreateNew( SwTable& rTbl, bool bCreateFrms = true,
+ bool bRestoreChart = true );
+ bool IsNewModel() const { return bNewModel; }
};
class _SaveLine
@@ -867,11 +867,11 @@ void SwUndoTblHeadline::RepeatImpl(::sw::RepeatContext & rContext)
}
}
-_SaveTable::_SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt, sal_Bool bSaveFml )
+_SaveTable::_SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt, bool bSaveFml )
: aTblSet( *rTbl.GetFrmFmt()->GetAttrSet().GetPool(), aTableSetRange ),
pSwTable( &rTbl ), nLineCount( nLnCnt ), bSaveFormula( bSaveFml )
{
- bModifyBox = sal_False;
+ bModifyBox = false;
bNewModel = rTbl.IsNewModel();
aTblSet.Put( rTbl.GetFrmFmt()->GetAttrSet() );
pLine = new _SaveLine( 0, *rTbl.GetTabLines()[ 0 ], *this );
@@ -923,7 +923,7 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine )
return nRet;
}
-void _SaveTable::RestoreAttr( SwTable& rTbl, sal_Bool bMdfyBox )
+void _SaveTable::RestoreAttr( SwTable& rTbl, bool bMdfyBox )
{
sal_uInt16 n;
@@ -972,7 +972,7 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, sal_Bool bMdfyBox )
}
aFrmFmts.clear();
- bModifyBox = sal_False;
+ bModifyBox = false;
}
void _SaveTable::SaveCntntAttrs( SwDoc* pDoc )
@@ -980,8 +980,8 @@ void _SaveTable::SaveCntntAttrs( SwDoc* pDoc )
pLine->SaveCntntAttrs( pDoc );
}
-void _SaveTable::CreateNew( SwTable& rTbl, sal_Bool bCreateFrms,
- sal_Bool bRestoreChart )
+void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
+ bool bRestoreChart )
{
sal_uInt16 n;
@@ -1787,7 +1787,7 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
delete pCurrBox;
}
- pSaveTbl->CreateNew( pTblNd->GetTable(), sal_True, sal_False );
+ pSaveTbl->CreateNew( pTblNd->GetTable(), true, false );
// TL_CHART2: need to inform chart of probably changed cell names
rDoc.UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() );
@@ -2052,7 +2052,7 @@ CHECKTABLE(pTblNd->GetTable())
}
CHECKTABLE(pTblNd->GetTable())
- pSaveTbl->CreateNew( pTblNd->GetTable(), sal_True, sal_False );
+ pSaveTbl->CreateNew( pTblNd->GetTable(), true, false );
// TL_CHART2: need to inform chart of probably changed cell names
rDoc.UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() );
@@ -2845,7 +2845,7 @@ SwUndoSplitTbl::SwUndoSplitTbl( const SwTableNode& rTblNd,
// no break
case HEADLINE_BORDERCOPY:
case HEADLINE_BOXATTRCOPY:
- pSavTbl = new _SaveTable( rTblNd.GetTable(), 1, sal_False );
+ pSavTbl = new _SaveTable( rTblNd.GetTable(), 1, false );
break;
}
}
@@ -2886,7 +2886,7 @@ void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext & rContext)
case HEADLINE_BOXATTRCOPY:
case HEADLINE_BORDERCOPY:
{
- pSavTbl->CreateNew( rTbl, sal_False );
+ pSavTbl->CreateNew( rTbl, false );
pSavTbl->RestoreAttr( rTbl );
}
break;
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 89f2d02..4845717 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -163,7 +163,7 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
pDoc->DeleteRedline( *pPam, true, USHRT_MAX );
// if Point and Mark are different text nodes so a JoinNext has to be done
- sal_Bool bJoinNext = nSttNode != nEndNode &&
+ bool bJoinNext = nSttNode != nEndNode &&
pPam->GetMark()->nNode.GetNode().GetTxtNode() &&
pPam->GetPoint()->nNode.GetNode().GetTxtNode();
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 436c162..c805f76 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -65,7 +65,7 @@ sal_Bool UCB_DeleteFile( const String& rURL )
comphelper::getProcessComponentContext() );
aTempContent.executeCommand(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
- ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
+ ::com::sun::star::uno::makeAny( sal_True ) );
bRemoved = sal_True;
}
catch( ::com::sun::star::uno::Exception& )
@@ -193,7 +193,7 @@ bool UCB_GetFileListOfFolder( const String& rURL,
const String* pExtension,
std::vector< ::DateTime* >* pDateTimeList )
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
try
{
ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
@@ -249,7 +249,7 @@ bool UCB_GetFileListOfFolder( const String& rURL,
} while( xResultSet->next() );
}
- bOk = sal_True;
+ bOk = true;
}
catch( ::com::sun::star::uno::Exception& )
{
@@ -260,7 +260,7 @@ bool UCB_GetFileListOfFolder( const String& rURL,
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL( "Exception caught!" );
- bOk = sal_False;
+ bOk = false;
}
return bOk;
}
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 115d864..c65ffe9 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -206,7 +206,7 @@ static void LaunchModifiedEvent(
// rCellRangeName needs to be of one of the following formats:
// - e.g. "A2:E5" or
// - e.g. "Table1.A2:E5"
-sal_Bool FillRangeDescriptor(
+bool FillRangeDescriptor(
SwRangeDescriptor &rDesc,
const String &rCellRangeName )
{
@@ -215,7 +215,7 @@ sal_Bool FillRangeDescriptor(
String aTLName( aCellRangeNoTableName.GetToken(0, ':') ); // name of top left cell
String aBRName( aCellRangeNoTableName.GetToken(1, ':') ); // name of bottom right cell
if(!aTLName.Len() || !aBRName.Len())
- return sal_False;
+ return false;
rDesc.nTop = rDesc.nLeft = rDesc.nBottom = rDesc.nRight = -1;
sw_GetCellPosition( aTLName, rDesc.nLeft, rDesc.nTop );
@@ -228,7 +228,7 @@ sal_Bool FillRangeDescriptor(
"failed to get range descriptor" );
OSL_ENSURE( rDesc.nTop <= rDesc.nBottom && rDesc.nLeft <= rDesc.nRight,
"invalid range descriptor");
- return sal_True;
+ return true;
}
static String GetCellRangeName( SwFrmFmt &rTblFmt, SwUnoCrsr &rTblCrsr )
@@ -303,12 +303,12 @@ static String GetRangeRepFromTableAndCells( const String &rTableName,
return aRes;
}
-static sal_Bool GetTableAndCellsFromRangeRep(
+static bool GetTableAndCellsFromRangeRep(
const OUString &rRangeRepresentation,
String &rTblName,
String &rStartCell,
String &rEndCell,
- sal_Bool bSortStartEndCells = sal_True )
+ bool bSortStartEndCells = true )
{
// parse range representation for table name and cell/range names
// accepted format sth like: "Table1.A2:C5" , "Table2.A2.1:B3.2"
@@ -342,7 +342,7 @@ static sal_Bool GetTableAndCellsFromRangeRep(
}
}
- sal_Bool bSuccess = aTblName.Len() != 0 &&
+ bool bSuccess = aTblName.Len() != 0 &&
aStartCell.Len() != 0 && aEndCell.Len() != 0;
if (bSuccess)
{
@@ -385,7 +385,7 @@ static void GetFormatAndCreateCursorFromRangeRep(
String aTblName; // table name
String aStartCell; // name of top left cell
String aEndCell; // name of bottom right cell
- sal_Bool bNamesFound = GetTableAndCellsFromRangeRep( rRangeRepresentation,
+ bool bNamesFound = GetTableAndCellsFromRangeRep( rRangeRepresentation,
aTblName, aStartCell, aEndCell );
if (!bNamesFound)
@@ -453,10 +453,10 @@ static void GetFormatAndCreateCursorFromRangeRep(
}
}
-static sal_Bool GetSubranges( const OUString &rRangeRepresentation,
- uno::Sequence< OUString > &rSubRanges, sal_Bool bNormalize )
+static bool GetSubranges( const OUString &rRangeRepresentation,
+ uno::Sequence< OUString > &rSubRanges, bool bNormalize )
{
- sal_Bool bRes = sal_True;
+ bool bRes = true;
String aRangesStr( rRangeRepresentation );
xub_StrLen nLen = comphelper::string::getTokenCount(aRangesStr, ';');
uno::Sequence< OUString > aRanges( nLen );
@@ -474,8 +474,9 @@ static sal_Bool GetSubranges( const OUString &rRangeRepresentation,
pRanges[nCnt] = aRange;
String aTableName, aStartCell, aEndCell;
- bRes &= GetTableAndCellsFromRangeRep( aRange,
- aTableName, aStartCell, aEndCell );
+ if (!GetTableAndCellsFromRangeRep( aRange,
+ aTableName, aStartCell, aEndCell ))
+ bRes = false;
if (bNormalize)
{
@@ -488,7 +489,7 @@ static sal_Bool GetSubranges( const OUString &rRangeRepresentation,
if (nCnt == 0)
aFirstTable = aTableName;
else
- bRes &= aFirstTable == aTableName;
+ if (aFirstTable != aTableName) bRes = false;
++nCnt;
}
@@ -717,7 +718,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
for (sal_Int32 i = 0; i < nSubRanges; ++i)
{
String aTblName, aStartCell, aEndCell;
- sal_Bool bOk2 = GetTableAndCellsFromRangeRep(
+ bool bOk2 = GetTableAndCellsFromRangeRep(
pSubRanges[i], aTblName, aStartCell, aEndCell );
(void) bOk2;
OSL_ENSURE( bOk2, "failed to get table and start/end cells" );
@@ -813,7 +814,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
sal_Int32 nFirstSeqLabelIdx = -1;
for (oi = 0; oi < oiEnd; ++oi)
{
- sal_Bool bFirstFound = sal_False;
+ bool bFirstFound = false;
// row/col used at all?
if (aDataStartIdx[oi] != -1 &&
(!bFirstIsLabel || aLabelIdx[oi] != -1))
@@ -823,7 +824,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
{
nFirstSeqLen = aDataLen[oi];
nFirstSeqLabelIdx = aLabelIdx[oi];
- bFirstFound = sal_True;
+ bFirstFound = true;
}
else
{
@@ -1023,7 +1024,7 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport(
// get current cell and table names
String aTblName, aStartCell, aEndCell;
GetTableAndCellsFromRangeRep( rCellRangeRepresentation,
- aTblName, aStartCell, aEndCell, sal_False );
+ aTblName, aStartCell, aEndCell, false );
sal_Int32 nStartCol = -1, nStartRow = -1, nEndCol = -1, nEndRow = -1;
sw_GetCellPosition( aStartCell, nStartCol, nStartRow );
sw_GetCellPosition( aEndCell, nEndCol, nEndRow );
@@ -1332,7 +1333,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
sal_Int32 *pSortedMapping = aSortedMapping.getArray();
std::sort( pSortedMapping, pSortedMapping + aSortedMapping.getLength() );
OSL_ENSURE( aSortedMapping.getLength() == nNumDS_LDS, "unexpected size of sequence" );
- sal_Bool bNeedSequenceMapping = sal_False;
+ bool bNeedSequenceMapping = false;
for (sal_Int32 i = 0; i < nNumDS_LDS; ++i)
{
sal_Int32 *pIt = std::find( pSortedMapping, pSortedMapping + nNumDS_LDS,
@@ -1343,7 +1344,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
pSequenceMapping[i] = pIt - pSortedMapping;
if (i != pSequenceMapping[i])
- bNeedSequenceMapping = sal_True;
+ bNeedSequenceMapping = true;
}
// check if 'SequenceMapping' is actually not required...
@@ -1458,7 +1459,7 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeS
void SAL_CALL SwChartDataProvider::dispose( )
throw (uno::RuntimeException)
{
- sal_Bool bMustDispose( sal_False );
+ bool bMustDispose( false );
{
osl::MutexGuard aGuard( GetChartMutex() );
bMustDispose = !bDisposed;
@@ -2095,7 +2096,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
{
SwRangeDescriptor aDesc;
- sal_Bool bOk sal_False;
+ bool bOk = false;
SwFrmFmt* pTblFmt = GetFrmFmt();
SwTable* pTable = pTblFmt ? SwTable::FindTable( pTblFmt ) : 0;
if (!pTblFmt || !pTable || pTable->IsTblComplex())
@@ -2116,12 +2117,12 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
"unexpected range of selected cells" );
String aTxt; // label text to be returned
- sal_Bool bReturnEmptyTxt = sal_False;
- sal_Bool bUseCol = sal_True;
+ bool bReturnEmptyTxt = false;
+ bool bUseCol = true;
if (eLabelOrigin == chart2::data::LabelOrigin_COLUMN)
- bUseCol = sal_True;
+ bUseCol = true;
else if (eLabelOrigin == chart2::data::LabelOrigin_ROW)
- bUseCol = sal_False;
+ bUseCol = false;
else if (eLabelOrigin == chart2::data::LabelOrigin_SHORT_SIDE)
{
bUseCol = nColSpan < nRowSpan;
@@ -2439,7 +2440,7 @@ void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource )
void SAL_CALL SwChartDataSequence::dispose( )
throw (uno::RuntimeException)
{
- sal_Bool bMustDispose( sal_False );
+ bool bMustDispose( false );
{
osl::MutexGuard aGuard( GetChartMutex() );
bMustDispose = !bDisposed;
@@ -2524,12 +2525,12 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
"row/col indices not matching" );
OSL_ENSURE( nPointRow != nMarkRow || nPointCol != nMarkCol,
"point and mark are identical" );
- sal_Bool bMoveVertical = (nPointCol == nMarkCol);
- sal_Bool bMoveHorizontal = (nPointRow == nMarkRow);
+ bool bMoveVertical = (nPointCol == nMarkCol);
+ bool bMoveHorizontal = (nPointRow == nMarkRow);
// get movement direction
- sal_Bool bMoveLeft = sal_False; // move left or right?
- sal_Bool bMoveUp = sal_False; // move up or down?
+ bool bMoveLeft = false; // move left or right?
+ bool bMoveUp = false; // move up or down?
if (bMoveVertical)
{
if (pPointStartNode == rBox.GetSttNd()) // move point?
@@ -2896,7 +2897,7 @@ void SAL_CALL SwChartLabeledDataSequence::removeModifyListener(
void SAL_CALL SwChartLabeledDataSequence::dispose( )
throw (uno::RuntimeException)
{
- sal_Bool bMustDispose( sal_False );
+ bool bMustDispose( false );
{
osl::MutexGuard aGuard( GetChartMutex() );
bMustDispose = !bDisposed;
More information about the Libreoffice-commits
mailing list