[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Oct 21 20:54:21 PDT 2012
sw/inc/doc.hxx | 10 ++---
sw/inc/fesh.hxx | 4 +-
sw/source/core/doc/docfld.cxx | 62 ++++++++++++++++++------------------
sw/source/core/doc/docfly.cxx | 26 +++++++--------
sw/source/core/doc/doclay.cxx | 6 +--
sw/source/core/docnode/nodes.cxx | 2 -
sw/source/core/frmedt/fefly1.cxx | 8 ++--
sw/source/core/inc/docfld.hxx | 14 ++++----
sw/source/core/text/txtfrm.cxx | 2 -
sw/source/core/txtnode/thints.cxx | 6 +--
sw/source/core/unocore/unoframe.cxx | 4 +-
sw/source/ui/app/docst.cxx | 2 -
sw/source/ui/docvw/edtwin.cxx | 2 -
13 files changed, 74 insertions(+), 74 deletions(-)
New commits:
commit ec9e661988c81b0424d4e848d24c745a7dc9e5ad
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Oct 22 12:53:09 2012 +0900
sal_Bool to bool
Change-Id: I71842ace16eb65b3269754cc36408fe52843b2ea
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 740659a..88f13a8 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -635,7 +635,7 @@ private:
const xub_StrLen nEndContentIndex,
const SwNodeIndex& rStartIdx,
const bool bCopyFlyAtFly = false ) const;
- sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
+ sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool, sal_Bool );
SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
@@ -665,7 +665,7 @@ private:
void AddUsedDBToList( std::vector<String>& rDBNameList,
const std::vector<String>& rUsedDBNames );
void AddUsedDBToList( std::vector<String>& rDBNameList, const String& rDBName );
- sal_Bool IsNameInArray( const std::vector<String>& rOldNames, const String& rName );
+ bool IsNameInArray( const std::vector<String>& rOldNames, const String& rName );
void GetAllDBNames( std::vector<String>& rAllDBNames );
void ReplaceUsedDBs( const std::vector<String>& rUsedDBNames,
const String& rNewName, String& rFormel );
@@ -1082,10 +1082,10 @@ public:
sal_Bool bDelRedlines = sal_True,
sal_Bool bCopyFlyAtFly = sal_False ) const;
- sal_Bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
+ bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
- sal_Bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
- SfxItemSet* pSet = 0, sal_Bool bKeepOrient = sal_False );
+ bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
+ SfxItemSet* pSet = 0, bool bKeepOrient = false );
void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
const String& sNewTitle );
void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 17f4655..81ebaae 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -355,7 +355,7 @@ public:
sal_Bool IsFrmSelected() const;
sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
- sal_Bool SetFlyFrmAttr( SfxItemSet &rSet );
+ bool SetFlyFrmAttr( SfxItemSet &rSet );
sal_Bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, sal_Bool bAnchValid = sal_False,
SwFrmFmt *pParent = 0 );
@@ -368,7 +368,7 @@ public:
sal_Bool IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRightToLeft, sal_Bool& bVertL2R) const;
SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0.
- void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bKeepOrient = sal_False, Point* pDocPos = 0 ); ///< If frame then set frame style.
+ void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
/// Find/delete fly containing the cursor.
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index d57e8ac..18953ad 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1227,8 +1227,8 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
if( IsExpFldsLocked() || IsInReading() )
return;
- sal_Bool bOldInUpdateFlds = pUpdtFlds->IsInUpdateFlds();
- pUpdtFlds->SetInUpdateFlds( sal_True );
+ bool bOldInUpdateFlds = pUpdtFlds->IsInUpdateFlds();
+ pUpdtFlds->SetInUpdateFlds( true );
pUpdtFlds->MakeFldList( *this, sal_True, GETFLD_ALL );
mbNewFldLst = sal_False;
@@ -1239,7 +1239,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
UpdateRefFlds(NULL);
pUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
- pUpdtFlds->SetFieldsDirty( sal_False );
+ pUpdtFlds->SetFieldsDirty( false );
return ;
}
@@ -1538,7 +1538,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
UpdateRefFlds(NULL);
pUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
- pUpdtFlds->SetFieldsDirty( sal_False );
+ pUpdtFlds->SetFieldsDirty( false );
}
void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
@@ -1886,7 +1886,7 @@ void SwDoc::ChangeDBFields( const std::vector<String>& rOldNames,
continue;
SwField* pFld = pFmtFld->GetFld();
- sal_Bool bExpand = sal_False;
+ bool bExpand = false;
switch( pFld->GetTyp()->Which() )
{
@@ -1904,7 +1904,7 @@ void SwDoc::ChangeDBFields( const std::vector<String>& rOldNames,
((SwDBField*)pFld)->ClearInitialized();
((SwDBField*)pFld)->InitContent();
- bExpand = sal_True;
+ bExpand = true;
}
break;
@@ -1914,7 +1914,7 @@ void SwDoc::ChangeDBFields( const std::vector<String>& rOldNames,
lcl_DBDataToString(((SwDBNameInfField*)pFld)->GetRealDBData())))
{
((SwDBNameInfField*)pFld)->SetDBData(aNewDBData);
- bExpand = sal_True;
+ bExpand = true;
}
break;
@@ -1924,7 +1924,7 @@ void SwDoc::ChangeDBFields( const std::vector<String>& rOldNames,
lcl_DBDataToString(((SwDBNameInfField*)pFld)->GetRealDBData())))
{
((SwDBNameInfField*)pFld)->SetDBData(aNewDBData);
- bExpand = sal_True;
+ bExpand = true;
}
// no break;
case RES_HIDDENTXTFLD:
@@ -1932,7 +1932,7 @@ void SwDoc::ChangeDBFields( const std::vector<String>& rOldNames,
sFormel = pFld->GetPar1();
ReplaceUsedDBs( rOldNames, rNewName, sFormel);
pFld->SetPar1( sFormel );
- bExpand = sal_True;
+ bExpand = true;
break;
case RES_SETEXPFLD:
@@ -1941,7 +1941,7 @@ void SwDoc::ChangeDBFields( const std::vector<String>& rOldNames,
sFormel = pFld->GetFormula();
ReplaceUsedDBs( rOldNames, rNewName, sFormel);
pFld->SetPar2( sFormel );
- bExpand = sal_True;
+ bExpand = true;
break;
}
@@ -1991,19 +1991,19 @@ void SwDoc::ReplaceUsedDBs( const std::vector<String>& rUsedDBNames,
}
}
-sal_Bool SwDoc::IsNameInArray( const std::vector<String>& rArr, const String& rName )
+bool SwDoc::IsNameInArray( const std::vector<String>& rArr, const String& rName )
{
#ifdef UNX
for( sal_uInt16 i = 0; i < rArr.size(); ++i )
if( rName == rArr[ i ] )
- return sal_True;
+ return true;
#else
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
for( sal_uInt16 i = 0; i < rArr.size(); ++i )
if( rSCmp.isEqual( rName, rArr[ i] ))
- return sal_True;
+ return true;
#endif
- return sal_False;
+ return false;
}
void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
@@ -2039,13 +2039,13 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
{
if( pFld && pFld->GetTxtFld() )
{
- sal_Bool bChgd = sal_False;
+ bool bChgd = false;
switch( aTypes[ nStt ] )
{
case RES_DOCINFOFLD:
if( ((SwDocInfoField*)pFld->GetFld())->IsFixed() )
{
- bChgd = sal_True;
+ bChgd = true;
SwDocInfoField* pDocInfFld = (SwDocInfoField*)pFld->GetFld();
pDocInfFld->SetExpansion( ((SwDocInfoFieldType*)
pDocInfFld->GetTyp())->Expand(
@@ -2059,7 +2059,7 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
case RES_AUTHORFLD:
if( ((SwAuthorField*)pFld->GetFld())->IsFixed() )
{
- bChgd = sal_True;
+ bChgd = true;
SwAuthorField* pAuthorFld = (SwAuthorField*)pFld->GetFld();
pAuthorFld->SetExpansion( ((SwAuthorFieldType*)
pAuthorFld->GetTyp())->Expand(
@@ -2070,7 +2070,7 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
case RES_EXTUSERFLD:
if( ((SwExtUserField*)pFld->GetFld())->IsFixed() )
{
- bChgd = sal_True;
+ bChgd = true;
SwExtUserField* pExtUserFld = (SwExtUserField*)pFld->GetFld();
pExtUserFld->SetExpansion( ((SwExtUserFieldType*)
pExtUserFld->GetTyp())->Expand(
@@ -2082,7 +2082,7 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
case RES_DATETIMEFLD:
if( ((SwDateTimeField*)pFld->GetFld())->IsFixed() )
{
- bChgd = sal_True;
+ bChgd = true;
((SwDateTimeField*)pFld->GetFld())->SetDateTime(
DateTime(Date(nDate), Time(nTime)) );
}
@@ -2091,7 +2091,7 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
case RES_FILENAMEFLD:
if( ((SwFileNameField*)pFld->GetFld())->IsFixed() )
{
- bChgd = sal_True;
+ bChgd = true;
SwFileNameField* pFileNameFld =
(SwFileNameField*)pFld->GetFld();
pFileNameFld->SetExpansion( ((SwFileNameFieldType*)
@@ -2116,12 +2116,12 @@ bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLong nLen )
{
// See if the supplied nodes actually contain fields.
// If they don't, the flag doesn't need to be changed.
- sal_Bool bFldsFnd = sal_False;
+ bool bFldsFnd = false;
if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !IsInDtor()
// ?? what's up with Undo, this is also wanted there!
/*&& &pChk->GetNodes() == &GetNodes()*/ )
{
- b = sal_False;
+ b = false;
if( !nLen )
++nLen;
sal_uLong nStt = pChk->GetIndex();
@@ -2133,7 +2133,7 @@ bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLong nLen )
{
if( pTNd->GetAttrOutlineLevel() != 0 )
// update chapter fields
- b = sal_True;
+ b = true;
else if( pTNd->GetpSwpHints() && pTNd->GetSwpHints().Count() )
for( sal_uInt16 n = 0, nEnd = pTNd->GetSwpHints().Count();
n < nEnd; ++n )
@@ -2141,7 +2141,7 @@ bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLong nLen )
const SwTxtAttr* pAttr = pTNd->GetSwpHints()[ n ];
if( RES_TXTATR_FIELD == pAttr->Which() )
{
- b = sal_True;
+ b = true;
break;
}
}
@@ -2173,7 +2173,7 @@ void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
}
-void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld )
+void SwDocUpdtFld::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
{
sal_uInt16 nWhich = rFld.GetFld().GetFld()->GetTyp()->Which();
switch( nWhich )
@@ -2192,7 +2192,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld )
return;
}
- SetFieldsDirty( sal_True );
+ SetFieldsDirty( true );
if( !pFldSortLst )
{
if( !bIns ) // if list is present and deleted
@@ -2291,7 +2291,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
rtl::OUString sTrue("TRUE"), sFalse("FALSE");
- sal_Bool bIsDBMgr = 0 != rDoc.GetNewDBMgr();
+ bool bIsDBMgr = 0 != rDoc.GetNewDBMgr();
sal_uInt16 nWhich, n;
const rtl::OUString* pFormel = 0;
const SfxPoolItem* pItem;
@@ -2510,7 +2510,7 @@ void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
if( sFldName.Len() )
{
- SetFieldsDirty( sal_True );
+ SetFieldsDirty( true );
// look up and remove from the hash table
sFldName = GetAppCharClass().lowercase( sFldName );
sal_uInt16 n;
@@ -2541,7 +2541,7 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
if( sFldName.Len() )
{
- SetFieldsDirty( sal_True );
+ SetFieldsDirty( true );
// look up and remove from the hash table
sFldName = GetAppCharClass().lowercase( sFldName );
sal_uInt16 n;
@@ -2585,7 +2585,7 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
{
OSL_ENSURE(pDstTxtFld, "no field to update!");
- sal_Bool bTblSelBreak = sal_False;
+ bool bTblSelBreak = false;
SwFmtFld * pDstFmtFld = (SwFmtFld*)&pDstTxtFld->GetFld();
SwField * pDstFld = pDstFmtFld->GetFld();
@@ -2631,7 +2631,7 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
pNewFld->GetTyp()->ModifyNotification(0, &aTblUpdate);
if (! bUpdateFlds)
- bTblSelBreak = sal_True;
+ bTblSelBreak = true;
}
}
break;
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 2dc8f3e..203426d 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -214,7 +214,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
#define IGNOREANCHOR 1
#define DONTMAKEFRMS 2
-sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, sal_Bool bNewFrms )
+sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms )
{
// Changing anchors is almost always allowed.
// Exception: Paragraph and character bound frames must not become
@@ -291,7 +291,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, sal_Bool bNew
if( SFX_ITEM_SET != rSet.GetItemState( RES_VERT_ORIENT, sal_False, &pItem ))
{
SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
- sal_Bool bSet = sal_True;
+ bool bSet = true;
switch( aOldV.GetVertOrient() )
{
case text::VertOrientation::LINE_TOP: aOldV.SetVertOrient( text::VertOrientation::TOP ); break;
@@ -299,7 +299,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, sal_Bool bNew
case text::VertOrientation::LINE_BOTTOM: aOldV.SetVertOrient( text::VertOrientation::BOTTOM); break;
case text::VertOrientation::NONE: aOldV.SetVertOrient( text::VertOrientation::CENTER); break;
default:
- bSet = sal_False;
+ bSet = false;
}
if( bSet )
rSet.Put( aOldV );
@@ -370,7 +370,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, sal_Bool bNew
static bool
lcl_SetFlyFrmAttr(SwDoc & rDoc,
- sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrmFmt &, SfxItemSet &, sal_Bool),
+ sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrmFmt &, SfxItemSet &, bool),
SwFrmFmt & rFlyFmt, SfxItemSet & rSet)
{
// #i32968# Inserting columns in the frame causes MakeFrmFmt to put two
@@ -382,7 +382,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
// if the Fly needs to be created anew, because we e.g change the FlyType.
sal_Int8 const nMakeFrms =
(SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False ))
- ? (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, sal_False )
+ ? (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, false )
: DONTMAKEFRMS;
const SfxPoolItem* pItem;
@@ -428,10 +428,10 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
return aTmpSet.Count() || MAKEFRMS == nMakeFrms;
}
-sal_Bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
+bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
{
if( !rSet.Count() )
- return sal_False;
+ return false;
::std::auto_ptr<SwUndoFmtAttrHelper> pSaveUndo;
@@ -504,10 +504,10 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
SetModified();
}
-sal_Bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
- SfxItemSet* pSet, sal_Bool bKeepOrient )
+bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
+ SfxItemSet* pSet, bool bKeepOrient )
{
- sal_Bool bChgAnchor = sal_False, bFrmSz = sal_False;
+ bool bChgAnchor = false, bFrmSz = false;
const SwFmtFrmSize aFrmSz( rFmt.GetFrmSize() );
const SwFmtVertOrient aVert( rFmt.GetVertOrient() );
@@ -540,7 +540,7 @@ sal_Bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
if( SFX_ITEM_SET == rNewFmt.GetAttrSet().GetItemState( RES_FRM_SIZE, sal_False ))
{
rFmt.ResetFmtAttr( RES_FRM_SIZE );
- bFrmSz = sal_True;
+ bFrmSz = true;
}
const SfxItemSet* pAsk = pSet;
@@ -550,7 +550,7 @@ sal_Bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
rFmt.GetAnchor().GetAnchorId() )
{
if( pSet )
- bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, *pSet, sal_False );
+ bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, *pSet, false );
else
{
// Needs to have the FlyFmt range, because we set attributes in it,
@@ -558,7 +558,7 @@ sal_Bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
SfxItemSet aFlySet( *rNewFmt.GetAttrSet().GetPool(),
rNewFmt.GetAttrSet().GetRanges() );
aFlySet.Put( *pItem );
- bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, aFlySet, sal_False);
+ bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, aFlySet, false);
}
}
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index b427e18..e9663f9 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1888,7 +1888,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
/* && !pStartSh->GetViewOptions()->IsFldName()*/ )
{
// Action brackets!
- GetUpdtFlds().SetInUpdateFlds( sal_True );
+ GetUpdtFlds().SetInUpdateFlds( true );
pTmpRoot->StartAllAction();
@@ -1905,8 +1905,8 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
pStartSh->LockView( bOldLockView );
- GetUpdtFlds().SetInUpdateFlds( sal_False );
- GetUpdtFlds().SetFieldsDirty( sal_False );
+ GetUpdtFlds().SetInUpdateFlds( false );
+ GetUpdtFlds().SetFieldsDirty( false );
}
} //swmod 080219
#ifdef TIMELOG
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index ba33af7..0abaab8 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -142,7 +142,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
//JP 03.02.99: alle Felder als invalide erklaeren, aktu. erfolgt im
// Idle-Handler des Docs
- if( GetDoc()->SetFieldsDirty( sal_True, &rDelPos.GetNode(), nSz ) &&
+ if( GetDoc()->SetFieldsDirty( true, &rDelPos.GetNode(), nSz ) &&
rNds.GetDoc() != GetDoc() )
rNds.GetDoc()->SetFieldsDirty( true, NULL, 0 );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index a6e73a1..4f9d740 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1071,10 +1071,10 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
#* Description : Attributes of the current fly will change.
#***********************************************************************/
-sal_Bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
+bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
{
SET_CURR_SHELL( this );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( rSet.Count() )
{
@@ -1096,7 +1096,7 @@ sal_Bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
if( GetDoc()->SetFlyFrmAttr( *pFlyFmt, rSet ))
{
- bRet = sal_True;
+ bRet = true;
SwFlyFrm* pFrm = pFlyFmt->GetFrm( &aPt );
if( pFrm )
SelectFlyFrm( *pFrm, sal_True );
@@ -1222,7 +1222,7 @@ SwFrmFmt* SwFEShell::GetCurFrmFmt() const
* Description :
******************************************************************************/
-void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocPos )
+void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
{
SwFlyFrm *pFly = 0;
if(pDocPos)
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index ee8ede6..4ded5cc 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -156,8 +156,8 @@ class SwDocUpdtFld
sal_uLong nNodes; // if the node count is different
sal_uInt8 nFldLstGetMode;
- sal_Bool bInUpdateFlds : 1; // currently there is an UpdateFlds
- sal_Bool bFldsDirty : 1; // some fields are invalid
+ bool bInUpdateFlds : 1; // currently there is an UpdateFlds
+ bool bFldsDirty : 1; // some fields are invalid
void _MakeFldList( SwDoc& pDoc, int eGetMode );
void GetBodyNode( const SwTxtFld& , sal_uInt16 nFldWhich );
@@ -171,16 +171,16 @@ public:
void MakeFldList( SwDoc& rDoc, int bAll, int eGetMode );
- void InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld );
+ void InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld );
void InsertFldType( const SwFieldType& rType );
void RemoveFldType( const SwFieldType& rType );
- sal_Bool IsInUpdateFlds() const { return bInUpdateFlds; }
- void SetInUpdateFlds( sal_Bool b ) { bInUpdateFlds = b; }
+ bool IsInUpdateFlds() const { return bInUpdateFlds; }
+ void SetInUpdateFlds( bool b ) { bInUpdateFlds = b; }
- sal_Bool IsFieldsDirty() const { return bFldsDirty; }
- void SetFieldsDirty( sal_Bool b ) { bFldsDirty = b; }
+ bool IsFieldsDirty() const { return bFldsDirty; }
+ void SetFieldsDirty( bool b ) { bFldsDirty = b; }
SwHash** GetFldTypeTable() const { return (SwHash**)aFldTypeTable; }
};
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index b2d7522..870741b 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1352,7 +1352,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
} // switch
if( bSetFldsDirty )
- GetNode()->getIDocumentFieldsAccess()->SetFieldsDirty( sal_True, GetNode(), 1 );
+ GetNode()->getIDocumentFieldsAccess()->SetFieldsDirty( true, GetNode(), 1 );
if ( bRecalcFtnFlag )
CalcFtnFlag();
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 10a78df..947ed83 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1146,7 +1146,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
case RES_DBNUMSETFLD:
case RES_DBNEXTSETFLD:
if( !pDoc->IsNewFldLst() && GetNodes().IsDocNodes() )
- pDoc->InsDelFldInFldLst( sal_False, *(SwTxtFld*)pAttr );
+ pDoc->InsDelFldInFldLst( false, *(SwTxtFld*)pAttr );
break;
case RES_DDEFLD:
if( GetNodes().IsDocNodes() &&
@@ -2627,9 +2627,9 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
case RES_DBNEXTSETFLD:
{
if( bDelFirst )
- pDoc->InsDelFldInFldLst( sal_False, *(SwTxtFld*)pHint );
+ pDoc->InsDelFldInFldLst( false, *(SwTxtFld*)pHint );
if( rNode.GetNodes().IsDocNodes() )
- pDoc->InsDelFldInFldLst( sal_True, *(SwTxtFld*)pHint );
+ pDoc->InsDelFldInFldLst( true, *(SwTxtFld*)pHint );
}
break;
case RES_DDEFLD:
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a3d2fe2..7705f0e 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1072,7 +1072,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
// if document is currently in reading mode.
if ( !pFmt->GetDoc()->IsInReading() )
{
- // see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocPos )
+ // see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
SwFlyFrm *pFly = 0;
{
const :: SwFrmFmt* pFmtXX = pFmt;
@@ -1092,7 +1092,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
}
}
- pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, sal_False );
+ pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, false );
delete pSet;
}
else
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 8f90a15..be9eb6d 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -1008,7 +1008,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWr
pFrm->SetFmtAttr( aSet );
// also apply template to remove hard set attributes
- pCurrWrtShell->SetFrmFmt( pFrm, sal_True );
+ pCurrWrtShell->SetFrmFmt( pFrm, true );
pCurrWrtShell->EndAllAction();
}
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 6b921cf..e9eb4e9 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4587,7 +4587,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
const SwFrmFmt* pFmt = rSh.GetFmtFromObj( aDocPt );
if(PTR_CAST(SwFlyFrmFmt, pFmt))
{
- rSh.SetFrmFmt( pApplyTempl->aColl.pFrmFmt, sal_False, &aDocPt );
+ rSh.SetFrmFmt( pApplyTempl->aColl.pFrmFmt, false, &aDocPt );
pApplyTempl->bUndo = sal_True;
bCallBase = sal_False;
if( pApplyTempl->aColl.pFrmFmt )
More information about the Libreoffice-commits
mailing list