[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 31 17:57:03 PDT 2012
sw/inc/crsrsh.hxx | 6 +--
sw/inc/doc.hxx | 24 ++++++-------
sw/inc/editsh.hxx | 4 +-
sw/source/core/crsr/crsrsh.cxx | 2 -
sw/source/core/crsr/crstrvl.cxx | 8 ++--
sw/source/core/doc/docglos.cxx | 2 -
sw/source/core/doc/doclay.cxx | 34 +++++++++---------
sw/source/core/doc/docnew.cxx | 4 +-
sw/source/core/doc/docnum.cxx | 68 ++++++++++++++++++-------------------
sw/source/core/edit/ednumber.cxx | 14 +++----
sw/source/core/frmedt/fefly1.cxx | 2 -
sw/source/core/undo/SwUndoFmt.cxx | 8 ++--
sw/source/core/unocore/unoobj2.cxx | 2 -
sw/source/filter/html/htmlfly.cxx | 2 -
sw/source/filter/ww8/wrtww8gr.cxx | 2 -
sw/source/ui/shells/basesh.cxx | 4 +-
sw/source/ui/uiview/viewtab.cxx | 8 ++--
17 files changed, 97 insertions(+), 97 deletions(-)
New commits:
commit 3034266024e492f7c71dd52265429abd9df10a47
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Nov 1 08:19:50 2012 +0900
sal_Bool to bool
Change-Id: I10f8d534d664c5f27a32214c00aeee890d993d18
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d404424..138e94d 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -612,8 +612,8 @@ public:
sal_Bool SelTbl();
- sal_Bool GotoNextNum();
- sal_Bool GotoPrevNum();
+ bool GotoNextNum();
+ bool GotoPrevNum();
bool GotoOutline( const String& rName );
// to the next/previous or the given OutlineNode
@@ -805,7 +805,7 @@ public:
const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False );
// is cursor or the point in/over a vertical formatted text?
- sal_Bool IsInVerticalText( const Point* pPt = 0 ) const;
+ bool IsInVerticalText( const Point* pPt = 0 ) const;
// is cursor or the point in/over a right to left formatted text?
sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d90646e..86f90b5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -601,7 +601,7 @@ private:
// COMPATIBILITY FLAGS END
//
- sal_Bool mbStartIdleTimer; ///< idle timer mode start/stop
+ bool mbStartIdleTimer; ///< idle timer mode start/stop
bool mbSetDrawDefaults; ///< set draw pool defaults for freshly created documents
@@ -1046,8 +1046,8 @@ public:
( Start < Pos < End ) !!!
(Required for Writers.) */
void GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, const SwPaM* = 0,
- sal_Bool bDrawAlso = sal_False,
- sal_Bool bAsCharAlso = sal_False ) const;
+ bool bDrawAlso = false,
+ bool bAsCharAlso = false ) const;
/// Because swrtf.cxx and define private public here now.
SwFlyFrmFmt *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
@@ -1070,7 +1070,7 @@ public:
const SwPosition* pAnchorPos,
const SfxItemSet* pSet = 0,
SwFrmFmt *pParent = 0,
- sal_Bool bCalledFromShell = sal_False );
+ bool bCalledFromShell = false );
SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
const SwSelBoxes* pSelBoxes = 0,
SwFrmFmt *pParent = 0 );
@@ -1133,7 +1133,7 @@ public:
bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const;
short GetTextDirection( const SwPosition& rPos,
const Point* pPt = 0 ) const;
- sal_Bool IsInVerticalText( const SwPosition& rPos,
+ bool IsInVerticalText( const SwPosition& rPos,
const Point* pPt = 0 ) const;
/** Database and DB-Manager
@@ -1522,20 +1522,20 @@ public:
SwNumRule* FindNumRulePtr( const String& rName ) const;
/// Deletion only possible if ::com::sun::star::chaos::Rule is not used!
- sal_Bool RenameNumRule(const String & aOldName, const String & aNewName,
- sal_Bool bBroadcast = sal_False);
- sal_Bool DelNumRule( const String& rName, sal_Bool bBroadCast = sal_False );
+ bool RenameNumRule(const String & aOldName, const String & aNewName,
+ bool bBroadcast = false);
+ bool DelNumRule( const String& rName, bool bBroadCast = false );
String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
void UpdateNumRule(); /// Update all invalids.
void ChgNumRuleFmts( const SwNumRule& rRule, const String * pOldName = 0 );
- sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
+ bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
const String& rNewRule );
/// Goto next/previous on same level.
- sal_Bool GotoNextNum( SwPosition&, sal_Bool bOverUpper = sal_True,
+ bool GotoNextNum( SwPosition&, bool bOverUpper = true,
sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
- sal_Bool GotoPrevNum( SwPosition&, sal_Bool bOverUpper = sal_True,
+ bool GotoPrevNum( SwPosition&, bool bOverUpper = true,
sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
/** Searches for a text node with a numbering rule.
@@ -1570,7 +1570,7 @@ public:
const bool bInvestigateStartNode = false );
/// Paragraphs without numbering but with indents.
- sal_Bool NoNum( const SwPaM& );
+ bool NoNum( const SwPaM& );
/// Delete, splitting of numbering list.
void DelNumRules( const SwPaM& );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 1c80b09..add80c3 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -491,7 +491,7 @@ public:
const bool bResetIndentAttrs = false );
/// Paragraphs without enumeration but with indents.
- sal_Bool NoNum();
+ bool NoNum();
/// Delete, split enumeration list.
void DelNumRules();
@@ -542,7 +542,7 @@ public:
sal_uInt16 GetNodeNumStart( SwPaM* pPaM = NULL ) const;
- sal_Bool ReplaceNumRule( const String& rOldRule, const String& rNewRule );
+ bool ReplaceNumRule( const String& rOldRule, const String& rNewRule );
/** Searches for a text node with a numbering rule.
in case a list style is found, <sListId> holds the list id, to which the
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 2e4b709..97201b6 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2988,7 +2988,7 @@ short SwCrsrShell::GetTextDirection( const Point* pPt ) const
return pDoc->GetTextDirection( aPos, &aPt );
}
-sal_Bool SwCrsrShell::IsInVerticalText( const Point* pPt ) const
+bool SwCrsrShell::IsInVerticalText( const Point* pPt ) const
{
const short nDir = GetTextDirection( pPt );
return FRMDIR_VERT_TOP_RIGHT == nDir || FRMDIR_VERT_TOP_LEFT == nDir;
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index d0e2bcc..9c30d11 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -77,9 +77,9 @@
using namespace ::com::sun::star;
/// go to next/previous point on the same level
-sal_Bool SwCrsrShell::GotoNextNum()
+bool SwCrsrShell::GotoNextNum()
{
- sal_Bool bRet = GetDoc()->GotoNextNum( *pCurCrsr->GetPoint() );
+ bool bRet = GetDoc()->GotoNextNum( *pCurCrsr->GetPoint() );
if( bRet )
{
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -117,9 +117,9 @@ sal_Bool SwCrsrShell::GotoNextNum()
}
-sal_Bool SwCrsrShell::GotoPrevNum()
+bool SwCrsrShell::GotoPrevNum()
{
- sal_Bool bRet = GetDoc()->GotoPrevNum( *pCurCrsr->GetPoint() );
+ bool bRet = GetDoc()->GotoPrevNum( *pCurCrsr->GetPoint() );
if( bRet )
{
SwCallLink aLk( *this ); // watch Crsr-Moves
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index dcb1288..1a76b2e 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -114,7 +114,7 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
sal_uInt16 nIdx = rBlock.GetIndex( rEntry );
if( (sal_uInt16) -1 != nIdx )
{
- sal_Bool bSav_IsInsGlossary = mbInsOnlyTxtGlssry;
+ bool bSav_IsInsGlossary = mbInsOnlyTxtGlssry;
mbInsOnlyTxtGlssry = rBlock.IsOnlyTextBlock( nIdx );
if( rBlock.BeginGetDoc( nIdx ) )
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 534143a..5329a63 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -706,10 +706,10 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
const SwPosition* pAnchorPos,
const SfxItemSet* pFlySet,
- SwFrmFmt* pFrmFmt, sal_Bool bCalledFromShell )
+ SwFrmFmt* pFrmFmt, bool bCalledFromShell )
{
SwFlyFrmFmt* pFmt = 0;
- sal_Bool bCallMake = sal_True;
+ bool bCallMake = true;
if ( !pAnchorPos && (FLY_AT_PAGE != eAnchorType) )
{
const SwFmtAnchor* pAnch;
@@ -723,7 +723,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
pAnchorPos = pAnch->GetCntntAnchor();
if (pAnchorPos)
{
- bCallMake = sal_False;
+ bCallMake = false;
}
}
}
@@ -839,10 +839,10 @@ if( GetIDocumentUndoRedo().DoesUndo() )
{
// copy all Pams and then delete all
SwPaM* pTmp = (SwPaM*)&rPam;
- sal_Bool bOldFlag = mbCopyIsMove;
+ bool bOldFlag = mbCopyIsMove;
bool const bOldUndo = GetIDocumentUndoRedo().DoesUndo();
bool const bOldRedlineMove(IsRedlineMove());
- mbCopyIsMove = sal_True;
+ mbCopyIsMove = true;
GetIDocumentUndoRedo().DoUndo(false);
SetRedlineMove(true);
do {
@@ -867,7 +867,7 @@ if( GetIDocumentUndoRedo().DoesUndo() )
pTmp = static_cast<SwPaM*>(pTmp->GetNext());
} while ( &rPam != pTmp );
}
- } while( sal_False );
+ } while( false );
}
SetModified();
@@ -984,10 +984,10 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
frames at character - o.k. if the PaM starts at least at the same position
as the frame
---------------------------------------------------------------------------*/
-sal_Bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
+bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
RndStdIds nAnchorId )
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
const SwPaM* pTmp = pPam;
do {
const sal_uInt32 nFlyIndex = pFlyPos->nNode.GetIndex();
@@ -1019,8 +1019,8 @@ sal_Bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
}
void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
- const SwPaM* pCmpRange, sal_Bool bDrawAlso,
- sal_Bool bAsCharAlso ) const
+ const SwPaM* pCmpRange, bool bDrawAlso,
+ bool bAsCharAlso ) const
{
SwPosFlyFrm *pFPos = 0;
SwFrmFmt *pFly;
@@ -1164,7 +1164,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
{
::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
- sal_Bool bTable = sal_False; // To save some code.
+ bool bTable = false; // To save some code.
// Get the field first, beause we retrieve the TxtColl via the field's name
OSL_ENSURE( nId == USHRT_MAX || nId < rDoc.GetFldTypes()->size(),
@@ -1197,7 +1197,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
switch ( eType )
{
case LTYPE_TABLE:
- bTable = sal_True;
+ bTable = true;
// no break here
case LTYPE_FLY:
// At the FlySection's Beginning/End insert the corresponding Node with it's Field.
@@ -1802,14 +1802,14 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
|*************************************************************************/
void SwDoc::StartIdling()
{
- mbStartIdleTimer = sal_True;
+ mbStartIdleTimer = true;
if( !mIdleBlockCount )
aIdleTimer.Start();
}
void SwDoc::StopIdling()
{
- mbStartIdleTimer = sal_False;
+ mbStartIdleTimer = false;
aIdleTimer.Stop();
}
@@ -2055,7 +2055,7 @@ void SwDoc::SetAllUniqueFlyNames()
SwFrmFmts aArr;
aArr.reserve( n );
SwFrmFmt* pFlyFmt;
- sal_Bool bLoadedFlag = sal_True; // something for the Layout
+ bool bLoadedFlag = true; // something for the Layout
for( n = GetSpzFrmFmts()->size(); n; )
{
@@ -2093,7 +2093,7 @@ void SwDoc::SetAllUniqueFlyNames()
SFX_ITEM_SET == pFlyFmt->GetItemState(
RES_HORI_ORIENT ))) )
{
- bLoadedFlag = sal_False;
+ bLoadedFlag = false;
}
}
}
@@ -2265,7 +2265,7 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
return nRet;
}
-sal_Bool SwDoc::IsInVerticalText( const SwPosition& rPos, const Point* pPt ) const
+bool SwDoc::IsInVerticalText( const SwPosition& rPos, const Point* pPt ) const
{
const short nDir = GetTextDirection( rPos, pPt );
return FRMDIR_VERT_TOP_RIGHT == nDir || FRMDIR_VERT_TOP_LEFT == nDir;
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 8135226..0adddef 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -341,7 +341,7 @@ SwDoc::SwDoc()
// COMPATIBILITY FLAGS END
- mbStartIdleTimer(sal_False),
+ mbStartIdleTimer(false),
mbSetDrawDefaults(false)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::SwDoc" );
@@ -541,7 +541,7 @@ SwDoc::~SwDoc()
delete pPgPViewPrtData;
- mbDtor = sal_True;
+ mbDtor = true;
delete pRedlineTbl;
delete pUnoCrsrTbl;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index efbd2c2..fcd91a6 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1016,14 +1016,14 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt )
}
// We can only delete if the Rule is unused!
-sal_Bool SwDoc::DelNumRule( const String& rName, sal_Bool bBroadcast )
+bool SwDoc::DelNumRule( const String& rName, bool bBroadcast )
{
sal_uInt16 nPos = FindNumRule( rName );
if ( (*pNumRuleTbl)[ nPos ] == GetOutlineNumRule() )
{
OSL_FAIL( "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
- return sal_False;
+ return false;
}
if( USHRT_MAX != nPos && !IsUsed( *(*pNumRuleTbl)[ nPos ] ))
@@ -1069,9 +1069,9 @@ sal_Bool SwDoc::DelNumRule( const String& rName, sal_Bool bBroadcast )
maNumRuleMap.erase(aTmpName);
SetModified();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
void SwDoc::ChgNumRuleFmts( const SwNumRule& rRule, const String * pName )
@@ -1095,10 +1095,10 @@ void SwDoc::ChgNumRuleFmts( const SwNumRule& rRule, const String * pName )
}
}
-sal_Bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
- sal_Bool bBroadcast)
+bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
+ bool bBroadcast)
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
SwNumRule * pNumRule = FindNumRulePtr(rOldName);
if (pNumRule)
@@ -1123,7 +1123,7 @@ sal_Bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
pTxtNd->SetAttr(aItem);
}
- bResult = sal_True;
+ bResult = true;
if (bBroadcast)
BroadcastStyleOperation(rOldName, SFX_STYLE_FAMILY_PSEUDO,
@@ -1151,10 +1151,10 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
}
}
-sal_Bool SwDoc::ReplaceNumRule( const SwPosition& rPos,
+bool SwDoc::ReplaceNumRule( const SwPosition& rPos,
const String& rOldRule, const String& rNewRule )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwNumRule *pOldRule = FindNumRulePtr( rOldRule ),
*pNewRule = FindNumRulePtr( rNewRule );
if( pOldRule && pNewRule && pOldRule != pNewRule )
@@ -1205,7 +1205,7 @@ sal_Bool SwDoc::ReplaceNumRule( const SwPosition& rPos,
GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
SetModified();
- bRet = sal_True;
+ bRet = true;
}
}
@@ -1294,10 +1294,10 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
}
}
-sal_Bool SwDoc::NoNum( const SwPaM& rPam )
+bool SwDoc::NoNum( const SwPaM& rPam )
{
- sal_Bool bRet = SplitNode( *rPam.GetPoint(), false );
+ bool bRet = SplitNode( *rPam.GetPoint(), false );
// Do we actually use Numbering at all?
if( bRet )
{
@@ -1312,7 +1312,7 @@ sal_Bool SwDoc::NoNum( const SwPaM& rPam )
SetModified();
}
else
- bRet = sal_False; // no Numbering or just always sal_True?
+ bRet = false; // no Numbering or just always sal_True?
}
return bRet;
}
@@ -1389,16 +1389,16 @@ void SwDoc::InvalidateNumRules()
}
// To the next/preceding Bullet at the same Level
-static sal_Bool lcl_IsNumOk( sal_uInt8 nSrchNum, sal_uInt8& rLower, sal_uInt8& rUpper,
- sal_Bool bOverUpper, sal_uInt8 nNumber )
+static bool lcl_IsNumOk( sal_uInt8 nSrchNum, sal_uInt8& rLower, sal_uInt8& rUpper,
+ bool bOverUpper, sal_uInt8 nNumber )
{
OSL_ENSURE( nNumber < MAXLEVEL,
"<lcl_IsNumOk(..)> - misusage of method" );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
{
if( bOverUpper ? nSrchNum == nNumber : nSrchNum >= nNumber )
- bRet = sal_True;
+ bRet = true;
else if( nNumber > rLower )
rLower = nNumber;
else if( nNumber < rUpper )
@@ -1407,9 +1407,9 @@ static sal_Bool lcl_IsNumOk( sal_uInt8 nSrchNum, sal_uInt8& rLower, sal_uInt8& r
return bRet;
}
-static sal_Bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
+static bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwNode& rNd = rIdx.GetNode();
switch( rNd.GetNodeType() )
{
@@ -1423,19 +1423,19 @@ static sal_Bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
break;
case ND_SECTIONNODE: // that one's valid, so proceed
- bRet = sal_True;
+ bRet = true;
break;
}
return bRet;
}
-static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
- sal_Bool bOverUpper, sal_uInt8* pUpper, sal_uInt8* pLower )
+static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
+ bool bOverUpper, sal_uInt8* pUpper, sal_uInt8* pLower )
{
const SwTxtNode* pNd = rPos.nNode.GetNode().GetTxtNode();
const SwNumRule* pRule;
if( !pNd || 0 == ( pRule = pNd->GetNumRule()))
- return sal_False;
+ return false;
sal_uInt8 nSrchNum = static_cast<sal_uInt8>(pNd->GetActualListLevel());
@@ -1443,7 +1443,7 @@ static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
if( ! pNd->IsCountedInList() )
{
// If NO_NUMLEVEL is switched on, we search the preceding Node with Numbering
- sal_Bool bError = sal_False;
+ bool bError = false;
do {
aIdx--;
if( aIdx.GetNode().IsTxtNode() )
@@ -1461,18 +1461,18 @@ static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
break; // found it!
}
else
- bError = sal_True;
+ bError = true;
}
else
bError = !lcl_IsValidPrevNextNumNode( aIdx );
} while( !bError );
if( bError )
- return sal_False;
+ return false;
}
sal_uInt8 nLower = nSrchNum, nUpper = nSrchNum;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwTxtNode* pLast;
if( bNext )
@@ -1494,7 +1494,7 @@ static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
{
rPos.nNode = aIdx;
rPos.nContent.Assign( (SwTxtNode*)pNd, 0 );
- bRet = sal_True;
+ bRet = true;
break;
}
else
@@ -1525,7 +1525,7 @@ static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
rPos.nNode.Assign( *pLast );
rPos.nContent.Assign( (SwTxtNode*)pLast, 0 );
}
- bRet = sal_True;
+ bRet = true;
}
if( bRet )
@@ -1538,10 +1538,10 @@ static sal_Bool lcl_GotoNextPrevNum( SwPosition& rPos, sal_Bool bNext,
return bRet;
}
-sal_Bool SwDoc::GotoNextNum( SwPosition& rPos, sal_Bool bOverUpper,
+bool SwDoc::GotoNextNum( SwPosition& rPos, bool bOverUpper,
sal_uInt8* pUpper, sal_uInt8* pLower )
{
- return ::lcl_GotoNextPrevNum( rPos, sal_True, bOverUpper, pUpper, pLower );
+ return ::lcl_GotoNextPrevNum( rPos, true, bOverUpper, pUpper, pLower );
}
const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
@@ -1620,10 +1620,10 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
}
-sal_Bool SwDoc::GotoPrevNum( SwPosition& rPos, sal_Bool bOverUpper,
+bool SwDoc::GotoPrevNum( SwPosition& rPos, bool bOverUpper,
sal_uInt8* pUpper, sal_uInt8* pLower )
{
- return ::lcl_GotoNextPrevNum( rPos, sal_False, bOverUpper, pUpper, pLower );
+ return ::lcl_GotoNextPrevNum( rPos, false, bOverUpper, pUpper, pLower );
}
bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 6a5892c..541f0e7 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -144,9 +144,9 @@ const SwNumRule* SwEditShell::GetOutlineNumRule() const
// Absaetze ohne Numerierung, aber mit Einzuegen
-sal_Bool SwEditShell::NoNum()
+bool SwEditShell::NoNum()
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
StartAllAction();
SwPaM* pCrsr = GetCrsr();
@@ -393,7 +393,7 @@ void SwEditShell::GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower
aCrsr.SetMark();
if( pCrsr->HasMark() )
*aCrsr.GetPoint() = *pCrsr->End();
- GetDoc()->GotoNextNum( *aCrsr.GetPoint(), sal_False,
+ GetDoc()->GotoNextNum( *aCrsr.GetPoint(), false,
&rUpper, &rLower );
}
@@ -411,7 +411,7 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
sal_Bool bRet = sal_False;
sal_uInt8 nUpperLevel, nLowerLevel;
- if( GetDoc()->GotoNextNum( *aCrsr.GetPoint(), sal_False,
+ if( GetDoc()->GotoNextNum( *aCrsr.GetPoint(), false,
&nUpperLevel, &nLowerLevel ))
{
if( bUpperLower )
@@ -423,7 +423,7 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
if( bUpperLeft ) // verschiebe nach oben
{
SwPosition aPos( *aCrsr.GetMark() );
- if( GetDoc()->GotoPrevNum( aPos, sal_False ) )
+ if( GetDoc()->GotoPrevNum( aPos, false ) )
nOffset = aPos.nNode.GetIndex() -
aCrsr.GetMark()->nNode.GetIndex();
else
@@ -708,10 +708,10 @@ void SwEditShell::ChgNumRuleFmts( const SwNumRule& rRule )
EndAllAction();
}
-sal_Bool SwEditShell::ReplaceNumRule( const String& rOldRule, const String& rNewRule )
+bool SwEditShell::ReplaceNumRule( const String& rOldRule, const String& rNewRule )
{
StartAllAction();
- sal_Bool bRet = GetDoc()->ReplaceNumRule( *GetCrsr()->GetPoint(), rOldRule, rNewRule );
+ bool bRet = GetDoc()->ReplaceNumRule( *GetCrsr()->GetPoint(), rOldRule, rNewRule );
EndAllAction();
return bRet;
}
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 4f9d740..c57ddf0 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -752,7 +752,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
/* If called from a shell try to propagate an
existing adjust item from rPos to the content node of the
new frame. */
- pRet = GetDoc()->MakeFlySection( eRndId, &rPos, &rSet, pParent, sal_True );
+ pRet = GetDoc()->MakeFlySection( eRndId, &rPos, &rSet, pParent, true );
if( pRet )
{
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index 7ec5e16..588097c 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -380,7 +380,7 @@ void SwUndoNumruleCreate::UndoImpl(::sw::UndoRedoContext &)
bInitialized = true;
}
- pDoc->DelNumRule(aNew.GetName(), sal_True);
+ pDoc->DelNumRule(aNew.GetName(), true);
}
void SwUndoNumruleCreate::RedoImpl(::sw::UndoRedoContext &)
@@ -416,7 +416,7 @@ void SwUndoNumruleDelete::UndoImpl(::sw::UndoRedoContext &)
void SwUndoNumruleDelete::RedoImpl(::sw::UndoRedoContext &)
{
- pDoc->DelNumRule(aOld.GetName(), sal_True);
+ pDoc->DelNumRule(aOld.GetName(), true);
}
SwRewriter SwUndoNumruleDelete::GetRewriter() const
@@ -438,12 +438,12 @@ SwUndoNumruleRename::SwUndoNumruleRename(const String & _aOldName,
void SwUndoNumruleRename::UndoImpl(::sw::UndoRedoContext &)
{
- pDoc->RenameNumRule(aNewName, aOldName, sal_True);
+ pDoc->RenameNumRule(aNewName, aOldName, true);
}
void SwUndoNumruleRename::RedoImpl(::sw::UndoRedoContext &)
{
- pDoc->RenameNumRule(aOldName, aNewName, sal_True);
+ pDoc->RenameNumRule(aOldName, aNewName, true);
}
SwRewriter SwUndoNumruleRename::GetRewriter() const
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index c61eca6..2bc703d 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1887,7 +1887,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
{
SwPosFlyFrms aFlyFrms;
//get all frames that are bound at paragraph or at character
- rPaM.GetDoc()->GetAllFlyFmts(aFlyFrms, m_pImpl->GetCursor(), sal_False, sal_True);
+ rPaM.GetDoc()->GetAllFlyFmts(aFlyFrms, m_pImpl->GetCursor(), false, true);
for(SwPosFlyFrms::iterator it = aFlyFrms.begin(); it != aFlyFrms.end(); ++it)
{
SwPosFlyFrm* pPosFly = *it;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index d75dc52..74e7d9f 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -311,7 +311,7 @@ void SwHTMLWriter::CollectFlyFrms()
"number of browser configurations has changed" );
SwPosFlyFrms aFlyPos;
- pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, sal_True );
+ pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, true );
for(SwPosFlyFrms::iterator it = aFlyPos.begin(); it != aFlyPos.end(); ++it)
{
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 3b4de1e..9f2fe0a 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -436,7 +436,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
{
const SwTxtNode* pTxtNd = (const SwTxtNode*)pOutFmtNode;
SwPosition aPos(*pTxtNd);
- bVert = pDoc->IsInVerticalText(aPos) ? true : false;
+ bVert = pDoc->IsInVerticalText(aPos);
}
if (!bVert)
{
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index f210183..4464de8 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2135,9 +2135,9 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet )
aFont.SetCharSet(((const SvxFontItem*)pI)->GetCharSet());
}
- sal_Bool bVertical = rSh.IsInVerticalText();
+ bool bVertical = rSh.IsInVerticalText();
aFont.SetOrientation(bVertical ? 2700 : 0);
- aFont.SetVertical(bVertical);
+ aFont.SetVertical(bVertical ? sal_True : sal_False);
GetView().GetEditWin().SetInputContext( InputContext( aFont, INPUTCONTEXT_TEXT |
INPUTCONTEXT_EXTTEXTINPUT ) );
}
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index cbd2b17..c0d1ce5 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -265,7 +265,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
const sal_uInt16 nDescId = rSh.GetCurPageDesc();
const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId );
- const sal_Bool bVerticalWriting = rSh.IsInVerticalText();
+ const bool bVerticalWriting = rSh.IsInVerticalText();
const SwFmtHeader& rHeaderFmt = rDesc.GetMaster().GetHeader();
SwFrmFmt *pHeaderFmt = (SwFrmFmt*)rHeaderFmt.GetHeaderFmt();
@@ -294,7 +294,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
SwFrmFmt* pFmt = ((SwFrmFmt*)rSh.GetFlyFrmFmt());
const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
- sal_Bool bVerticalFrame(sal_False);
+ bool bVerticalFrame(false);
{
sal_Bool bRTL;
sal_Bool bVertL2R;
@@ -889,7 +889,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSh.GetMousePageDesc(aTabColFromDocPos) : rSh.GetCurPageDesc() );
const SvxFrameDirectionItem& rFrameDir = rDesc.GetMaster().GetFrmDir();
- const sal_Bool bVerticalWriting = rSh.IsInVerticalText();
+ const bool bVerticalWriting = rSh.IsInVerticalText();
//enable tab stop display on the rulers depending on the writing direction
WinBits nRulerStyle = pHRuler->GetStyle() & ~WB_EXTRAFIELD;
@@ -1391,7 +1391,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SvxColumnItem aColItem(nNum);
const SwRect &rSizeRect = rSh.GetAnyCurRect(RECT_FLY_PRT_EMBEDDED, pPt);
- sal_Bool bUseVertical = bFrameHasVerticalColumns || (!bFrmSelection && bVerticalWriting);
+ bool bUseVertical = bFrameHasVerticalColumns || (!bFrmSelection && bVerticalWriting);
const long lWidth = bUseVertical ? rSizeRect.Height() : rSizeRect.Width();
const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED, pPt);
long nDist2 = ((bUseVertical ? rRect.Height() : rRect.Width()) - lWidth) /2;
More information about the Libreoffice-commits
mailing list