diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-02 12:56:48 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:52 +0200 |
commit | 0523304875cf810acb1ff7caf9c9a2ec5d982b70 (patch) | |
tree | 741920994ba1fb097e162ecbf2c8c60929536bd8 /sw | |
parent | abc429987c6ce644658824fb20db113af855c8b2 (diff) |
svl: sal_Bool->bool
Change-Id: I6938314a08d061d2b07d9129742d74a989bd1385
Diffstat (limited to 'sw')
26 files changed, 48 insertions, 48 deletions
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 4a2c26d1cd9a..1ebfce5ccbb6 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -182,7 +182,7 @@ public: SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable ); SwAttrSet( const SwAttrSet& ); - virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const SAL_OVERRIDE; + virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = 0) const SAL_OVERRIDE; bool Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew ); bool Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index fbda6e10afa0..3e3ba568831f 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -162,7 +162,7 @@ SwAttrSet::SwAttrSet( const SwAttrSet& rSet ) { } -SfxItemSet* SwAttrSet::Clone( sal_Bool bItems, SfxItemPool *pToPool ) const +SfxItemSet* SwAttrSet::Clone( bool bItems, SfxItemPool *pToPool ) const { if ( pToPool && pToPool != GetPool() ) { diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cac57ef73351..f56be968ce47 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1232,7 +1232,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, /* #i6447#: Only the selected items are copied from the old format. */ - SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( sal_True ); + SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( true ); // Copy only the set attributes. // The others should apply from the Templates. @@ -1537,7 +1537,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, // The TxtAttribute needs to be destroyed. // Unfortunately, this also destroys the Format next to the Frames. // To avoid this, we disconnect the attribute from the Format. - SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( sal_False ); + SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( false ); // Protect the Frame's size and position if ( rSdrObj.IsMoveProtect() || rSdrObj.IsResizeProtect() ) diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index c7d8b14338b4..125cc2b20efd 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1588,7 +1588,7 @@ sal_Bool SwCntntNode::GetAttr( SfxItemSet& rSet, sal_Bool bInParent ) const const SwAttrSet& rAttrSet = GetSwAttrSet(); if( bInParent ) - return rSet.Set( rAttrSet, sal_True ) ? sal_True : sal_False; + return rSet.Set( rAttrSet, true ) ? sal_True : sal_False; rSet.Put( rAttrSet ); return rSet.Count() ? sal_True : sal_False; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 53bed9a939e9..1ceadbf9c9b3 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1047,7 +1047,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const SET_CURR_SHELL( (SwViewShell*)this ); - if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), sal_True ) ) + if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), true ) ) return sal_False; // now examine all attributes. Remove forbidden attributes, then diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx index 61e4b888103f..43702d967adb 100644 --- a/sw/source/core/txtnode/swfntcch.cxx +++ b/sw/source/core/txtnode/swfntcch.cxx @@ -42,7 +42,7 @@ SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) : aSwFont.GoMagic( pSh, aSwFont.GetActual() ); const SwAttrSet& rAttrSet = ((SwTxtFmtColl *)pOwn)->GetAttrSet(); for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++) - pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, sal_True ); + pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true ); } SwFontObj::~SwFontObj() diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index b6e23cec0301..e9dbd89d9a09 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -884,7 +884,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, if ( !pCurrentCharFmt || 0 == CharFmt::GetItem( *pCurrentCharFmt, pItem->Which() ) ) { if ( !pNewSet ) - pNewSet = pNewStyle->Clone( sal_True ); + pNewSet = pNewStyle->Clone( true ); pNewSet->ClearItem( pItem->Which() ); } } @@ -1001,7 +1001,7 @@ SwTxtAttr* MakeTxtAttr( // different from rDoc's pool, we have to correct this: const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_cast<const SwFmtAutoFmt&>(rAttr).GetStyleHandle(); boost::scoped_ptr<const SfxItemSet> pNewSet( - pAutoStyle->SfxItemSet::Clone( sal_True, &rDoc.GetAttrPool() )); + pAutoStyle->SfxItemSet::Clone( true, &rDoc.GetAttrPool() )); SwTxtAttr* pNew = MakeTxtAttr( rDoc, *pNewSet, nStt, nEnd ); return pNew; } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 8cb04356a4ff..3c8adbec8b3b 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -311,7 +311,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, OSL_ENSURE( nWhichId, "lcl_HaveCommonAttributes not used correctly" ); if ( SFX_ITEM_SET == rSet2.GetItemState( nWhichId, false ) ) { - pNewSet = rSet2.Clone( sal_True ); + pNewSet = rSet2.Clone( true ); pNewSet->ClearItem( nWhichId ); } } @@ -324,7 +324,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, if ( SFX_ITEM_SET == rSet2.GetItemState( pItem->Which(), false ) ) { if ( !pNewSet ) - pNewSet = rSet2.Clone( sal_True ); + pNewSet = rSet2.Clone( true ); pNewSet->ClearItem( pItem->Which() ); } diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx index 75530245ff31..b133211a3ad6 100644 --- a/sw/source/core/uibase/docvw/edtwin.cxx +++ b/sw/source/core/uibase/docvw/edtwin.cxx @@ -2188,7 +2188,7 @@ KEYINPUT_CHECKTABLE_INSDEL: rSh.GetCurAttr(aSet); if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false)) { - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); bNormalChar = false; eKeyState = KS_End; rSh.ClickToINetAttr((const SwFmtINetFmt&)rItem, URLLOAD_NOFILTER); diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx index 8b96156db999..cf098136a655 100644 --- a/sw/source/core/uibase/shells/annotsh.cxx +++ b/sw/source/core/uibase/shells/annotsh.cxx @@ -824,7 +824,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) if(nEEWhich) { - rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich); + rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich); if(nEEWhich == EE_CHAR_KERNING) { SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true ); diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx index 8511fe50a303..b700ffeb618b 100644 --- a/sw/source/core/uibase/shells/drwtxtex.cxx +++ b/sw/source/core/uibase/shells/drwtxtex.cxx @@ -945,7 +945,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) } } if(nEEWhich) - rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich); + rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich); nWhich = aIter.NextWhich(); } diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx index 652ef4bbfabf..0a10d18f3568 100644 --- a/sw/source/core/uibase/shells/frmsh.cxx +++ b/sw/source/core/uibase/shells/frmsh.cxx @@ -737,7 +737,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case RES_PRINT: case RES_SURROUND: { - rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), sal_True )); + rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), true )); } break; case SID_OBJECT_ALIGN_LEFT : diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx index 57314e0e8848..635e21ec09fd 100644 --- a/sw/source/core/uibase/shells/textsh.cxx +++ b/sw/source/core/uibase/shells/textsh.cxx @@ -1083,17 +1083,17 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) nScript = g_pBreakIt->GetAllScriptsOfText( aChars ); if( SCRIPTTYPE_LATIN & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, sal_True ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_FONT); } if( SCRIPTTYPE_ASIAN & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, sal_True ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_CJK_FONT ); } if( SCRIPTTYPE_COMPLEX & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, sal_True ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_CTL_FONT ); } diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx index 05fccf2ec750..52efc16ab8ea 100644 --- a/sw/source/core/uibase/shells/textsh1.cxx +++ b/sw/source/core/uibase/shells/textsh1.cxx @@ -1281,7 +1281,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rWrtSh.GetCurAttr(aSet); if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true )) { - const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, sal_True) ); + const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, true) ); if( nSlot == FN_COPY_HYPERLINK_LOCATION ) { ::uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetView().GetEditWin().GetClipboard(); diff --git a/sw/source/core/uibase/shells/txtattr.cxx b/sw/source/core/uibase/shells/txtattr.cxx index 1b4350b31c08..628529c74d5c 100644 --- a/sw/source/core/uibase/shells/txtattr.cxx +++ b/sw/source/core/uibase/shells/txtattr.cxx @@ -692,10 +692,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) case RES_PARATR_DROP: { #if OSL_DEBUG_LEVEL > 1 - const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), sal_True); + const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), true); rSet.Put(rItem); #else - rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), sal_True)); + rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), true)); #endif nSlot = 0; } @@ -716,7 +716,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) { SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); rSet.Put(rItem); nSlot = 0; } diff --git a/sw/source/core/uibase/uiview/viewtab.cxx b/sw/source/core/uibase/uiview/viewtab.cxx index 83cd76885e3b..6d60fbd4b5d3 100644 --- a/sw/source/core/uibase/uiview/viewtab.cxx +++ b/sw/source/core/uibase/uiview/viewtab.cxx @@ -847,7 +847,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) SwFmtCol aCols( bSect ? pSectFmt->GetCol() : - (const SwFmtCol&)aSet.Get( RES_COL, sal_False )); + (const SwFmtCol&)aSet.Get( RES_COL, false )); SwRect aCurRect = rSh.GetAnyCurRect(bSect ? RECT_SECTION_PRT : RECT_FLY_PRT_EMBEDDED); const long lWidth = bVerticalWriting ? aCurRect.Height() : aCurRect.Width(); ::lcl_ConvertToCols( aColItem, sal_uInt16(lWidth), aCols ); diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx index da000d40c140..945bc0a7b31e 100644 --- a/sw/source/core/uibase/uno/unotxdoc.cxx +++ b/sw/source/core/uibase/uno/unotxdoc.cxx @@ -3230,19 +3230,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( LanguageType nLang = LANGUAGE_DONTKNOW; if (bLatin) { - nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bAsian) { - nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bComplex) { - nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } @@ -3278,19 +3278,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( LanguageType nLang = LANGUAGE_DONTKNOW; if (bLatin) { - nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bAsian) { - nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bComplex) { - nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 73b3a6b4f556..84ba271d71e2 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -124,7 +124,7 @@ SwUndoFmtAttr::SwUndoFmtAttr( const SfxPoolItem& rItem, SwFmt& rChgFmt, bool bSaveDrawPt ) : SwUndo( UNDO_INSFMTATTR ) , m_pFmt( &rChgFmt ) - , m_pOldSet( m_pFmt->GetAttrSet().Clone( sal_False ) ) + , m_pOldSet( m_pFmt->GetAttrSet().Clone( false ) ) , m_nNodeIndex( 0 ) , m_nFmtWhich( rChgFmt.Which() ) , m_bSaveDrawPt( bSaveDrawPt ) @@ -411,7 +411,7 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt ) } const SwFmtAnchor& rAnchor = - static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, sal_False ) ); + static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) ); if( !rAnchor.GetCntntAnchor() ) return; @@ -443,7 +443,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) SwDoc *const pDoc = & rContext.GetDoc(); SwFlyFrmFmt* pFrmFmt = static_cast<SwFlyFrmFmt*>(m_pFmt); const SwFmtAnchor& rAnchor = - static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, sal_False ) ); + static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) ); SwFmtAnchor aNewAnchor( rAnchor.GetAnchorId() ); if (FLY_AT_PAGE != rAnchor.GetAnchorId()) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 248bd160e6ff..1eeddb71fef4 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2028,7 +2028,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) { if (!pSetParent.get()) { - pSetParent.reset( pSet->Clone( sal_False ) ); + pSetParent.reset( pSet->Clone( false ) ); // #i63870# SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSetParent, true, false ); diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 8374d19e668c..3df30abc523c 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -318,7 +318,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, if( SFX_ITEM_SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) || MINFLY > ((SwFmtFrmSize*)pItem)->GetWidth() ) { - SwFmtFrmSize aSz((SwFmtFrmSize&)rFlySet.Get(RES_FRM_SIZE, sal_True)); + SwFmtFrmSize aSz((SwFmtFrmSize&)rFlySet.Get(RES_FRM_SIZE, true)); if (pItem) aSz = (SwFmtFrmSize&)(*pItem); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index dae3d002ede8..22b38d0eb0d3 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1261,7 +1261,7 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, 0 ); - aTstItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True ); + aTstItemSet.Set( pDCCharFmt->GetAttrSet(), true ); return HasScriptDependentItems( aTstItemSet, sal_False ); } } @@ -1413,7 +1413,7 @@ static void OutCSS1DropCapRule( RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT, 0 ); if( pDCCharFmt ) - aScriptItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True ); + aScriptItemSet.Set( pDCCharFmt->GetAttrSet(), true ); OUString aNewSelector( aSelector ); aNewSelector += ".western" + aPseudo; @@ -1525,7 +1525,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, // (all but for nDeep==1) const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet(); SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() ); - aItemSet.Set( rFmtItemSet, sal_True ); // Was nDeep!=1 that is not working + aItemSet.Set( rFmtItemSet, true ); // Was nDeep!=1 that is not working // for script dependent items buts should // not make a difference for any other @@ -1727,7 +1727,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, const SwFrmFmt &rMaster = rPageDesc.GetMaster(); SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(), RES_LR_SPACE, RES_UL_SPACE ); - aItemSet.Set( rMaster.GetAttrSet(), sal_True ); + aItemSet.Set( rMaster.GetAttrSet(), true ); if( pRefPageDesc ) { @@ -1779,7 +1779,7 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo, { const SfxItemSet& rFmtItemSet = pSymCharFmt->GetAttrSet(); SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() ); - aItemSet.Set( rFmtItemSet, sal_True ); + aItemSet.Set( rFmtItemSet, true ); // If there are footnotes or endnotes, then all Attributes have to be // exported, so that Netscape displays the document correctly. diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 2a85ebcb4421..1753a89c653b 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -293,7 +293,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, // sollen ist harte Attributierung noetig. Fuer Vorlagen, die // nicht von HTML-Tag-Vorlagen abgeleitet sind, gilt das immer - pItemSet->Set( pFmt->GetAttrSet(), sal_True ); + pItemSet->Set( pFmt->GetAttrSet(), true ); if( pReferenceFmt ) SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFmt->GetAttrSet(), diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 17a02cddec0c..2a1668243558 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -689,8 +689,8 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, if( aClearItems[j] || (pParentItemSet && SFX_ITEM_SET == rItemSet.GetItemState( nWhich, false, &pItem ) && - (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, sal_True ) ) - : *pItem == pParentItemSet->Get(nWhich, sal_True ) ) ) ) + (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, true ) ) + : *pItem == pParentItemSet->Get(nWhich, true ) ) ) ) { rItemSet.ClearItem( nWhich ); } diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 59ac277848b6..3d93e702274a 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -1918,7 +1918,7 @@ void SwFltOutDoc::EndFly() /*virtual*/ const SfxPoolItem& SwFltFormatCollection::GetFlyFrmAttr(sal_uInt16 nWhich) { if( pFlyAttrs ) - return pFlyAttrs->Get( nWhich, sal_False ); + return pFlyAttrs->Get( nWhich, false ); else return GetDoc().GetAttrPool().GetDefaultItem(nWhich); } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 465f04339ef7..76e2d16d3999 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3329,7 +3329,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh { const SwAttrSet& aSet = pAktColl->GetAttrSet(); SvxUnderlineItem *pUnderline - = (SvxUnderlineItem *)(aSet.Get( RES_CHRATR_UNDERLINE, sal_False ).Clone()); + = (SvxUnderlineItem *)(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone()); if(pUnderline){ pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) ); pAktColl->SetFmtAttr( *pUnderline ); @@ -3342,7 +3342,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh if ( SFX_ITEM_SET == pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) ) { SvxUnderlineItem *pUnderline - = (SvxUnderlineItem *)(pAktItemSet->Get( RES_CHRATR_UNDERLINE, sal_False ) .Clone()); + = (SvxUnderlineItem *)(pAktItemSet->Get( RES_CHRATR_UNDERLINE, false ) .Clone()); if(pUnderline){ pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) ); pAktItemSet->Put( *pUnderline ); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index fc7af67f8f25..cafe6f1fedce 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -776,7 +776,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) sal_uInt16 nNewPos = rDocFmts.GetPos( pFmt ); if( USHRT_MAX != nNewPos ) { - SfxItemSet* pSet = pFmt->GetAttrSet().Clone( sal_False ); + SfxItemSet* pSet = pFmt->GetAttrSet().Clone( false ); if( pFmt->GetCol() != pRepr->GetCol() ) pSet->Put( pRepr->GetCol() ); @@ -2025,9 +2025,9 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn, void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet ) { ResetState( sal_True, (const SwFmtFtnAtTxtEnd&)rSet.Get( - RES_FTN_AT_TXTEND, sal_False )); + RES_FTN_AT_TXTEND, false )); ResetState( sal_False, (const SwFmtEndAtTxtEnd&)rSet.Get( - RES_END_AT_TXTEND, sal_False )); + RES_END_AT_TXTEND, false )); } SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, |