[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 5 23:21:43 PST 2012
sw/inc/doc.hxx | 14 +++++-----
sw/inc/editsh.hxx | 4 +-
sw/inc/tox.hxx | 2 -
sw/source/core/doc/docsort.cxx | 52 +++++++++++++++++++-------------------
sw/source/core/doc/doctxm.cxx | 28 ++++++++++----------
sw/source/core/docnode/ndsect.cxx | 2 -
sw/source/core/edit/edglbldc.cxx | 4 +-
sw/source/core/edit/edtox.cxx | 6 ++--
sw/source/core/frmedt/fews.cxx | 4 +-
sw/source/core/inc/UndoSort.hxx | 2 -
sw/source/core/inc/docsort.hxx | 20 +++++++-------
sw/source/core/inc/doctxm.hxx | 2 -
sw/source/core/undo/unsort.cxx | 2 -
sw/source/core/unocore/unoidx.cxx | 4 +-
sw/source/ui/index/cnttab.cxx | 2 -
sw/source/ui/shells/textidx.cxx | 2 -
16 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 91b2da3bc41a09a4d3bbc608268236a7e42f2685
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Nov 6 14:59:50 2012 +0900
sal_Bool to bool
Change-Id: I3e8b7db8422680b865c10c7ead4ad782e2d5c5e1
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 372f8b6..0183d1f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1391,18 +1391,18 @@ public:
const SwTOXBaseSection* InsertTableOf( const SwPosition& rPos,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0,
- sal_Bool bExpand = sal_False );
+ bool bExpand = false );
const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0 );
const SwTOXBase* GetCurTOX( const SwPosition& rPos ) const;
const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX) const;
- sal_Bool DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes = sal_False );
+ bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false );
String GetUniqueTOXBaseName( const SwTOXType& rType,
const String* pChkStr = 0 ) const;
- sal_Bool SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName);
+ bool SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName);
void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect);
/// After reading file update all tables/indices.
@@ -1433,15 +1433,15 @@ public:
const SwTOXType* InsertTOXType( const SwTOXType& rTyp );
const SwTOXTypes& GetTOXTypes() const { return *pTOXTypes; }
- const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False );
+ const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
void SetDefaultTOXBase(const SwTOXBase& rBase);
/// Key for management of index.
sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) const;
/// Sort table text.
- sal_Bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
- sal_Bool SortText(const SwPaM&, const SwSortOptions&);
+ bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
+ bool SortText(const SwPaM&, const SwSortOptions&);
// Correct the SwPosition-Objects that are registered with the document
// e. g. ::com::sun::star::text::Bookmarks or tables/indices.
@@ -1753,7 +1753,7 @@ public:
SwSectionFmts& GetSections() { return *pSectionFmtTbl; }
const SwSectionFmts& GetSections() const { return *pSectionFmtTbl; }
SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
- void DelSectionFmt( SwSectionFmt *pFmt, sal_Bool bDelNodes = sal_False );
+ void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false );
void UpdateSection(sal_uInt16 const nSect, SwSectionData &,
SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false);
String GetUniqueSectionName( const String* pChkStr = 0 ) const;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 65c19b8..a0c0ebb 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -435,7 +435,7 @@ public:
sal_Bool UpdateTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0);
const SwTOXBase* GetCurTOX() const;
- const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False );
+ const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
void SetDefaultTOXBase(const SwTOXBase& rBase);
sal_Bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
@@ -443,7 +443,7 @@ public:
sal_uInt16 GetTOXCount() const;
const SwTOXBase* GetTOX( sal_uInt16 nPos ) const;
- sal_Bool DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes = sal_False );
+ bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false );
/// After reading file update all content tables.
void SetUpdateTOX( sal_Bool bFlag = sal_True );
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 0368e3a..c6a33c3 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -560,7 +560,7 @@ public:
SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;}
void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
- sal_Bool IsTOXBaseInReadonly() const;
+ bool IsTOXBaseInReadonly() const;
const SfxItemSet* GetAttrSet() const;
void SetAttrSet( const SfxItemSet& );
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 3e4cf76..d028a30 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -173,15 +173,15 @@ int SwSortElement::keycompare(const SwSortElement& rCmp, sal_uInt16 nKey) const
/*--------------------------------------------------------------------
Description: Comparison operators
--------------------------------------------------------------------*/
-sal_Bool SwSortElement::operator==(const SwSortElement& ) const
+bool SwSortElement::operator==(const SwSortElement& ) const
{
- return sal_False;
+ return false;
}
/*--------------------------------------------------------------------
Description: Less-than operator for sorting
--------------------------------------------------------------------*/
-sal_Bool SwSortElement::operator<(const SwSortElement& rCmp) const
+bool SwSortElement::operator<(const SwSortElement& rCmp) const
{
// The actual comparison
for(sal_uInt16 nKey = 0; nKey < pOptions->aKeys.size(); ++nKey)
@@ -194,7 +194,7 @@ sal_Bool SwSortElement::operator<(const SwSortElement& rCmp) const
return nCmp < 0;
}
- return sal_False;
+ return false;
}
double SwSortElement::GetValue( sal_uInt16 nKey ) const
@@ -317,7 +317,7 @@ double SwSortBoxElement::GetValue( sal_uInt16 nKey ) const
/*--------------------------------------------------------------------
Description: Sort Text in the Document
--------------------------------------------------------------------*/
-sal_Bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
+bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
{
// Check if Frame is in the Text
const SwPosition *pStart = rPaM.Start(), *pEnd = rPaM.End();
@@ -331,7 +331,7 @@ sal_Bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
if (pAPos && (FLY_AT_PARA == pAnchor->GetAnchorId()) &&
pStart->nNode <= pAPos->nNode && pAPos->nNode <= pEnd->nNode )
- return sal_False;
+ return false;
}
// Check if only TextNodes are within the Selection
@@ -341,7 +341,7 @@ sal_Bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
while( nStart <= nEnd )
// Iterate over a selected range
if( !GetNodes()[ nStart++ ]->IsTxtNode() )
- return sal_False;
+ return false;
}
bool const bUndo = GetIDocumentUndoRedo().DoesUndo();
@@ -497,19 +497,19 @@ sal_Bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
}
- return sal_True;
+ return true;
}
/*--------------------------------------------------------------------
Description: Sort Table in the Document
--------------------------------------------------------------------*/
-sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
+bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
{
// Via SwDoc for Undo!
OSL_ENSURE( !rBoxes.empty(), "no valid Box list" );
SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
if( !pTblNd )
- return sal_False;
+ return false;
// We begin sorting
// Find all Boxes/Lines
@@ -520,7 +520,7 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
}
if(aFndBox.GetLines().empty())
- return sal_False;
+ return false;
if( !IsIgnoreRedline() && !GetRedlineTbl().empty() )
DeleteRedline( *pTblNd, true, USHRT_MAX );
@@ -558,7 +558,7 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
FlatFndBox aFlatBox(this, aFndBox);
if(!aFlatBox.IsSymmetric())
- return sal_False;
+ return false;
// Delete HTML layout
pTblNd->GetTable().SetHTMLTableLayout( 0 );
@@ -628,7 +628,7 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
SwSortElement::Finit();
SetModified();
- return sal_True;
+ return true;
}
/*--------------------------------------------------------------------
@@ -647,7 +647,7 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
const SwTableBox* pT = pTarget->GetBox();
const SwTableBox* pS = pSource->GetBox();
- sal_Bool bMoved = rMovedList.GetPos(pT) != USHRT_MAX;
+ bool bMoved = rMovedList.GetPos(pT) != USHRT_MAX;
// and move it
MoveCell(pDoc, pS, pT, bMoved, pUD);
@@ -695,7 +695,7 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
const SwTableBox* pS = pSource->GetBox();
// and move it
- sal_Bool bMoved = rMovedList.GetPos(pT) != USHRT_MAX;
+ bool bMoved = rMovedList.GetPos(pT) != USHRT_MAX;
MoveCell(pDoc, pS, pT, bMoved, pUD);
rMovedList.push_back(pS);
@@ -727,7 +727,7 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
Description: Move a single Cell
--------------------------------------------------------------------*/
void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
- sal_Bool bMovedBefore, SwUndoSort* pUD)
+ bool bMovedBefore, SwUndoSort* pUD)
{
OSL_ENSURE(pSource && pTar,"Source or target missing");
@@ -789,7 +789,7 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
nRow(0),
nCol(0)
{ // If the array is symmetric
- if((bSym = CheckLineSymmetry(rBoxRef)) != 0)
+ if( (bSym = CheckLineSymmetry(rBoxRef)) )
{
// Determine column/row count
nCols = GetColCount(rBoxRef);
@@ -817,7 +817,7 @@ FlatFndBox::~FlatFndBox()
/*--------------------------------------------------------------------
Description: All Lines of a Box need to have same number of Boxes
--------------------------------------------------------------------*/
-sal_Bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
+bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
{
const _FndLines &rLines = rBox.GetLines();
sal_uInt16 nBoxes(0);
@@ -829,20 +829,20 @@ sal_Bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
// Number of Boxes of all Lines is unequal -> no symmetry
if( i && nBoxes != rBoxes.size())
- return sal_False;
+ return false;
nBoxes = rBoxes.size();
if( !CheckBoxSymmetry( *pLn ) )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
/*--------------------------------------------------------------------
Description: Check Box for symmetry
All Boxes of a Line need to have same number of Lines
--------------------------------------------------------------------*/
-sal_Bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
+bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
{
const _FndBoxes &rBoxes = rLn.GetBoxes();
sal_uInt16 nLines(0);
@@ -854,13 +854,13 @@ sal_Bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
// Number of Lines of all Boxes is unequal -> no symmetry
if( i && nLines != rLines.size() )
- return sal_False;
+ return false;
nLines = rLines.size();
if( nLines && !CheckLineSymmetry( *pBox ) )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
/*--------------------------------------------------------------------
@@ -917,7 +917,7 @@ sal_uInt16 FlatFndBox::GetRowCount(const _FndBox& rBox)
/*--------------------------------------------------------------------
Description: Create a linear array of atmoic FndBoxes
--------------------------------------------------------------------*/
-void FlatFndBox::FillFlat(const _FndBox& rBox, sal_Bool bLastBox)
+void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox)
{
bool bModRow = false;
const _FndLines& rLines = rBox.GetLines();
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index cd78923..d9b786a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -345,7 +345,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
const SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
const SwTOXBase& rTOX,
const SfxItemSet* pSet,
- sal_Bool bExpand )
+ bool bExpand )
{
GetIDocumentUndoRedo().StartUndo( UNDO_INSTOX, NULL );
@@ -467,7 +467,7 @@ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
return pFmt->GetAttrSet();
}
-const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate )
+const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
{
SwTOXBase** prBase = 0;
switch(eTyp)
@@ -510,10 +510,10 @@ void SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
/*--------------------------------------------------------------------
Description: Delete table of contents
--------------------------------------------------------------------*/
-sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
+bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
{
// We only delete the TOX, not the Nodes
- sal_Bool bRet = sal_False;
+ bool bRet = false;
OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
@@ -592,7 +592,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
DelSectionFmt( pFmt, bDelNodes );
GetIDocumentUndoRedo().EndUndo( UNDO_CLEARTOXRANGE, NULL );
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -680,14 +680,14 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
return aName += String::CreateFromInt32( ++nNum );
}
-sal_Bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
+bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
{
OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ),
"no TOXBaseSection!" );
SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOXBase;
String sTmp = GetUniqueTOXBaseName(*rTOXBase.GetTOXType(), &rName);
- sal_Bool bRet = sTmp == rName;
+ bool bRet = sTmp == rName;
if(bRet)
{
pTOX->SetTOXName(rName);
@@ -732,9 +732,9 @@ SwTOXBaseSection::~SwTOXBaseSection()
{
}
-sal_Bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart ) const
+bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwSectionNode* pSectNd = GetFmt()->GetSectionNode();
if( pSectNd )
{
@@ -752,7 +752,7 @@ sal_Bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart
if( pCNd ) nC = pCNd->Len();
}
rPos.nContent.Assign( pCNd, nC );
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
@@ -1547,7 +1547,7 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
Description: Generate String according to the Form and remove the
special characters 0-31 and 255
--------------------------------------------------------------------*/
-static String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, sal_uInt8 nLevel )
+static String lcl_GetNumString( const SwTOXSortTabBase& rBase, bool bUsePrefix, sal_uInt8 nLevel )
{
String sRet;
@@ -1619,7 +1619,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
case TOKEN_ENTRY:
{
// for TOC numbering
- rTxt.Insert( lcl_GetNumString( rBase, sal_True, MAXLEVEL ));
+ rTxt.Insert( lcl_GetNumString( rBase, true, MAXLEVEL ));
SwIndex aIdx( pTOXNd, rTxt.Len() );
rBase.FillText( *pTOXNd, aIdx );
@@ -2294,10 +2294,10 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
return Range(nStart, nEnd);
}
-sal_Bool SwTOXBase::IsTOXBaseInReadonly() const
+bool SwTOXBase::IsTOXBaseInReadonly() const
{
const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwSectionNode* pSectNode;
if(pSect && pSect->GetFmt() &&
0 != (pSectNode = pSect->GetFmt()->GetSectionNode()))
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index dd5b9ab..23f6744 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -520,7 +520,7 @@ SwSectionFmt* SwDoc::MakeSectionFmt( SwSectionFmt *pDerivedFrom )
return pNew;
}
-void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, sal_Bool bDelNodes )
+void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
{
SwSectionFmts::iterator itFmtPos = std::find( pSectionFmtTbl->begin(), pSectionFmtTbl->end(), pFmt );
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index 57af9c8..7881d5d 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -295,14 +295,14 @@ sal_Bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
case GLBLDOC_TOXBASE:
{
SwTOXBaseSection* pTOX = (SwTOXBaseSection*)rDelPos.GetTOX();
- pMyDoc->DeleteTOX( *pTOX, sal_True );
+ pMyDoc->DeleteTOX( *pTOX, true );
}
break;
case GLBLDOC_SECTION:
{
SwSectionFmt* pSectFmt = (SwSectionFmt*)rDelPos.GetSection()->GetFmt();
- pMyDoc->DelSectionFmt( pSectFmt, sal_True );
+ pMyDoc->DelSectionFmt( pSectFmt, true );
}
break;
}
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index fe8826a..a0273d7 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -132,7 +132,7 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, sal_Bool bReadon
UpdateSection( GetSectionFmtPos( *rTOXSect.GetFmt() ), aSectionData, 0 );
}
-const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate )
+const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
{
return GetDoc()->GetDefaultTOXBase( eTyp, bCreate );
}
@@ -157,7 +157,7 @@ void SwEditShell::InsertTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
// Einfuegen des Verzeichnisses
const SwTOXBaseSection* pTOX = pDoc->InsertTableOf(
- *GetCrsr()->GetPoint(), rTOX, pSet, sal_True );
+ *GetCrsr()->GetPoint(), rTOX, pSet, true );
OSL_ENSURE(pTOX, "Kein aktuelles Verzeichnis");
// Formatierung anstossen
@@ -231,7 +231,7 @@ const SwTOXBase* SwEditShell::GetCurTOX() const
return GetDoc()->GetCurTOX( *GetCrsr()->GetPoint() );
}
-sal_Bool SwEditShell::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
+bool SwEditShell::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
{
return GetDoc()->DeleteTOX( (SwTOXBase&)rTOXBase, bDelNodes );
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 4c2e798..2565436 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -575,7 +575,7 @@ sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt)
}
// call sorting on document
- bRet = pDoc->SortTbl(aBoxes, rOpt);
+ bRet = pDoc->SortTbl(aBoxes, rOpt) ? sal_True : sal_False;
}
else
{
@@ -592,7 +592,7 @@ sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt)
xub_StrLen nCntStt = pStart->nContent.GetIndex();
// Sorting
- bRet = pDoc->SortText(*pPam, rOpt);
+ bRet = pDoc->SortText(*pPam, rOpt) ? sal_True : sal_False;
// put selection again
pPam->DeleteMark();
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index e0a99a8..cc16adb 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -77,7 +77,7 @@ class SwUndoSort : public SwUndo, private SwUndRng
public:
SwUndoSort( const SwPaM&, const SwSortOptions& );
SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode&,
- const SwSortOptions&, sal_Bool bSaveTable );
+ const SwSortOptions&, bool bSaveTable );
virtual ~SwUndoSort();
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 7236e0e..130c128 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -65,7 +65,7 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox,
void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox,
sal_uInt16 nS, sal_uInt16 nT, SwMovedBoxes& rMovedList, SwUndoSort* pUD=0);
void MoveCell(SwDoc* pDoc, const SwTableBox* pSource,
- const SwTableBox* pTar, sal_Bool bMovedBefore, SwUndoSort* pUD=0);
+ const SwTableBox* pTar, bool bMovedBefore, SwUndoSort* pUD=0);
// Elements for sorting text and table content
struct SwSortElement
@@ -86,8 +86,8 @@ struct SwSortElement
virtual String GetKey(sal_uInt16 nKey ) const = 0;
virtual double GetValue(sal_uInt16 nKey ) const;
- sal_Bool operator==(const SwSortElement& ) const;
- sal_Bool operator<(const SwSortElement& ) const;
+ bool operator==(const SwSortElement& ) const;
+ bool operator<(const SwSortElement& ) const;
double StrToDouble(const String& rStr) const;
private:
@@ -125,21 +125,21 @@ public:
FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox);
~FlatFndBox();
- sal_Bool IsSymmetric() const { return bSym; }
+ bool IsSymmetric() const { return bSym; }
sal_uInt16 GetRows() const { return nRows; }
sal_uInt16 GetCols() const { return nCols; }
const _FndBox* GetBox(sal_uInt16 nCol, sal_uInt16 nRow) const;
- inline sal_Bool HasItemSets() const;
+ inline bool HasItemSets() const;
const SfxItemSet* GetItemSet(sal_uInt16 nCol, sal_uInt16 nRow) const;
private:
- sal_Bool CheckLineSymmetry(const _FndBox& rBox);
- sal_Bool CheckBoxSymmetry(const _FndLine& rLn);
+ bool CheckLineSymmetry(const _FndBox& rBox);
+ bool CheckBoxSymmetry(const _FndLine& rLn);
sal_uInt16 GetColCount(const _FndBox& rBox);
sal_uInt16 GetRowCount(const _FndBox& rBox);
- void FillFlat(const _FndBox&, sal_Bool bLastBox=sal_False);
+ void FillFlat(const _FndBox&, bool bLastBox=false);
SwDoc* pDoc;
const _FndBox& rBoxRef;
@@ -151,10 +151,10 @@ private:
sal_uInt16 nRow;
sal_uInt16 nCol;
- sal_Bool bSym;
+ bool bSym;
};
-inline sal_Bool FlatFndBox::HasItemSets() const { return 0 != ppItemSets; }
+inline bool FlatFndBox::HasItemSets() const { return 0 != ppItemSets; }
#endif
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 6767430..e70dc89 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -95,7 +95,7 @@ public:
void UpdatePageNum(); // insert page numbering
TYPEINFO(); // for rtti
- sal_Bool SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart = sal_True ) const;
+ bool SetPosAtStartEnd( SwPosition& rPos, bool bAtStart = true ) const;
};
struct SwDefTOXBase_Impl
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index 9be5f6a..0eb1042 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -61,7 +61,7 @@ SwUndoSort::SwUndoSort(const SwPaM& rRg, const SwSortOptions& rOpt)
}
SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTblNd,
- const SwSortOptions& rOpt, sal_Bool bSaveTable )
+ const SwSortOptions& rOpt, bool bSaveTable )
: SwUndo(UNDO_SORT_TBL), pUndoTblAttr( 0 ), pRedlData( 0 )
{
nSttNode = nStt;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 9e4b49b..d15b5cf 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1302,7 +1302,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
}
//TODO: apply Section attributes (columns and background)
SwTOXBaseSection const*const pTOX =
- pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase, 0, sal_False );
+ pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase, 0, false );
pDoc->SetTOXBaseName(*pTOX, m_pImpl->m_pProps->GetTOXBase().GetTOXName());
@@ -1351,7 +1351,7 @@ void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException)
{
pSectionFmt->GetDoc()->DeleteTOX(
*static_cast<SwTOXBaseSection*>(pSectionFmt->GetSection()),
- sal_True);
+ true);
}
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d479391..383a805 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -389,7 +389,7 @@ short SwMultiTOXTabDialog::Ok()
{
short nRet = SfxTabDialog::Ok();
SwTOXDescription& rDesc = GetTOXDescription(eCurrentTOXType);
- SwTOXBase aNewDef(*rSh.GetDefaultTOXBase( eCurrentTOXType.eType, sal_True ));
+ SwTOXBase aNewDef(*rSh.GetDefaultTOXBase( eCurrentTOXType.eType, true ));
sal_uInt16 nIndex = static_cast< sal_uInt16 >(eCurrentTOXType.eType);
if(eCurrentTOXType.eType == TOX_USER && eCurrentTOXType.nIndex)
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index 84316e7..8d88071 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -167,7 +167,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
const SwTOXBase* pBase = rSh.GetCurTOX();
OSL_ENSURE(pBase, "no TOXBase to remove");
if( pBase )
- rSh.DeleteTOX(*pBase, sal_True);
+ rSh.DeleteTOX(*pBase, true);
}
break;
default:
More information about the Libreoffice-commits
mailing list