[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 20 07:14:40 PDT 2012
sw/inc/doc.hxx | 14 +++++-----
sw/inc/node.hxx | 12 ++++----
sw/source/core/doc/doccomp.cxx | 40 ++++++++++++++--------------
sw/source/core/doc/docdde.cxx | 18 ++++++------
sw/source/core/doc/docdesc.cxx | 46 ++++++++++++++++-----------------
sw/source/core/doc/docdraw.cxx | 12 ++++----
sw/source/core/doc/docedt.cxx | 26 +++++++++---------
sw/source/core/doc/docfld.cxx | 2 -
sw/source/core/docnode/node.cxx | 4 +-
sw/source/core/edit/autofmt.cxx | 2 -
sw/source/core/fields/reffld.cxx | 6 ++--
sw/source/core/inc/mvsave.hxx | 4 +-
sw/source/core/inc/txmsrt.hxx | 20 +++++++-------
sw/source/core/tox/txmsrt.cxx | 38 +++++++++++++--------------
sw/source/core/txtnode/ndtxt.cxx | 8 ++---
sw/source/core/undo/SwUndoPageDesc.cxx | 8 ++---
sw/source/core/undo/unovwr.cxx | 16 +++++------
sw/source/filter/rtf/swparrtf.cxx | 2 -
sw/source/filter/ww1/fltshell.cxx | 2 -
19 files changed, 140 insertions(+), 140 deletions(-)
New commits:
commit bb80f99092c4ad6d5015165a60f7a239dcb2fbff
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Oct 20 23:12:12 2012 +0900
sal_Bool to bool
Change-Id: Ideb46a876ef74f505b71e2a788d5f8da50e251af
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ff43c12..740659a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1365,13 +1365,13 @@ public:
SwPageDesc * GetPageDesc( const String & rName );
void ChgPageDesc( const String & rName, const SwPageDesc& );
void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
- sal_Bool FindPageDesc( const String & rName, sal_uInt16 * pFound );
- void DelPageDesc( const String & rName, sal_Bool bBroadcast = sal_False);
- void DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast = sal_False );
+ bool FindPageDesc( const String & rName, sal_uInt16 * pFound );
+ void DelPageDesc( const String & rName, bool bBroadcast = false);
+ void DelPageDesc( sal_uInt16 i, bool bBroadcast = false );
void PreDelPageDesc(SwPageDesc * pDel);
sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0,
- sal_Bool bRegardLanguage = sal_True,
- sal_Bool bBroadcast = sal_False);
+ bool bRegardLanguage = true,
+ bool bBroadcast = false);
void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
sal_uInt16 nOp);
@@ -1783,7 +1783,7 @@ public:
bool IsInLoadAsynchron() const { return mbInLoadAsynchron; }
void SetInLoadAsynchron( bool bFlag ) { mbInLoadAsynchron = bFlag; }
- sal_Bool SelectServerObj( const String& rStr, SwPaM*& rpPam,
+ bool SelectServerObj( const String& rStr, SwPaM*& rpPam,
SwNodeRange*& rpRange ) const;
/// For Drag&Move: (e.g. allow "moving" of RefMarks)
@@ -1792,7 +1792,7 @@ public:
SwDrawContact* GroupSelection( SdrView& );
void UnGroupSelection( SdrView& );
- sal_Bool DeleteSelection( SwDrawView& );
+ bool DeleteSelection( SwDrawView& );
/// Invalidates OnlineSpell-WrongLists.
void SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags );
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9ac3045..003d7b6 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -100,8 +100,8 @@ class SW_DLLPUBLIC SwNode
/// For text nodes: level of auto format. Was put here because we had still free bits.
sal_uInt8 nAFmtNumLvl : 3;
- sal_Bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
- sal_Bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag
+ bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
+ bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag
protected:
SwStartNode* pStartOfSection;
@@ -133,11 +133,11 @@ public:
inline sal_uInt8 GetAutoFmtLvl() const { return nAFmtNumLvl; }
inline void SetAutoFmtLvl( sal_uInt8 nVal ) { nAFmtNumLvl = nVal; }
- inline sal_Bool IsSetNumLSpace() const { return bSetNumLSpace; }
- inline void SetNumLSpace( sal_Bool bFlag ) { bSetNumLSpace = bFlag; }
+ inline bool IsSetNumLSpace() const { return bSetNumLSpace; }
+ inline void SetNumLSpace( bool bFlag ) { bSetNumLSpace = bFlag; }
- inline sal_Bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; }
- inline void SetIgnoreDontExpand( sal_Bool bNew ) { bIgnoreDontExpand = bNew; }
+ inline bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; }
+ inline void SetIgnoreDontExpand( bool bNew ) { bIgnoreDontExpand = bNew; }
sal_uInt8 GetNodeType() const { return nNodeType; }
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 56ba45e..91bcfd3 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -65,7 +65,7 @@ public:
virtual ~CompareLine();
virtual sal_uLong GetHashValue() const = 0;
- virtual sal_Bool Compare( const CompareLine& rLine ) const = 0;
+ virtual bool Compare( const CompareLine& rLine ) const = 0;
};
class CompareData
@@ -85,7 +85,7 @@ public:
virtual ~CompareData();
// Are there differences?
- sal_Bool HasDiffs( const CompareData& rData ) const;
+ bool HasDiffs( const CompareData& rData ) const;
// Triggers the comparison and creation of two documents
void CompareLines( CompareData& rData );
@@ -413,9 +413,9 @@ sal_uLong CompareData::ShowDiffs( const CompareData& rData )
return nCnt;
}
-sal_Bool CompareData::HasDiffs( const CompareData& rData ) const
+bool CompareData::HasDiffs( const CompareData& rData ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_uLong nLen1 = rData.GetLineCount(), nLen2 = GetLineCount();
sal_uLong nStt1 = 0, nStt2 = 0;
@@ -423,7 +423,7 @@ sal_Bool CompareData::HasDiffs( const CompareData& rData ) const
{
if( rData.GetChanged( nStt1 ) || GetChanged( nStt2 ) )
{
- bRet = sal_True;
+ bRet = true;
break;
}
++nStt1, ++nStt2;
@@ -962,14 +962,14 @@ public:
virtual ~SwCompareLine();
virtual sal_uLong GetHashValue() const;
- virtual sal_Bool Compare( const CompareLine& rLine ) const;
+ virtual bool Compare( const CompareLine& rLine ) const;
static sal_uLong GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal );
- static sal_Bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd );
- static sal_Bool CompareTxtNd( const SwTxtNode& rDstNd,
+ static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd );
+ static bool CompareTxtNd( const SwTxtNode& rDstNd,
const SwTxtNode& rSrcNd );
- sal_Bool ChangesInLine( const SwCompareLine& rLine,
+ bool ChangesInLine( const SwCompareLine& rLine,
SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const;
const SwNode& GetNode() const { return rNode; }
@@ -1072,7 +1072,7 @@ const SwNode& SwCompareLine::GetEndNode() const
return *pNd;
}
-sal_Bool SwCompareLine::Compare( const CompareLine& rLine ) const
+bool SwCompareLine::Compare( const CompareLine& rLine ) const
{
return CompareNode( rNode, ((SwCompareLine&)rLine).rNode );
}
@@ -1100,12 +1100,12 @@ namespace
}
}
-sal_Bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
+bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
{
if( rSrcNd.GetNodeType() != rDstNd.GetNodeType() )
- return sal_False;
+ return false;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch( rDstNd.GetNodeType() )
{
@@ -1262,23 +1262,23 @@ sal_uLong SwCompareLine::GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nV
return nVal;
}
-sal_Bool SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
+bool SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
const SwTxtNode& rSrcNd )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
// Very simple at first
if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
{
// The text is the same, but are the "special attributes" (0xFF) also the same?
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
-sal_Bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
+bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
// Only compare textnodes
if( ND_TEXTNODE == rNode.GetNodeType() &&
@@ -1358,7 +1358,7 @@ sal_Bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
// Don't compare if there aren't enough similarities
if ( nAvgLen >= 8 && nSqSum*32 < nAvgLen*nAvgLen )
{
- return sal_False;
+ return false;
}
// Show the differences
@@ -1412,7 +1412,7 @@ sal_Bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
delete[] pLcsDst;
delete[] pLcsSrc;
- bRet = sal_True;
+ bRet = true;
}
return bRet;
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 1a70772..ab86184 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -295,7 +295,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
return pObj;
}
-sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
+bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
SwNodeRange*& rpRange ) const
{
// Do we actually have the Item?
@@ -314,7 +314,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
// but also frames (text!), tables, outlines:
if( STRING_NOTFOUND != nPos )
{
- sal_Bool bWeiter = sal_False;
+ bool bWeiter = false;
String sName( sItem.Copy( 0, nPos ) );
String sCmp( sItem.Copy( nPos + 1 ));
sItem = rCC.lowercase( sItem );
@@ -333,7 +333,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
{
rpRange = new SwNodeRange( *aPara.pTblNd, 0,
*aPara.pTblNd->EndOfSectionNode(), 1 );
- return sal_True;
+ return true;
}
}
else if( sCmp.EqualsAscii( pMarkToFrame ) )
@@ -346,13 +346,13 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
!( pNd = &pIdx->GetNode())->IsNoTxtNode() )
{
rpRange = new SwNodeRange( *pNd, 1, *pNd->EndOfSectionNode() );
- return sal_True;
+ return true;
}
}
else if( sCmp.EqualsAscii( pMarkToRegion ) )
{
sItem = sName; // Is being dealt with further down!
- bWeiter = sal_True;
+ bWeiter = true;
}
else if( sCmp.EqualsAscii( pMarkToOutline ) )
{
@@ -381,12 +381,12 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
rpRange->aEnd = *rOutlNds[ nTmpPos ];
else
rpRange->aEnd = GetNodes().GetEndOfContent();
- return sal_True;
+ return true;
}
}
if( !bWeiter )
- return sal_False;
+ return false;
}
// search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
@@ -417,7 +417,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
{
rpRange = new SwNodeRange( *aPara.pSectNd, 1,
*aPara.pSectNd->EndOfSectionNode() );
- return sal_True;
+ return true;
}
}
@@ -425,7 +425,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
break;
bCaseSensitive = false;
}
- return sal_False;
+ return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 6319d42..fe1e12a 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -130,7 +130,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
|*************************************************************************/
static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
- const sal_Bool bPage = sal_True )
+ const bool bPage = true )
{
// We should actually use ItemSet's Intersect here, but that doesn't work
// correctly if we have different WhichRanges.
@@ -194,7 +194,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
SwFmtHeader aHead( MakeLayoutFmt( RND_STD_HEADERL, 0 ) );
rDescFrmFmt.SetFmtAttr( aHead );
// take over additional attributes (margins, borders ...)
- ::lcl_DescSetAttr( *rHead.GetHeaderFmt(), *aHead.GetHeaderFmt(), sal_False);
+ ::lcl_DescSetAttr( *rHead.GetHeaderFmt(), *aHead.GetHeaderFmt(), false);
}
else
{
@@ -210,7 +210,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
{
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? "Left header" : "First header"),
GetDfltFrmFmt() );
- ::lcl_DescSetAttr( *pRight, *pFmt, sal_False );
+ ::lcl_DescSetAttr( *pRight, *pFmt, false );
// The section which the right header attribute is pointing
// is copied, and the Index to the StartNode is set to
// the left or first header attribute.
@@ -226,7 +226,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
}
else
::lcl_DescSetAttr( *pRight,
- *(SwFrmFmt*)rFmtHead.GetHeaderFmt(), sal_False );
+ *(SwFrmFmt*)rFmtHead.GetHeaderFmt(), false );
}
}
@@ -249,7 +249,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
SwFmtFooter aFoot( MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
rDescFrmFmt.SetFmtAttr( aFoot );
// Take over additional attributes (margins, borders ...).
- ::lcl_DescSetAttr( *rFoot.GetFooterFmt(), *aFoot.GetFooterFmt(), sal_False);
+ ::lcl_DescSetAttr( *rFoot.GetFooterFmt(), *aFoot.GetFooterFmt(), false);
}
else
{
@@ -265,7 +265,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
{
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? "Left footer" : "First footer"),
GetDfltFrmFmt() );
- ::lcl_DescSetAttr( *pRight, *pFmt, sal_False );
+ ::lcl_DescSetAttr( *pRight, *pFmt, false );
// The section to which the right footer attribute is pointing
// is copied, and the Index to the StartNode is set to
// the left footer attribute.
@@ -281,7 +281,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
}
else
::lcl_DescSetAttr( *pRight,
- *(SwFrmFmt*)rFmtFoot.GetFooterFmt(), sal_False );
+ *(SwFrmFmt*)rFmtFoot.GetFooterFmt(), false );
}
}
}
@@ -379,22 +379,22 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
pDesc->SetRegisterFmtColl( rChged.GetRegisterFmtColl() );
// If UseOn or the Follow change, the paragraphs need to know about it.
- sal_Bool bUseOn = sal_False;
- sal_Bool bFollow = sal_False;
+ bool bUseOn = false;
+ bool bFollow = false;
if ( pDesc->GetUseOn() != rChged.GetUseOn() )
{ pDesc->SetUseOn( rChged.GetUseOn() );
- bUseOn = sal_True;
+ bUseOn = true;
}
if ( pDesc->GetFollow() != rChged.GetFollow() )
{ if ( rChged.GetFollow() == &rChged )
{ if ( pDesc->GetFollow() != pDesc )
{ pDesc->SetFollow( pDesc );
- bFollow = sal_True;
+ bFollow = true;
}
}
else
{ pDesc->SetFollow( rChged.pFollow );
- bFollow = sal_True;
+ bFollow = true;
}
}
@@ -505,7 +505,7 @@ void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
}
}
-void SwDoc::DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast )
+void SwDoc::DelPageDesc( sal_uInt16 i, bool bBroadcast )
{
OSL_ENSURE( i < aPageDescs.size(), "PageDescs is out of range." );
OSL_ENSURE( i != 0, "You cannot delete the default Pagedesc.");
@@ -540,7 +540,7 @@ void SwDoc::DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast )
|*************************************************************************/
sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
- sal_Bool bRegardLanguage, sal_Bool bBroadcast)
+ bool bRegardLanguage, bool bBroadcast)
{
SwPageDesc *pNew;
if( pCpy )
@@ -613,12 +613,12 @@ void SwDoc::PrtDataChanged()
0 != getPrinter( sal_False ), "PrtDataChanged will be called recursively!" );
SwRootFrm* pTmpRoot = GetCurrentLayout();
SwWait *pWait = 0;
- sal_Bool bEndAction = sal_False;
+ bool bEndAction = false;
if( GetDocShell() )
GetDocShell()->UpdateFontList();
- sal_Bool bDraw = sal_True;
+ bool bDraw = true;
if ( pTmpRoot )
{
ViewShell *pSh = GetCurrentViewShell();
@@ -630,9 +630,9 @@ void SwDoc::PrtDataChanged()
pWait = new SwWait( *GetDocShell(), sal_True );
pTmpRoot->StartAllAction();
- bEndAction = sal_True;
+ bEndAction = true;
- bDraw = sal_False;
+ bDraw = false;
if( pDrawModel )
{
pDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) );
@@ -735,7 +735,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
// aName = ????
}
- sal_Bool bFound = sal_False;
+ bool bFound = false;
for ( sal_uInt16 j = 0;
j < pGlobalOLEExcludeList->size() && !bFound;
++j )
@@ -796,16 +796,16 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
return 0;
}
-sal_Bool SwDoc::FindPageDesc( const String & rName, sal_uInt16 * pFound)
+bool SwDoc::FindPageDesc( const String & rName, sal_uInt16 * pFound)
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
sal_uInt16 nI;
for (nI = 0; nI < aPageDescs.size(); nI++)
{
if (aPageDescs[nI]->GetName() == rName)
{
*pFound = nI;
- bResult = sal_True;
+ bResult = true;
break;
}
}
@@ -825,7 +825,7 @@ SwPageDesc * SwDoc::GetPageDesc( const String & rName )
return aResult;
}
-void SwDoc::DelPageDesc( const String & rName, sal_Bool bBroadcast )
+void SwDoc::DelPageDesc( const String & rName, bool bBroadcast )
{
sal_uInt16 nI;
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 25b81e0..7898e59 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -210,7 +210,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList();
SwDrawFrmFmt *pFmt = 0L;
SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
- sal_Bool bNoGroup = ( 0 == pObj->GetUpGroup() );
+ bool bNoGroup = ( 0 == pObj->GetUpGroup() );
SwDrawContact* pNewContact = 0;
if( bNoGroup )
{
@@ -399,15 +399,15 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
|*
|*************************************************************************/
-sal_Bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
+bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
{
- sal_Bool bCallBase = sal_False;
+ bool bCallBase = false;
const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList();
if( rMrkList.GetMarkCount() )
{
GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
sal_uInt16 i;
- sal_Bool bDelMarked = sal_True;
+ bool bDelMarked = true;
if( 1 == rMrkList.GetMarkCount() )
{
@@ -419,7 +419,7 @@ sal_Bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
if( pFrmFmt )
{
DelLayoutFmt( pFrmFmt );
- bDelMarked = sal_False;
+ bDelMarked = false;
}
}
}
@@ -484,7 +484,7 @@ sal_Bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
GetIDocumentUndoRedo().AppendUndo( pUndo );
}
}
- bCallBase = sal_True;
+ bCallBase = true;
}
SetModified();
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 7b3f829..9bd0196 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -229,7 +229,7 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd )
{
_SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(),
- pFmt, sal_False );
+ pFmt, false );
rArr.push_back( aSave );
pFmt->DelFrms();
rFmts.erase( rFmts.begin() + n-- );
@@ -259,7 +259,7 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
for( sal_uInt16 n = 0; n < rFmts.size(); ++n )
{
- sal_Bool bInsPos = sal_False;
+ bool bInsPos = false;
pFmt = (SwFrmFmt*)rFmts[n];
pAnchor = &pFmt->GetAnchor();
const SwPosition* pAPos = pAnchor->GetCntntAnchor();
@@ -304,7 +304,7 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
const SwNodeIndex& rPtNdIdx )
{
- const sal_Bool bDelFwrd = rMkNdIdx.GetIndex() <= rPtNdIdx.GetIndex();
+ const bool bDelFwrd = rMkNdIdx.GetIndex() <= rPtNdIdx.GetIndex();
SwDoc* pDoc = rMkNdIdx.GetNode().GetDoc();
SwFrmFmts& rTbl = *pDoc->GetSpzFrmFmts();
@@ -760,8 +760,8 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
sal_Unicode c;
String aStr;
- sal_Bool bOldExpFlg = pNode->IsIgnoreDontExpand();
- pNode->SetIgnoreDontExpand( sal_True );
+ bool bOldExpFlg = pNode->IsIgnoreDontExpand();
+ pNode->SetIgnoreDontExpand( true );
for( xub_StrLen nCnt = 0; nCnt < rStr.Len(); ++nCnt )
{
@@ -1873,7 +1873,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
if( nCurrNd <= nEndNd )
{
SwCntntFrm* pCntFrm;
- sal_Bool bGoOn = sal_True;
+ bool bGoOn = true;
while( bGoOn )
{
SwNode* pNd = GetNodes()[ nCurrNd ];
@@ -2154,9 +2154,9 @@ uno::Reference< XHyphenatedWord > SwDoc::Hyphenate(
return aHyphArg.GetHyphWord(); // will be set by lcl_HyphenateNode
}
-static sal_Bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, sal_Bool bRegExpRplc )
+static bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, bool bRegExpRplc )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( bRegExpRplc )
{
xub_StrLen nPos = 0;
@@ -2173,7 +2173,7 @@ static sal_Bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, sal_Bool bR
{
rRet = rStr.Copy( 0, nPos );
rStr.Erase( 0, nPos + sPara.getLength() );
- bRet = sal_True;
+ bRet = true;
break;
}
}
@@ -2344,7 +2344,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
SwNodeIndex aPtNd( aDelPam.GetPoint()->nNode, -1 );
xub_StrLen nPtCnt = aDelPam.GetPoint()->nContent.GetIndex();
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
String sIns;
while ( lcl_GetTokenToParaBreak( sRepl, sIns, bRegExReplace ) )
{
@@ -2360,7 +2360,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
aDelPam.GetMark()->nNode = aMkNd;
aDelPam.GetMark()->nContent.Assign(
aMkNd.GetNode().GetCntntNode(), nMkCnt );
- bFirst = sal_False;
+ bFirst = false;
}
else
SplitNode( *aDelPam.GetPoint(), false );
@@ -2441,7 +2441,7 @@ SetRedlineMode( eOld );
nEnd = bOneNode ? pEnd->nContent.GetIndex()
: pTxtNd->GetTxt().Len();
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
String sIns;
while ( lcl_GetTokenToParaBreak( sRepl, sIns, bRegExReplace ) )
{
@@ -2454,7 +2454,7 @@ SetRedlineMode( eOld );
pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
}
SplitNode( *pStt, false);
- bFirst = sal_False;
+ bFirst = false;
}
if( bFirst || sIns.Len() )
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 2e277a5..d57e8ac 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -70,7 +70,7 @@
using namespace ::com::sun::star::uno;
-extern sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
+extern bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
const SwTxtNode& rBehindNd, sal_uInt16 nSttPos );
/*--------------------------------------------------------------------
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 481b0be..2da1706 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -307,7 +307,7 @@ long SwNode::s_nSerial = 0;
SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType )
: nNodeType( nNdType ), pStartOfSection( 0 )
{
- bSetNumLSpace = bIgnoreDontExpand = sal_False;
+ bSetNumLSpace = bIgnoreDontExpand = false;
nAFmtNumLvl = 0;
SwNodes& rNodes = (SwNodes&)rWhere.GetNodes();
@@ -341,7 +341,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType )
SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNdType )
: nNodeType( nNdType ), pStartOfSection( 0 )
{
- bSetNumLSpace = bIgnoreDontExpand = sal_False;
+ bSetNumLSpace = bIgnoreDontExpand = false;
nAFmtNumLvl = 0;
SwNode* pInsNd = this; // The MAC cannot insert anything!
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2abc930..9364a1c 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1657,7 +1657,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
}
pAktTxtNd->SetAttrListLevel(nLvl);
- pAktTxtNd->SetNumLSpace( sal_True );
+ pAktTxtNd->SetNumLSpace( true );
// start new list
pDoc->SetNumRule( aDelPam, aRule, true );
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index e811cfd..485a724 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -101,7 +101,7 @@ static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
}
-sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
+bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
const SwTxtNode& rBehindNd, sal_uInt16 nSttPos )
{
const SwTxtFrm *pMyFrm = (SwTxtFrm*)rMyNd.getLayoutFrm( rMyNd.GetDoc()->GetCurrentLayout(), 0,0,sal_False),
@@ -113,7 +113,7 @@ sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
pMyFrm = (SwTxtFrm*)pMyFrm->GetFollow();
if( !pFrm || !pMyFrm || pFrm == pMyFrm )
- return sal_False;
+ return false;
std::vector<const SwFrm*> aRefArr, aArr;
::lcl_GetLayTree( pFrm, aRefArr );
@@ -145,7 +145,7 @@ sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
const SwFrm* pFldFrm = aArr[ nCnt ];
// unterschiedliche Frames, dann ueberpruefe deren Y-/X-Position
- sal_Bool bRefIsLower = sal_False;
+ bool bRefIsLower = false;
if( ( FRM_COLUMN | FRM_CELL ) & pFldFrm->GetType() ||
( FRM_COLUMN | FRM_CELL ) & pRefFrm->GetType() )
{
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 3afde5a..0f1050d 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -104,9 +104,9 @@ struct _SaveFly
{
sal_uLong nNdDiff; /// relative node difference
SwFrmFmt* pFrmFmt; /// the fly's frame format
- sal_Bool bInsertPosition; /// if true, anchor _at_ insert position
+ bool bInsertPosition; /// if true, anchor _at_ insert position
- _SaveFly( sal_uLong nNodeDiff, SwFrmFmt* pFmt, sal_Bool bInsert )
+ _SaveFly( sal_uLong nNodeDiff, SwFrmFmt* pFmt, bool bInsert )
: nNdDiff( nNodeDiff ), pFrmFmt( pFmt ), bInsertPosition( bInsert )
{ }
};
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index e707741..a3a9ee9 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -87,7 +87,7 @@ public:
const String& rTxt2, const String& rTxtReading2,
const ::com::sun::star::lang::Locale& rLocale2 ) const;
- inline sal_Bool IsEqual( const String& rTxt1, const String& rTxtReading1,
+ inline bool IsEqual( const String& rTxt1, const String& rTxtReading1,
const ::com::sun::star::lang::Locale& rLocale1,
const String& rTxt2, const String& rTxtReading2,
const ::com::sun::star::lang::Locale& rLocale2 ) const
@@ -96,7 +96,7 @@ public:
rTxt2, rTxtReading2, rLocale2 );
}
- inline sal_Bool IsLess( const String& rTxt1, const String& rTxtReading1,
+ inline bool IsLess( const String& rTxt1, const String& rTxtReading1,
const ::com::sun::star::lang::Locale& rLocale1,
const String& rTxt2, const String& rTxtReading2,
const ::com::sun::star::lang::Locale& rLocale2 ) const
@@ -142,8 +142,8 @@ struct SwTOXSortTabBase
virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0) const;
virtual sal_uInt16 GetLevel() const = 0;
- virtual sal_Bool operator==( const SwTOXSortTabBase& );
- virtual sal_Bool operator<( const SwTOXSortTabBase& );
+ virtual bool operator==( const SwTOXSortTabBase& );
+ virtual bool operator<( const SwTOXSortTabBase& );
virtual String GetURL() const;
@@ -191,8 +191,8 @@ struct SwTOXIndex : public SwTOXSortTabBase
virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const;
virtual sal_uInt16 GetLevel() const;
- virtual sal_Bool operator==( const SwTOXSortTabBase& );
- virtual sal_Bool operator<( const SwTOXSortTabBase& );
+ virtual bool operator==( const SwTOXSortTabBase& );
+ virtual bool operator<( const SwTOXSortTabBase& );
private:
virtual void GetText_Impl( String&, String& ) const;
@@ -208,8 +208,8 @@ struct SwTOXCustom : public SwTOXSortTabBase
virtual ~SwTOXCustom() {}
virtual sal_uInt16 GetLevel() const;
- virtual sal_Bool operator==( const SwTOXSortTabBase& );
- virtual sal_Bool operator<( const SwTOXSortTabBase& );
+ virtual bool operator==( const SwTOXSortTabBase& );
+ virtual bool operator<( const SwTOXSortTabBase& );
private:
virtual void GetText_Impl( String&, String& ) const;
@@ -286,8 +286,8 @@ public:
SwFmtFld& GetFldFmt() {return m_rField;}
- virtual sal_Bool operator==( const SwTOXSortTabBase& );
- virtual sal_Bool operator<( const SwTOXSortTabBase& );
+ virtual bool operator==( const SwTOXSortTabBase& );
+ virtual bool operator<( const SwTOXSortTabBase& );
virtual sal_uInt16 GetLevel() const;
};
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index a515b16..135572f 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -52,7 +52,7 @@
#include <comcore.hrc>
#include <numrule.hxx>
-extern sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos,
+extern bool IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos,
const SwTxtNode& rBehindNd, xub_StrLen nSttPos );
using namespace ::com::sun::star;
@@ -213,9 +213,9 @@ void SwTOXSortTabBase::FillText( SwTxtNode& rNd, const SwIndex& rInsPos,
rNd.InsertText( sMyTxt, rInsPos );
}
-sal_Bool SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
+bool SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
{
- sal_Bool bRet = nPos == rCmp.nPos && nCntPos == rCmp.nCntPos &&
+ bool bRet = nPos == rCmp.nPos && nCntPos == rCmp.nCntPos &&
(!aTOXSources[0].pNd || !rCmp.aTOXSources[0].pNd ||
aTOXSources[0].pNd == rCmp.aTOXSources[0].pNd );
@@ -247,15 +247,15 @@ sal_Bool SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
return bRet;
}
-sal_Bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
+bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
{
if( nPos < rCmp.nPos )
- return sal_True;
+ return true;
if( nPos == rCmp.nPos )
{
if( nCntPos < rCmp.nCntPos )
- return sal_True;
+ return true;
if( nCntPos == rCmp.nCntPos )
{
@@ -267,7 +267,7 @@ sal_Bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
if( TOX_SORT_CONTENT == nType && pTxtMark && rCmp.pTxtMark )
{
if( *pTxtMark->GetStart() < *rCmp.pTxtMark->GetStart() )
- return sal_True;
+ return true;
if( *pTxtMark->GetStart() == *rCmp.pTxtMark->GetStart() )
{
@@ -289,7 +289,7 @@ sal_Bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
sOtherTxt, sOtherTxtReading, rCmp.GetLocale() );
if( pEnd && !pEndCmp )
- return sal_True;
+ return true;
}
}
}
@@ -299,7 +299,7 @@ sal_Bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
*(SwTxtNode*)pFirst, nCntPos );
}
}
- return sal_False;
+ return false;
}
/*--------------------------------------------------------------------
@@ -324,13 +324,13 @@ SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd,
//
-sal_Bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
+bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
{
SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
// Respect case taking dependencies into account
if(GetLevel() != rCmp.GetLevel() || nKeyLevel != rCmp.nKeyLevel)
- return sal_False;
+ return false;
OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
@@ -342,7 +342,7 @@ sal_Bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
String sOtherTxtReading;
rCmp.GetTxt( sOtherTxt, sOtherTxtReading );
- sal_Bool bRet = pTOXIntl->IsEqual( sMyTxt, sMyTxtReading, GetLocale(),
+ bool bRet = pTOXIntl->IsEqual( sMyTxt, sMyTxtReading, GetLocale(),
sOtherTxt, sOtherTxtReading, rCmp.GetLocale() );
// If we don't summarize we need to evaluate the Pos
@@ -355,7 +355,7 @@ sal_Bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
//
// operator, only depends on the text
-sal_Bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
+bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
{
SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
@@ -369,7 +369,7 @@ sal_Bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
String sOtherTxtReading;
rCmp.GetTxt( sOtherTxt, sOtherTxtReading );
- sal_Bool bRet = GetLevel() == rCmp.GetLevel() &&
+ bool bRet = GetLevel() == rCmp.GetLevel() &&
pTOXIntl->IsLess( sMyTxt, sMyTxtReading, GetLocale(),
sOtherTxt, sOtherTxtReading, rCmp.GetLocale() );
@@ -476,7 +476,7 @@ SwTOXCustom::SwTOXCustom(const String& rStr, const String& rReading,
}
-sal_Bool SwTOXCustom::operator==(const SwTOXSortTabBase& rCmpBase)
+bool SwTOXCustom::operator==(const SwTOXSortTabBase& rCmpBase)
{
String sMyTxt;
String sMyTxtReading;
@@ -492,7 +492,7 @@ sal_Bool SwTOXCustom::operator==(const SwTOXSortTabBase& rCmpBase)
}
-sal_Bool SwTOXCustom::operator < (const SwTOXSortTabBase& rCmpBase)
+bool SwTOXCustom::operator < (const SwTOXSortTabBase& rCmpBase)
{
String sMyTxt;
String sMyTxtReading;
@@ -826,16 +826,16 @@ void SwTOXAuthority::FillText( SwTxtNode& rNd,
rNd.InsertText( sText, rInsPos );
}
-sal_Bool SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
+bool SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
{
return nType == rCmp.nType &&
((SwAuthorityField*)m_rField.GetFld())->GetHandle() ==
((SwAuthorityField*)((SwTOXAuthority&)rCmp).m_rField.GetFld())->GetHandle();
}
-sal_Bool SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
+bool SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetFld();
SwAuthorityFieldType* pType = (SwAuthorityFieldType*)
pField->GetTyp();
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index dadfe42..7975b17 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1727,10 +1727,10 @@ void SwTxtNode::InsertText( const XubString & rStr, const SwIndex & rIdx,
if ( !nLen ) return;
- sal_Bool bOldExpFlg = IsIgnoreDontExpand();
+ bool bOldExpFlg = IsIgnoreDontExpand();
if (nMode & IDocumentContentOperations::INS_FORCEHINTEXPAND)
{
- SetIgnoreDontExpand( sal_True );
+ SetIgnoreDontExpand( true );
}
Update( rIdx, nLen ); // text content changed!
@@ -3330,8 +3330,8 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const xub_StrLen nDelLen,
}
}
- sal_Bool bOldExpFlg = IsIgnoreDontExpand();
- SetIgnoreDontExpand( sal_True );
+ bool bOldExpFlg = IsIgnoreDontExpand();
+ SetIgnoreDontExpand( true );
if( nLen && rText.Len() )
{
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index abe49e4..04adadd 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -356,13 +356,13 @@ void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &)
}
// <- #116530#
- pDoc->DelPageDesc(aNew.GetName(), sal_True);
+ pDoc->DelPageDesc(aNew.GetName(), true);
}
void SwUndoPageDescCreate::DoImpl()
{
SwPageDesc aPageDesc = aNew;
- pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, sal_False, sal_True); // #116530#
+ pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, false, true); // #116530#
}
void SwUndoPageDescCreate::RedoImpl(::sw::UndoRedoContext &)
@@ -403,12 +403,12 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete()
void SwUndoPageDescDelete::UndoImpl(::sw::UndoRedoContext &)
{
SwPageDesc aPageDesc = aOld;
- pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, sal_False, sal_True); // #116530#
+ pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, false, true); // #116530#
}
void SwUndoPageDescDelete::DoImpl()
{
- pDoc->DelPageDesc(aOld.GetName(), sal_True); // #116530#
+ pDoc->DelPageDesc(aOld.GetName(), true); // #116530#
}
void SwUndoPageDescDelete::RedoImpl(::sw::UndoRedoContext &)
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index dfc199c..d5b810f 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -82,8 +82,8 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
bInsChar = sal_False;
}
- sal_Bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
- pTxtNd->SetIgnoreDontExpand( sal_True );
+ bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
+ pTxtNd->SetIgnoreDontExpand( true );
pTxtNd->InsertText( rtl::OUString(cIns), rPos.nContent,
IDocumentContentOperations::INS_EMPTYEXPAND );
@@ -160,8 +160,8 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
bInsChar = sal_True;
}
- sal_Bool bOldExpFlg = pDelTxtNd->IsIgnoreDontExpand();
- pDelTxtNd->SetIgnoreDontExpand( sal_True );
+ bool bOldExpFlg = pDelTxtNd->IsIgnoreDontExpand();
+ pDelTxtNd->SetIgnoreDontExpand( true );
pDelTxtNd->InsertText( rtl::OUString(cIns), rPos.nContent,
IDocumentContentOperations::INS_EMPTYEXPAND );
@@ -211,8 +211,8 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
String aTmpStr = rtl::OUString('1');
sal_Unicode* pTmpStr = aTmpStr.GetBufferAccess();
- sal_Bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
- pTxtNd->SetIgnoreDontExpand( sal_True );
+ bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
+ pTxtNd->SetIgnoreDontExpand( true );
++rIdx;
for( xub_StrLen n = 0; n < aDelStr.Len(); n++ )
@@ -282,8 +282,8 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
}
rIdx.Assign( pTxtNd, aDelStr.Len() ? nSttCntnt+1 : nSttCntnt );
- sal_Bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
- pTxtNd->SetIgnoreDontExpand( sal_True );
+ bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
+ pTxtNd->SetIgnoreDontExpand( true );
for( xub_StrLen n = 0; n < aInsStr.Len(); n++ )
{
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 24eee1e..d4d59c0 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -2231,7 +2231,7 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
if( pTxtNd )
{
// Update vom LR-Space abschalten
- pTxtNd->SetNumLSpace( sal_False );
+ pTxtNd->SetNumLSpace( false );
}
}
}
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 3fdf831..2693097 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -2037,7 +2037,7 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
nPos = GetDoc().MakePageDesc( ViewShell::GetShellRes()->GetPageDescName(
GetDoc().GetPageDescCnt(), bFollow ? ShellResource::FOLLOW_PAGE : ShellResource::NORMAL_PAGE),
- pFirstPageDesc, sal_False );
+ pFirstPageDesc, false );
pNewPD = &GetDoc().GetPageDesc(nPos);
if (bFollow)
More information about the Libreoffice-commits
mailing list