diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 21:49:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-20 08:17:00 +0100 |
commit | 12f1faf7bf7b236f54f740a9f65646749fc266ee (patch) | |
tree | 92b570339a02ac977907be12dc8e2e49291d177d /sw | |
parent | 9e183fbfdbfbe364d17f9d36a0b33d2fae89862d (diff) |
svl: sal_Bool -> bool
Change-Id: Ic31455a1f5ffffa35d4fdde901dd70734207b6f4
Diffstat (limited to 'sw')
154 files changed, 889 insertions, 889 deletions
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index f213eefd10c2..c0dbc80708ad 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -100,7 +100,7 @@ public: void SetPhysical(sal_Bool bPhys); virtual void SetHidden( sal_Bool bHidden ); - virtual sal_Bool IsHidden( ) const; + virtual bool IsHidden( ) const; void SetGrabBagItem(const com::sun::star::uno::Any& rVal); void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index f9297eb0accd..701766feb8bf 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2107,7 +2107,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( const SfxPoolItem* pItem( 0 ); // #i82637# - Found character attributes, whose value equals the value of // the corresponding default character attributes, are excluded. - if ( aSet.GetItemState( aPropIt->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( aSet.GetItemState( aPropIt->nWID, true, &pItem ) == SFX_ITEM_SET ) { uno::Any aVal; pItem->QueryValue( aVal, aPropIt->nMemberId ); diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 277957f2564b..34da2767a2d4 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -319,7 +319,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue ) default: { // attribute is defined in this format - if( SFX_ITEM_SET == aSet.GetItemState( nWhich, sal_False )) + if( SFX_ITEM_SET == aSet.GetItemState( nWhich, false )) { // DropCaps might come into this block OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify was sent without sender" ); diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index 083cd2ac85fd..9e7de6f47311 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -97,7 +97,7 @@ SfxItemSet* SwAttrSet::Clone( sal_Bool bItems, SfxItemPool *pToPool ) const while ( nWhich ) { const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == GetItemState( nWhich, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == GetItemState( nWhich, false, &pItem ) ) pTmpSet->Put( *pItem, pItem->Which() ); nWhich = aIter.NextWhich(); } @@ -187,14 +187,14 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify ) bool bSet = false; const SfxPoolItem* pItem; - if( SFX_ITEM_SET == GetItemState( RES_PAGEDESC, sal_False, &pItem ) && + if( SFX_ITEM_SET == GetItemState( RES_PAGEDESC, false, &pItem ) && ((SwFmtPageDesc*)pItem)->GetDefinedIn() != pModify ) { ((SwFmtPageDesc*)pItem)->ChgDefinedIn( pModify ); bSet = true; } - if( SFX_ITEM_SET == GetItemState( RES_PARATR_DROP, sal_False, &pItem ) && + if( SFX_ITEM_SET == GetItemState( RES_PARATR_DROP, false, &pItem ) && ((SwFmtDrop*)pItem)->GetDefinedIn() != pModify ) { // If CharFormat is set and it is set in different attribute pools then @@ -210,7 +210,7 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify ) bSet = true; } - if( SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMULA, sal_False, &pItem ) && + if( SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMULA, false, &pItem ) && ((SwTblBoxFormula*)pItem)->GetDefinedIn() != pModify ) { ((SwTblBoxFormula*)pItem)->ChgDefinedIn( pModify ); @@ -239,7 +239,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const // Does the NumRule has to be copied? if( pSrcDoc != pDstDoc && - SFX_ITEM_SET == GetItemState( RES_PARATR_NUMRULE, sal_False, &pItem ) ) + SFX_ITEM_SET == GetItemState( RES_PARATR_NUMRULE, false, &pItem ) ) { const OUString& rNm = ((SwNumRuleItem*)pItem)->GetValue(); if( !rNm.isEmpty() ) @@ -256,7 +256,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const // for text nodes if ( pSrcDoc != pDstDoc && pCNd && pCNd->IsTxtNode() && - GetItemState( RES_PARATR_LIST_ID, sal_False, &pItem ) == SFX_ITEM_SET ) + GetItemState( RES_PARATR_LIST_ID, false, &pItem ) == SFX_ITEM_SET ) { const OUString& sListId = dynamic_cast<const SfxStringItem*>(pItem)->GetValue(); @@ -303,7 +303,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const const SwPageDesc* pPgDesc; if( pSrcDoc != pDstDoc && SFX_ITEM_SET == GetItemState( - RES_PAGEDESC, sal_False, &pItem ) && + RES_PAGEDESC, false, &pItem ) && 0 != ( pPgDesc = ((SwFmtPageDesc*)pItem)->GetPageDesc()) ) { SfxItemSet aTmpSet( *this ); diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 1bfecbea0c6c..02fd8080d644 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -757,7 +757,7 @@ void _FinitCore() #if OSL_DEBUG_LEVEL > 0 // free defaults to prevent assertions if ( aAttrTab[0]->GetRefCount() ) - SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, sal_False); + SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, false); #endif delete SwDoc::mpACmpltWords; diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index e7a48d598965..2b5c11c834c6 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -356,7 +356,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr ) pIter = new SfxWhichIter( *pSet ); nWhch = pIter->FirstWhich(); while( nWhch && - SFX_ITEM_SET != pSet->GetItemState( nWhch, sal_True, &pTmpItem ) ) + SFX_ITEM_SET != pSet->GetItemState( nWhch, true, &pTmpItem ) ) nWhch = pIter->NextWhich(); if( !nWhch ) pTmpItem = NULL; @@ -367,7 +367,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr ) while( pTmpItem ) { - SfxItemState eState = aCmpSet.GetItemState( nWhch, sal_False, &pItem ); + SfxItemState eState = aCmpSet.GetItemState( nWhch, false, &pItem ); if( SFX_ITEM_DONTCARE == eState || SFX_ITEM_SET == eState ) { sal_uInt16 n; @@ -470,7 +470,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr ) { nWhch = pIter->NextWhich(); while( nWhch && - SFX_ITEM_SET != pSet->GetItemState( nWhch, sal_True, &pTmpItem ) ) + SFX_ITEM_SET != pSet->GetItemState( nWhch, true, &pTmpItem ) ) nWhch = pIter->NextWhich(); if( !nWhch ) break; @@ -509,7 +509,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) pIter = new SfxWhichIter( *pSet ); nWhch = pIter->FirstWhich(); while( nWhch && - SFX_ITEM_SET != pSet->GetItemState( nWhch, sal_True, &pTmpItem ) ) + SFX_ITEM_SET != pSet->GetItemState( nWhch, true, &pTmpItem ) ) nWhch = pIter->NextWhich(); if( !nWhch ) pTmpItem = NULL; @@ -520,7 +520,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) while( pTmpItem ) { - SfxItemState eState = aCmpSet.GetItemState( nWhch, sal_False, &pItem ); + SfxItemState eState = aCmpSet.GetItemState( nWhch, false, &pItem ); if( SFX_ITEM_DONTCARE == eState || SFX_ITEM_SET == eState ) { sal_uInt16 n; @@ -621,7 +621,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) { nWhch = pIter->NextWhich(); while( nWhch && - SFX_ITEM_SET != pSet->GetItemState( nWhch, sal_True, &pTmpItem ) ) + SFX_ITEM_SET != pSet->GetItemState( nWhch, true, &pTmpItem ) ) nWhch = pIter->NextWhich(); if( !nWhch ) break; @@ -937,7 +937,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove, } if( SFX_ITEM_SET == pNode->GetSwAttrSet().GetItemState( nWhich, - sal_True, &pItem ) && ( !bValue || *pItem == rAttr ) ) + true, &pItem ) && ( !bValue || *pItem == rAttr ) ) { // FORWARD: SPoint at the end, GetMark at the beginning of the node // BACKWARD: SPoint at the beginning, GetMark at the end of the node @@ -1190,7 +1190,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, { // reset all that are not set with pool defaults if( !IsInvalidItem( pItem ) && SFX_ITEM_SET != - pReplSet->GetItemState( pItem->Which(), sal_False )) + pReplSet->GetItemState( pItem->Which(), false )) aSet.Put( pPool->GetDefaultItem( pItem->Which() )); if( aIter.IsAtEnd() ) diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 97b8b3b2bbc6..ff67c4940672 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -583,7 +583,7 @@ static OUString lcl_dbg_out(const SwNode & rNode) const SfxPoolItem * pItem = NULL; if (pAttrSet && SFX_ITEM_SET == - pAttrSet->GetItemState(RES_PARATR_NUMRULE, sal_False, &pItem)) + pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem)) { aTmpStr += "("; aTmpStr += diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 7e414c00d356..4e1f4e9c766d 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -1303,11 +1303,11 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ) { const SfxPoolItem* pItem; if( SFX_ITEM_SET == pTxtNd->GetpSwAttrSet()->GetItemState( - RES_BREAK, sal_False, &pItem ) ) + RES_BREAK, false, &pItem ) ) pTxtNd->ResetAttr( RES_BREAK ); if( pTxtNd->HasSwAttrSet() && SFX_ITEM_SET == pTxtNd->GetpSwAttrSet()->GetItemState( - RES_PAGEDESC, sal_False, &pItem ) ) + RES_PAGEDESC, false, &pItem ) ) pTxtNd->ResetAttr( RES_PAGEDESC ); } @@ -1318,10 +1318,10 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ) SfxItemSet aSet( pDoc->GetAttrPool(), aBreakSetRange ); const SfxItemSet* pSet = pOldTxtNd->GetpSwAttrSet(); if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, - sal_False, &pItem ) ) + false, &pItem ) ) aSet.Put( *pItem ); if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, - sal_False, &pItem ) ) + false, &pItem ) ) aSet.Put( *pItem ); if( aSet.Count() ) pTxtNd->SetAttr( aSet ); @@ -2493,14 +2493,14 @@ bool SwDoc::DelFullPara( SwPaM& rPam ) const SfxPoolItem *pItem; const SfxItemSet* pSet = ((SwCntntNode*)pNd)->GetpSwAttrSet(); if( pSet && SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, - sal_False, &pItem ) ) + false, &pItem ) ) { pTableFmt->SetFmtAttr( *pItem ); bSavePageDesc = sal_True; } if( pSet && SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, - sal_False, &pItem ) ) + false, &pItem ) ) { pTableFmt->SetFmtAttr( *pItem ); bSavePageBreak = sal_True; diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 13ac0a11523a..83572231879a 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -277,7 +277,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms pNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 ); } - if( SFX_ITEM_SET != rSet.GetItemState( RES_VERT_ORIENT, sal_False, &pItem )) + if( SFX_ITEM_SET != rSet.GetItemState( RES_VERT_ORIENT, false, &pItem )) { SwFmtVertOrient aOldV( rFmt.GetVertOrient() ); bool bSet = true; @@ -304,7 +304,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms // such that the fly's document coordinates are preserved. // If only the alignment changes in the position attributes (text::RelOrientation::FRAME // vs. text::RelOrientation::PRTAREA), we also correct the position. - if( SFX_ITEM_SET != rSet.GetItemState( RES_HORI_ORIENT, sal_False, &pItem )) + if( SFX_ITEM_SET != rSet.GetItemState( RES_HORI_ORIENT, false, &pItem )) pItem = 0; SwFmtHoriOrient aOldH( rFmt.GetHoriOrient() ); @@ -325,7 +325,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms rSet.Put( aOldH ); } - if( SFX_ITEM_SET != rSet.GetItemState( RES_VERT_ORIENT, sal_False, &pItem )) + if( SFX_ITEM_SET != rSet.GetItemState( RES_VERT_ORIENT, false, &pItem )) pItem = 0; SwFmtVertOrient aOldV( rFmt.GetVertOrient() ); @@ -370,7 +370,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc, // If so, we pass it to a special method, which returns sal_True // 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 )) + (SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, false )) ? (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, false ) : DONTMAKEFRMS; @@ -397,7 +397,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc, default: if( !IsInvalidItem( aIter.GetCurItem() ) && ( SFX_ITEM_SET != - rFlyFmt.GetAttrSet().GetItemState( nWhich, sal_True, &pItem ) || + rFlyFmt.GetAttrSet().GetItemState( nWhich, true, &pItem ) || *pItem != *aIter.GetCurItem() )) aTmpSet.Put( *aIter.GetCurItem() ); break; @@ -526,7 +526,7 @@ bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt, // 1. If not automatic = ignore; else = dispose // 2. Dispose of it! - if( SFX_ITEM_SET == rNewFmt.GetAttrSet().GetItemState( RES_FRM_SIZE, sal_False )) + if( SFX_ITEM_SET == rNewFmt.GetAttrSet().GetItemState( RES_FRM_SIZE, false )) { rFmt.ResetFmtAttr( RES_FRM_SIZE ); bFrmSz = true; @@ -534,7 +534,7 @@ bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt, const SfxItemSet* pAsk = pSet; if( !pAsk ) pAsk = &rNewFmt.GetAttrSet(); - if( SFX_ITEM_SET == pAsk->GetItemState( RES_ANCHOR, sal_False, &pItem ) + if( SFX_ITEM_SET == pAsk->GetItemState( RES_ANCHOR, false, &pItem ) && ((SwFmtAnchor*)pItem)->GetAnchorId() != rFmt.GetAnchor().GetAnchorId() ) { diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 3e67f03352ba..e347ed305860 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -213,7 +213,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) RES_PARATR_OUTLINELEVEL }; for( sal_uInt16 n = 0; n < 4; ++n ) { - if( SFX_ITEM_SET == pSet->GetItemState( aSavIds[ n ], sal_False, &pItem )) + if( SFX_ITEM_SET == pSet->GetItemState( aSavIds[ n ], false, &pItem )) { bool bSave = false; switch( aSavIds[ n ] ) @@ -270,7 +270,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) if ( ( pItem->Which() != RES_PAGEDESC && pItem->Which() != RES_BREAK && pItem->Which() != RES_PARATR_NUMRULE ) || - ( aSet.GetItemState( pItem->Which(), sal_False ) != SFX_ITEM_SET ) ) + ( aSet.GetItemState( pItem->Which(), false ) != SFX_ITEM_SET ) ) { pNode->ResetAttr( pItem->Which() ); } @@ -696,7 +696,7 @@ static bool lcl_InsAttr( SwTableNode* pTblNd; const SwFmtPageDesc* pDesc; if( SFX_ITEM_SET == pOtherSet->GetItemState( RES_PAGEDESC, - sal_False, (const SfxPoolItem**)&pDesc )) + false, (const SfxPoolItem**)&pDesc )) { if( pNode ) { @@ -743,7 +743,7 @@ static bool lcl_InsAttr( if( pNode && 0 == (nFlags & nsSetAttrMode::SETATTR_APICALL) && 0 != (pTblNd = pNode->FindTableNode() ) && SFX_ITEM_SET == pOtherSet->GetItemState( RES_BREAK, - sal_False, (const SfxPoolItem**)&pBreak ) ) + false, (const SfxPoolItem**)&pBreak ) ) { SwTableNode* pCurTblNd = pTblNd; while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) ) @@ -774,7 +774,7 @@ static bool lcl_InsAttr( const SwNumRuleItem* pRule; sal_uInt16 nPoolId=0; if( SFX_ITEM_SET == pOtherSet->GetItemState( RES_PARATR_NUMRULE, - sal_False, (const SfxPoolItem**)&pRule ) && + false, (const SfxPoolItem**)&pRule ) && !pDoc->FindNumRulePtr( pRule->GetValue() ) && USHRT_MAX != (nPoolId = SwStyleNameMapper::GetPoolIdFromUIName ( pRule->GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE )) ) @@ -989,8 +989,8 @@ static bool lcl_InsAttr( } bool bCreateSwpHints = pCharSet && ( - SFX_ITEM_SET == pCharSet->GetItemState( RES_TXTATR_CHARFMT, sal_False ) || - SFX_ITEM_SET == pCharSet->GetItemState( RES_TXTATR_INETFMT, sal_False ) ); + SFX_ITEM_SET == pCharSet->GetItemState( RES_TXTATR_CHARFMT, false ) || + SFX_ITEM_SET == pCharSet->GetItemState( RES_TXTATR_INETFMT, false ) ); for(; aSt < aEnd; ++aSt ) { @@ -1318,7 +1318,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet ) const SfxPoolItem* pTmpItem; if( ( SFX_ITEM_SET == - aNew.GetItemState( RES_PARATR_TABSTOP, sal_False, &pTmpItem ) ) && + aNew.GetItemState( RES_PARATR_TABSTOP, false, &pTmpItem ) ) && ((SvxTabStopItem*)pTmpItem)->Count() ) { // Set the default values of all TabStops to the new value. @@ -1988,7 +1988,7 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr, const SfxPoolItem* pItem; if( &GetAttrPool() != pSrc->GetAttrSet().GetPool() && SFX_ITEM_SET == pSrc->GetAttrSet().GetItemState( - RES_PAGEDESC, sal_False, &pItem ) && + RES_PAGEDESC, false, &pItem ) && ((SwFmtPageDesc*)pItem)->GetPageDesc() ) { SwFmtPageDesc aPageDesc( *(SwFmtPageDesc*)pItem ); @@ -2046,7 +2046,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader, // Copy content nodes across documents! sal_uInt16 nAttr = static_cast<sal_uInt16>( bCpyHeader ? RES_HEADER : RES_FOOTER ); const SfxPoolItem* pItem; - if( SFX_ITEM_SET != rSrcFmt.GetAttrSet().GetItemState( nAttr, sal_False, &pItem )) + if( SFX_ITEM_SET != rSrcFmt.GetAttrSet().GetItemState( nAttr, false, &pItem )) return ; // The header only contains the reference to the format from the other document! @@ -2065,7 +2065,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader, pNewFmt->CopyAttrs( *pOldFmt, sal_True ); if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState( - RES_CNTNT, sal_False, &pItem )) + RES_CNTNT, false, &pItem )) { SwFmtCntnt* pCntnt = (SwFmtCntnt*)pItem; if( pCntnt->GetCntntIdx() ) @@ -2441,7 +2441,7 @@ void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId, // we handle the adjust item separately const SfxPoolItem* pItem; if( SFX_ITEM_SET == pTNd->GetpSwAttrSet()->GetItemState( - RES_PARATR_ADJUST, sal_False, &pItem )) + RES_PARATR_ADJUST, false, &pItem )) aTmp.Put( *pItem ); aExtraData.SetItemSet( aTmp ); } diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index f7e1bf9db1f6..e383554830d7 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -571,9 +571,9 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, const SwFmtAnchor* pAnchor = 0; if( pFlySet ) { - pFlySet->GetItemState( RES_ANCHOR, sal_False, + pFlySet->GetItemState( RES_ANCHOR, false, (const SfxPoolItem**)&pAnchor ); - if( SFX_ITEM_SET == pFlySet->GetItemState( RES_CNTNT, sal_False )) + if( SFX_ITEM_SET == pFlySet->GetItemState( RES_CNTNT, false )) { SfxItemSet aTmpSet( *pFlySet ); aTmpSet.ClearItem( RES_CNTNT ); @@ -690,7 +690,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType, { const SwFmtAnchor* pAnch; if( (pFlySet && SFX_ITEM_SET == pFlySet->GetItemState( - RES_ANCHOR, sal_False, (const SfxPoolItem**)&pAnch )) || + RES_ANCHOR, false, (const SfxPoolItem**)&pAnch )) || ( pFrmFmt && SFX_ITEM_SET == pFrmFmt->GetItemState( RES_ANCHOR, sal_True, (const SfxPoolItem**)&pAnch )) ) { @@ -724,7 +724,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType, if (bCalledFromShell && !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST) && SFX_ITEM_SET == pAnchorNode->GetSwAttrSet(). - GetItemState(RES_PARATR_ADJUST, sal_True, &pItem)) + GetItemState(RES_PARATR_ADJUST, true, &pItem)) { static_cast<SwCntntNode *>(pNewTxtNd)->SetAttr(*pItem); } @@ -864,7 +864,7 @@ SwDrawFrmFmt* SwDoc::InsertDrawObj( SwDrawFrmFmt* pFmt = MakeDrawFrmFmt( OUString(), GetDfltFrmFmt() ); const SwFmtAnchor* pAnchor = 0; - rFlyAttrSet.GetItemState( RES_ANCHOR, sal_False, (const SfxPoolItem**) &pAnchor ); + rFlyAttrSet.GetItemState( RES_ANCHOR, false, (const SfxPoolItem**) &pAnchor ); pFmt->SetFmtAttr( rFlyAttrSet ); // Didn't set the Anchor yet? @@ -1106,15 +1106,15 @@ static void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uIn { const SfxPoolItem *pOldItem = NULL, *pNewItem = NULL; - rOldSet.GetItemState( nWhich, sal_False, &pOldItem); + rOldSet.GetItemState( nWhich, false, &pOldItem); if (pOldItem != NULL) rNewSet.Put( *pOldItem ); else { - pOldItem = rOldSet.GetItem( nWhich, sal_True); + pOldItem = rOldSet.GetItem( nWhich, true); if (pOldItem != NULL) { - pNewItem = rNewSet.GetItem( nWhich, sal_True); + pNewItem = rNewSet.GetItem( nWhich, true); if (pNewItem != NULL) { if (*pOldItem != *pNewItem) @@ -1254,17 +1254,17 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, // default item in the new Set. Because the graphic's size has never changed! const SfxPoolItem *pItem; if( SFX_ITEM_SET == pOldFmt->GetAttrSet(). - GetItemState( RES_BOX, sal_True, &pItem )) + GetItemState( RES_BOX, true, &pItem )) pNewSet->Put( *pItem ); else if( SFX_ITEM_SET == pNewFmt->GetAttrSet(). - GetItemState( RES_BOX, sal_True )) + GetItemState( RES_BOX, true )) pNewSet->Put( *GetDfltAttr( RES_BOX ) ); if( SFX_ITEM_SET == pOldFmt->GetAttrSet(). - GetItemState( RES_SHADOW, sal_True, &pItem )) + GetItemState( RES_SHADOW, true, &pItem )) pNewSet->Put( *pItem ); else if( SFX_ITEM_SET == pNewFmt->GetAttrSet(). - GetItemState( RES_SHADOW, sal_True )) + GetItemState( RES_SHADOW, true )) pNewSet->Put( *GetDfltAttr( RES_SHADOW ) ); } else @@ -1591,10 +1591,10 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, rDoc.GetFrmFmtFromPool( RES_POOLFRM_FRAME ) ); // Set border and shadow to default if the template contains any. - if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState( RES_BOX, sal_True )) + if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState( RES_BOX, true )) pNewSet->Put( *GetDfltAttr( RES_BOX ) ); - if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState(RES_SHADOW,sal_True)) + if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState(RES_SHADOW,true)) pNewSet->Put( *GetDfltAttr( RES_SHADOW ) ); pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd )); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 9689f864cd33..dff009a75a2f 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1339,7 +1339,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam ) // list style is applied const SfxItemSet* pAttrSet = pTNd->GetpSwAttrSet(); if ( pAttrSet && - pAttrSet->GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET ) + pAttrSet->GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_SET ) pTNd->ResetAttr( RES_PARATR_NUMRULE ); else pTNd->SetAttr( aEmptyRule ); diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index dddc0d525873..7b7afd7346ff 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -135,21 +135,21 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) pNewChgSet = (SwAttrSetChg*)pNew; pOldChgSet = (SwAttrSetChg*)pOld; pNewChgSet->GetChgSet()->GetItemState( - RES_LR_SPACE, sal_False, (const SfxPoolItem**)&pNewLRSpace ); + RES_LR_SPACE, false, (const SfxPoolItem**)&pNewLRSpace ); pNewChgSet->GetChgSet()->GetItemState( - RES_UL_SPACE, sal_False, (const SfxPoolItem**)&pNewULSpace ); + RES_UL_SPACE, false, (const SfxPoolItem**)&pNewULSpace ); pNewChgSet->GetChgSet()->GetItemState( RES_CHRATR_FONTSIZE, - sal_False, (const SfxPoolItem**)&(aFontSizeArr[0]) ); + false, (const SfxPoolItem**)&(aFontSizeArr[0]) ); pNewChgSet->GetChgSet()->GetItemState( RES_CHRATR_CJK_FONTSIZE, - sal_False, (const SfxPoolItem**)&(aFontSizeArr[1]) ); + false, (const SfxPoolItem**)&(aFontSizeArr[1]) ); pNewChgSet->GetChgSet()->GetItemState( RES_CHRATR_CTL_FONTSIZE, - sal_False, (const SfxPoolItem**)&(aFontSizeArr[2]) ); + false, (const SfxPoolItem**)&(aFontSizeArr[2]) ); // #i70223#, #i84745# // check, if attribute set is applied to this paragraph style if ( bAssignedToListLevelOfOutlineStyle && pNewChgSet->GetTheChgdSet() == &GetAttrSet() ) { - pNewChgSet->GetChgSet()->GetItemState( RES_PARATR_NUMRULE, sal_False, + pNewChgSet->GetChgSet()->GetItemState( RES_PARATR_NUMRULE, false, (const SfxPoolItem**)&pNewNumRuleItem ); } @@ -351,7 +351,7 @@ bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr ) bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet ) { const bool bIsNumRuleItemAffected = - rSet.GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET; + rSet.GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_SET; if ( bIsNumRuleItemAffected ) { TxtFmtCollFunc::RemoveFromNumRule( *this ); @@ -439,14 +439,14 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const const SwTxtFmtColl* pColl = dynamic_cast<const SwTxtFmtColl*>(DerivedFrom()); while ( pColl ) { - if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, sal_False ) == SFX_ITEM_SET ) + if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, false ) == SFX_ITEM_SET ) { // indent attributes found in the paragraph style hierarchy. bAreListLevelIndentsApplicable = false; break; } - if ( pColl->GetAttrSet().GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET ) + if ( pColl->GetAttrSet().GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_SET ) { // paragraph style with the list style found and until now no // indent attributes are found in the paragraph style hierarchy. diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 94a37dd51484..be12f39e096b 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -598,7 +598,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) sal_uInt16 n; for( n = RES_GRFATR_BEGIN; n < RES_GRFATR_END; ++n ) if( SFX_ITEM_SET == ((SwAttrSetChg*)pOld)->GetChgSet()-> - GetItemState( n, sal_False )) + GetItemState( n, false )) { CLEARCACHE( (SwGrfNode*) GetNode() ) break; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 43fe0311d92c..2b7f4b85ada5 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -732,7 +732,7 @@ void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos, const SwTblBoxNumFormat* pNumFmtItem; const SvNumberformat* pNumFormat = 0; - if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, sal_True, + if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, true, (const SfxPoolItem**)&pNumFmtItem ) && pNFmtr && 0 != (pNumFormat = pNFmtr->GetEntry( pNumFmtItem->GetValue() )) ) pFmt->SetValueFormat( ((SvNumberformat*)pNumFormat)->GetFormatstring(), diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 8100d47c56c6..c15520f9bd13 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -641,7 +641,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox, const SfxPoolItem* pItem; SvNumberFormatter* pN = pDoc->GetNumberFormatter( sal_False ); if( pN && pN->HasMergeFmtTbl() && SFX_ITEM_SET == aBoxAttrSet. - GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem ) ) + GetItemState( RES_BOXATR_FORMAT, false, &pItem ) ) { sal_uLong nOldIdx = ((SwTblBoxNumFormat*)pItem)->GetValue(); sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx ); diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 3ddcbba3f813..104c84841537 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1976,7 +1976,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara) const SfxPoolItem* pItem; SvNumberFormatter* pN = pCpyPara->pDoc->GetNumberFormatter( sal_False ); if( pN && pN->HasMergeFmtTbl() && SFX_ITEM_SET == aBoxAttrSet. - GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem ) ) + GetItemState( RES_BOXATR_FORMAT, false, &pItem ) ) { sal_uLong nOldIdx = ((SwTblBoxNumFormat*)pItem)->GetValue(); sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx ); diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 19e92032a1f7..2f0e37361ce6 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -512,10 +512,10 @@ void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd ) { // Special cases for Break-Attributes const SfxPoolItem* pAttr; - if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, sal_False, &pAttr ) ) + if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, false, &pAttr ) ) aPgBrkSet.Put( *pAttr ); - if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, sal_False, &pAttr ) ) + if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, false, &pAttr ) ) aPgBrkSet.Put( *pAttr ); } @@ -1020,12 +1020,12 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, if (pAttrSet != NULL) { const SfxPoolItem * pItem = NULL; - aNumRuleState = pAttrSet->GetItemState(RES_PARATR_NUMRULE, sal_False, &pItem); + aNumRuleState = pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem); if (SFX_ITEM_SET == aNumRuleState) aNumRuleItem = *((SwNumRuleItem *) pItem); aListIdState = - pAttrSet->GetItemState(RES_PARATR_LIST_ID, sal_False, &pItem); + pAttrSet->GetItemState(RES_PARATR_LIST_ID, false, &pItem); if (SFX_ITEM_SET == aListIdState) { aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() ); @@ -1167,12 +1167,12 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, const SfxPoolItem * pItem = NULL; aNumRuleState = - pAttrSet->GetItemState(RES_PARATR_NUMRULE, sal_False, &pItem); + pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem); if (SFX_ITEM_SET == aNumRuleState) aNumRuleItem = *((SwNumRuleItem *) pItem); aListIdState = - pAttrSet->GetItemState(RES_PARATR_LIST_ID, sal_False, &pItem); + pAttrSet->GetItemState(RES_PARATR_LIST_ID, false, &pItem); if (SFX_ITEM_SET == aListIdState) aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() ); } @@ -1221,9 +1221,9 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, if( pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() ) { aBrkSet.Put( *pDestTxtNd->GetpSwAttrSet() ); - if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_BREAK, sal_False ) ) + if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_BREAK, false ) ) pDestTxtNd->ResetAttr( RES_BREAK ); - if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_PAGEDESC, sal_False ) ) + if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_PAGEDESC, false ) ) pDestTxtNd->ResetAttr( RES_PAGEDESC ); } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index a4d1d66bc66d..7fd30d3a65f3 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -397,7 +397,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, const SwAttrSet & aNdSet = pCntntNd->GetSwAttrSet(); const SfxPoolItem *pItem = NULL; - if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, sal_True, &pItem ) + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem ) && pItem != NULL) { pTableFmt->SetFmtAttr( *pItem ); @@ -439,14 +439,14 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, { const SfxItemSet* pNdSet = pNextNd->GetpSwAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == pNdSet->GetItemState( RES_PAGEDESC, sal_False, + if( SFX_ITEM_SET == pNdSet->GetItemState( RES_PAGEDESC, false, &pItem ) ) { pTableFmt->SetFmtAttr( *pItem ); pNextNd->ResetAttr( RES_PAGEDESC ); pNdSet = pNextNd->GetpSwAttrSet(); } - if( pNdSet && SFX_ITEM_SET == pNdSet->GetItemState( RES_BREAK, sal_False, + if( pNdSet && SFX_ITEM_SET == pNdSet->GetItemState( RES_BREAK, false, &pItem ) ) { pTableFmt->SetFmtAttr( *pItem ); @@ -600,7 +600,7 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx, while ( *pIdx != 0 ) { if ( SFX_ITEM_SET != pTmpNd->GetSwAttrSet().GetItemState( *pIdx ) && - SFX_ITEM_SET == pAttrSet->GetItemState( *pIdx, sal_True, &pItem ) ) + SFX_ITEM_SET == pAttrSet->GetItemState( *pIdx, true, &pItem ) ) static_cast<SwCntntNode *>(pTmpNd)->SetAttr(*pItem); ++pIdx; } @@ -709,7 +709,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts, const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet(); const SfxPoolItem *pItem = NULL; - if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, sal_True, &pItem ) + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem ) && pItem != NULL) { pTableFmt->SetFmtAttr( *pItem ); @@ -1204,7 +1204,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> > const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet(); const SfxPoolItem *pItem = NULL; - if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, sal_True, &pItem ) + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem ) && pItem != NULL) { pTableFmt->SetFmtAttr( *pItem ); @@ -1589,9 +1589,9 @@ sal_Bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh, // What about UNDO? const SfxItemSet& rTblSet = pTblNd->pTable->GetFrmFmt()->GetAttrSet(); const SfxPoolItem *pBreak, *pDesc; - if( SFX_ITEM_SET != rTblSet.GetItemState( RES_PAGEDESC, sal_False, &pDesc )) + if( SFX_ITEM_SET != rTblSet.GetItemState( RES_PAGEDESC, false, &pDesc )) pDesc = 0; - if( SFX_ITEM_SET != rTblSet.GetItemState( RES_BREAK, sal_False, &pBreak )) + if( SFX_ITEM_SET != rTblSet.GetItemState( RES_BREAK, false, &pBreak )) pBreak = 0; if( pBreak || pDesc ) @@ -4148,7 +4148,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos ) RES_PARATR_BEGIN, RES_PARATR_END - 1, 0); pTxtNode->SwCntntNode::GetAttr( rSet ); - if ( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE , sal_False , &pFmtItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE , false , &pFmtItem ) ) { SwUndoDelNum * pUndo; if( GetIDocumentUndoRedo().DoesUndo() ) @@ -4184,9 +4184,9 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode ) const SfxPoolItem* pFmtItem = 0; const SfxItemSet& rSet = pBox->GetFrmFmt()->GetAttrSet(); - if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, sal_False, &pFmtItem ) || - SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMULA, sal_False ) || - SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_VALUE, sal_False )) + if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, false, &pFmtItem ) || + SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMULA, false ) || + SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_VALUE, false )) { if (GetIDocumentUndoRedo().DoesUndo()) { diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 31f64babf970..1d3e71bdd336 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -575,7 +575,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) bLeftValid = sal_True, bRightValid = sal_True; // The Flags in the BoxInfo Item decide whether a BorderLine is valid! - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, sal_False, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, false, (const SfxPoolItem**)&pSetBoxInfo) ) { pHori = pSetBoxInfo->GetHori(); @@ -591,7 +591,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) bRightValid = pSetBoxInfo->IsValid(VALID_RIGHT); } - if( SFX_ITEM_SET == rSet.GetItemState( RES_BOX, sal_False, + if( SFX_ITEM_SET == rSet.GetItemState( RES_BOX, false, (const SfxPoolItem**)&pSetBox) ) { pLeft = pSetBox->GetLeft(); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 75dc74ecd8ac..04623ff27c53 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -146,7 +146,7 @@ bool Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, const SwCntntNode& rN // #i76273# Robust SfxItemSet* pStyleNames = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, sal_False ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { pStyleNames = new SfxItemSet( *aNewSet.GetPool(), RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME ); pStyleNames->Put( aNewSet ); @@ -194,7 +194,7 @@ bool Put_BC( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, // #i76273# Robust SfxItemSet* pStyleNames = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, sal_False ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { pStyleNames = new SfxItemSet( *aNewSet.GetPool(), RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME ); pStyleNames->Put( aNewSet ); @@ -978,7 +978,7 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV if (GetNodes().IsDocNodes() && IsTxtNode() && pOldValue) { if( SFX_ITEM_SET == ((SwAttrSetChg*)pOldValue)->GetChgSet()->GetItemState( - RES_CHRATR_HIDDEN, sal_False ) ) + RES_CHRATR_HIDDEN, false ) ) { ((SwTxtNode*)this)->SetCalcHiddenCharFlags(); } @@ -1388,7 +1388,7 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet ) } const SfxPoolItem* pFnd = 0; - if( SFX_ITEM_SET == rSet.GetItemState( RES_AUTO_STYLE, sal_False, &pFnd ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_AUTO_STYLE, false, &pFnd ) ) { OSL_ENSURE( rSet.Count() == 1, "SetAutoStyle mixed with other attributes?!" ); const SwFmtAutoFmt* pTmp = static_cast<const SwFmtAutoFmt*>(pFnd); @@ -1417,7 +1417,7 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet ) // the string is empty. const SfxPoolItem* pNameItem = 0; if ( 0 != GetCondFmtColl() || - SFX_ITEM_SET != mpAttrSet->GetItemState( RES_FRMATR_STYLE_NAME, sal_False, &pNameItem ) || + SFX_ITEM_SET != mpAttrSet->GetItemState( RES_FRMATR_STYLE_NAME, false, &pNameItem ) || static_cast<const SfxStringItem*>(pNameItem)->GetValue().isEmpty() ) AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFmtColl(), GetFmtColl() ); else @@ -1434,7 +1434,7 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet ) // If Modify is locked, do not send any Modifys if ( IsModifyLocked() || ( !GetDepends() && - SFX_ITEM_SET != rSet.GetItemState( RES_PARATR_NUMRULE, sal_False ) ) ) + SFX_ITEM_SET != rSet.GetItemState( RES_PARATR_NUMRULE, false ) ) ) { // Some special treatment for Attributes bRet = AttrSetHandleHelper::Put( mpAttrSet, *this, rSet ); @@ -1622,7 +1622,7 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich, if( pCondColl && pCondColl->GetRegisteredIn() ) { if( !GetpSwAttrSet() || ( SFX_ITEM_SET != GetpSwAttrSet()->GetItemState( - nWhich, sal_False, &pFnd ) && bInParents )) + nWhich, false, &pFnd ) && bInParents )) ((SwFmt*)GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd ); } // undo change of issue #i51029# diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index fecbeb6872b7..14c1f957799c 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -423,7 +423,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) const SfxPoolItem* pItem; if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_PROTECT, sal_False, &pItem ) ) + RES_PROTECT, false, &pItem ) ) { m_Data.SetProtectFlag( static_cast<SvxProtectItem const*>(pItem) ->IsCntntProtected() ); @@ -433,7 +433,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) // --> edit in readonly sections if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_EDIT_IN_READONLY, sal_False, &pItem ) ) + RES_EDIT_IN_READONLY, false, &pItem ) ) { m_Data.SetEditInReadonlyFlag( static_cast<SwFmtEditInReadonly const*>(pItem)->GetValue()); @@ -442,9 +442,9 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_FTN_AT_TXTEND, sal_False, &pItem ) || + RES_FTN_AT_TXTEND, false, &pItem ) || SFX_ITEM_SET == pNewSet->GetItemState( - RES_END_AT_TXTEND, sal_False, &pItem )) + RES_END_AT_TXTEND, false, &pItem )) { bUpdateFtn = true; } @@ -758,7 +758,7 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SfxItemSet* pOldSet = ((SwAttrSetChg*)pOld)->GetChgSet(); const SfxPoolItem *pItem; if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_PROTECT, sal_False, &pItem )) + RES_PROTECT, false, &pItem )) { ModifyBroadcast( (SfxPoolItem*)pItem, (SfxPoolItem*)pItem ); pNewSet->ClearItem( RES_PROTECT ); @@ -767,7 +767,7 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) // --> edit in readonly sections if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_EDIT_IN_READONLY, sal_False, &pItem ) ) + RES_EDIT_IN_READONLY, false, &pItem ) ) { ModifyBroadcast( (SfxPoolItem*)pItem, (SfxPoolItem*)pItem ); pNewSet->ClearItem( RES_EDIT_IN_READONLY ); @@ -775,14 +775,14 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_FTN_AT_TXTEND, sal_False, &pItem )) + RES_FTN_AT_TXTEND, false, &pItem )) { ModifyBroadcast( (SfxPoolItem*)&pOldSet->Get( RES_FTN_AT_TXTEND ), (SfxPoolItem*)pItem ); pNewSet->ClearItem( RES_FTN_AT_TXTEND ); pOldSet->ClearItem( RES_FTN_AT_TXTEND ); } if( SFX_ITEM_SET == pNewSet->GetItemState( - RES_END_AT_TXTEND, sal_False, &pItem )) + RES_END_AT_TXTEND, false, &pItem )) { ModifyBroadcast( (SfxPoolItem*)&pOldSet->Get( RES_END_AT_TXTEND ), (SfxPoolItem*)pItem ); pNewSet->ClearItem( RES_END_AT_TXTEND ); @@ -1294,7 +1294,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) { const SfxPoolItem* pItem; if( SFX_ITEM_SET == xDocSh->GetMedium()->GetItemSet()-> - GetItemState( SID_PASSWORD, sal_False, &pItem ) ) + GetItemState( SID_PASSWORD, false, &pItem ) ) rSection.SetLinkFilePassword( ((SfxStringItem*)pItem)->GetValue() ); } diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 2989ee4a3058..33083b141fc6 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1414,7 +1414,7 @@ namespace if ( RES_ATTRSET_CHG == nWhich ) { static_cast<const SwAttrSetChg&>(_rItem).GetChgSet()-> - GetItemState( RES_ANCHOR, sal_False, (const SfxPoolItem**)&pAnchorFmt ); + GetItemState( RES_ANCHOR, false, (const SfxPoolItem**)&pAnchorFmt ); } else if ( RES_ANCHOR == nWhich ) { @@ -1436,7 +1436,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { // Do not respond to a Reset Anchor !!!!! if ( SFX_ITEM_SET == - GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, sal_False ) ) + GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, false ) ) { // no connect to layout during disconnection if ( !mbDisconnectInProgress ) @@ -1487,11 +1487,11 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) RES_WRAP_INFLUENCE_ON_OBJPOS == nWhich || ( RES_ATTRSET_CHG == nWhich && ( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_SURROUND, sal_False ) || + RES_SURROUND, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_OPAQUE, sal_False ) || + RES_OPAQUE, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_WRAP_INFLUENCE_ON_OBJPOS, sal_False ) ) ) ) + RES_WRAP_INFLUENCE_ON_OBJPOS, false ) ) ) ) { lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L ); NotifyBackgrdOfAllVirtObjs( 0L ); @@ -1503,15 +1503,15 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) RES_FOLLOW_TEXT_FLOW == nWhich || ( RES_ATTRSET_CHG == nWhich && ( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_LR_SPACE, sal_False ) || + RES_LR_SPACE, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_UL_SPACE, sal_False ) || + RES_UL_SPACE, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_HORI_ORIENT, sal_False ) || + RES_HORI_ORIENT, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_VERT_ORIENT, sal_False ) || + RES_VERT_ORIENT, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_FOLLOW_TEXT_FLOW, sal_False ) ) ) ) + RES_FOLLOW_TEXT_FLOW, false ) ) ) ) { lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L ); NotifyBackgrdOfAllVirtObjs( 0L ); diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 4d6c10e27d77..0f1c790070f9 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -234,7 +234,7 @@ sal_Bool SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlo SwPaM aPam( rNd, nStt, rNd, nEnd ); SfxItemPool& rPool = rEditSh.GetDoc()->GetAttrPool(); - sal_uInt16 nWhich = rPool.GetWhich( nSlotId, sal_False ); + sal_uInt16 nWhich = rPool.GetWhich( nSlotId, false ); if( nWhich ) { rItem.SetWhich( nWhich ); @@ -504,7 +504,7 @@ void SwDontExpandItem::RestoreDontExpandItems( const SwPosition& rPos ) { const SfxPoolItem* pItem; if( !pDontExpItems || SFX_ITEM_SET != pDontExpItems-> - GetItemState( pHt->Which(), sal_False, &pItem ) || + GetItemState( pHt->Which(), false, &pItem ) || *pItem != pHt->GetAttr() ) { // The attribute was not previously set in this form in the diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 1e69917ea81c..39bb271568a8 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -991,7 +991,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText ) // take HeaderLine/TextBody only if centered or right aligned, otherwise only justification SvxAdjustItem* pAdj; if( SFX_ITEM_SET == aSet.GetItemState( RES_PARATR_ADJUST, - sal_False, (const SfxPoolItem**)&pAdj )) + false, (const SfxPoolItem**)&pAdj )) { SvxAdjust eAdj = pAdj->GetAdjust(); if( bHdLineOrText ? (SVX_ADJUST_RIGHT != eAdj && @@ -1035,11 +1035,11 @@ bool SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd ) const return false; const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, sal_False, &pItem ) + if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, false, &pItem ) && SVX_BREAK_NONE != ((SvxFmtBreakItem*)pItem)->GetBreak() ) return true; - if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, sal_False, &pItem ) + if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem ) && ((SwFmtPageDesc*)pItem)->GetPageDesc() && nsUseOnPage::PD_NONE != ((SwFmtPageDesc*)pItem)->GetPageDesc()->GetUseOn() ) return true; @@ -2255,7 +2255,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, short nSz; SvxLRSpaceItem* pLRSpace; if( SFX_ITEM_SET == m_pCurTxtNd->GetSwAttrSet(). - GetItemState( RES_LR_SPACE, sal_True, + GetItemState( RES_LR_SPACE, true, (const SfxPoolItem**)&pLRSpace ) && ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) || 0 != pLRSpace->GetTxtLeft() ) ) @@ -2493,7 +2493,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, SvxLRSpaceItem* pLRSpace; if( bReplaceStyles && SFX_ITEM_SET == m_pCurTxtNd->GetSwAttrSet(). - GetItemState( RES_LR_SPACE, sal_False, + GetItemState( RES_LR_SPACE, false, (const SfxPoolItem**)&pLRSpace ) && ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) || 0 != pLRSpace->GetTxtLeft() ) ) diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index f389800bac90..3ca8e6778b11 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -103,10 +103,10 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, sal_Bool bReset) // Do NOT copy AutoNumRules into the template const SfxPoolItem* pItem; const SwNumRule* pRule = 0; - if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, sal_False ) || - SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC,sal_False ) || + if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, false ) || + SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC,false ) || ( SFX_ITEM_SET == pSet->GetItemState( RES_PARATR_NUMRULE, - sal_False, &pItem ) && 0 != (pRule = GetDoc()->FindNumRulePtr( + false, &pItem ) && 0 != (pRule = GetDoc()->FindNumRulePtr( ((SwNumRuleItem*)pItem)->GetValue() )) && pRule && pRule->IsAutoRule() ) ) @@ -116,7 +116,7 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, sal_Bool bReset) aSet.ClearItem( RES_PAGEDESC ); if( pRule || (SFX_ITEM_SET == pSet->GetItemState( RES_PARATR_NUMRULE, - sal_False, &pItem ) && 0 != (pRule = GetDoc()->FindNumRulePtr( + false, &pItem ) && 0 != (pRule = GetDoc()->FindNumRulePtr( ((SwNumRuleItem*)pItem)->GetValue() )) && pRule && pRule->IsAutoRule() )) aSet.ClearItem( RES_PARATR_NUMRULE ); diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index 5ec043b0caf8..510f55ea0302 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -45,7 +45,7 @@ SwCharFmt* SwEditShell::GetCurCharFmt() const RES_TXTATR_CHARFMT ); const SfxPoolItem* pItem; if( GetCurAttr( aSet ) && SFX_ITEM_SET == - aSet.GetItemState( RES_TXTATR_CHARFMT, sal_False, &pItem ) ) + aSet.GetItemState( RES_TXTATR_CHARFMT, false, &pItem ) ) pFmt = ((SwFmtCharFmt*)pItem)->GetCharFmt(); return pFmt; diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index 37ccd706cdab..ea87afee5ffe 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -232,7 +232,7 @@ void SwEditShell::_SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet ) { StartAllAction(); - if(SFX_ITEM_SET == rSet.GetItemState(RES_CNTNT, sal_False)) + if(SFX_ITEM_SET == rSet.GetItemState(RES_CNTNT, false)) { SfxItemSet aSet(rSet); aSet.ClearItem(RES_CNTNT); diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 1972a454c34c..15852ae8a02b 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -385,7 +385,7 @@ sal_Bool SwEditShell::IsTableBoxTextFormat() const sal_uInt32 nFmt = 0; const SfxPoolItem* pItem; if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetAttrSet().GetItemState( - RES_BOXATR_FORMAT, sal_True, &pItem )) + RES_BOXATR_FORMAT, true, &pItem )) { nFmt = ((SwTblBoxNumFormat*)pItem)->GetValue(); return GetDoc()->GetNumberFormatter()->IsTextFormat( nFmt ) || diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 331e6d19235e..43ef4fb420a7 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -692,14 +692,14 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali const_cast<SfxItemSet&>(rSet).Put( SwFmtAnchor( FLY_AT_PAGE, 1 ) ); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_HORI_ORIENT, sal_False, &pItem ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_HORI_ORIENT, false, &pItem ) && text::HoriOrientation::NONE == ((SwFmtHoriOrient*)pItem)->GetHoriOrient() ) { bHOriChgd = true; aOldH = *((SwFmtHoriOrient*)pItem); ((SfxItemSet&)rSet).Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT ) ); } - if( SFX_ITEM_SET == rSet.GetItemState( RES_VERT_ORIENT, sal_False, &pItem ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) && text::VertOrientation::NONE == ((SwFmtVertOrient*)pItem)->GetVertOrient() ) { bVOriChgd = true; @@ -802,7 +802,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName, if( pFlyAttrSet ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pFlyAttrSet->GetItemState( RES_ANCHOR, sal_False, + if( SFX_ITEM_SET == pFlyAttrSet->GetItemState( RES_ANCHOR, false, &pItem ) ) { SwFmtAnchor* pAnchor = (SwFmtAnchor*)pItem; @@ -1053,7 +1053,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const // now examine all attributes. Remove forbidden attributes, then // get all remaining attributes and enter them const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, false, &pItem ) ) { SwFmtAnchor* pAnchor = (SwFmtAnchor*)pItem; RndStdIds eType = pAnchor->GetAnchorId(); @@ -1102,7 +1102,7 @@ bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet ) StartAllAction(); const Point aPt( pFly->Frm().Pos() ); - if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False )) + if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, false )) sw_ChkAndSetNewAnchor( *this, *pFly, rSet ); SwFlyFrmFmt* pFlyFmt = (SwFlyFrmFmt*)pFly->GetFmt(); @@ -1138,7 +1138,7 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet ) SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj(); SwFrmFmt *pFmt = FindFrmFmt( pObj ); StartAllAction(); - if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False )) + if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, false )) { RndStdIds nNew = ((SwFmtAnchor&)rSet.Get( RES_ANCHOR )).GetAnchorId(); if ( nNew != pFmt->GetAnchor().GetAnchorId() ) diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index b89c6a38bd70..11a276567d9e 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -1043,7 +1043,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, { const SfxPoolItem* pItem; if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetAttrSet() - .GetItemState( RES_BOX, sal_False, &pItem )) + .GetItemState( RES_BOX, false, &pItem )) { SvxBoxItem aBox( *(SvxBoxItem*)pItem ); aBox.SetLine( 0, BOX_LINE_RIGHT ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 72e929256e1c..9367bca875c6 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2406,9 +2406,9 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) if( RES_ATTRSET_CHG == nWhich ) { ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_HEADER, sal_False, (const SfxPoolItem**)&pH ); + RES_HEADER, false, (const SfxPoolItem**)&pH ); ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_FOOTER, sal_False, (const SfxPoolItem**)&pF ); + RES_FOOTER, false, (const SfxPoolItem**)&pF ); } else if( RES_HEADER == nWhich ) pH = (SwFmtHeader*)pNew; diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index deded70d1454..127199108d77 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -60,7 +60,7 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) const SwFmtAnchor *pAnch = 0; if( RES_ATTRSET_CHG == nWhich && SFX_ITEM_SET == - ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, sal_False, + ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false, (const SfxPoolItem**)&pAnch )) ; // The anchor pointer is set at GetItemState! diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index fea3a7bd2a6b..ba7f5c538117 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -89,9 +89,9 @@ void SwFlyInCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( RES_ATTRSET_CHG == nWhich ) { if( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()-> - GetItemState( RES_SURROUND, sal_False ) || + GetItemState( RES_SURROUND, false ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()-> - GetItemState( RES_FRMMACRO, sal_False ) ) + GetItemState( RES_FRMMACRO, false ) ) { SwAttrSetChg aOld( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNew( *(SwAttrSetChg*)pNew ); diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index ea9a5362b005..d61010b9560d 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -465,7 +465,7 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SwFmtAnchor *pAnch = 0; if( RES_ATTRSET_CHG == nWhich && SFX_ITEM_SET == - ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, sal_False, + ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false, (const SfxPoolItem**)&pAnch )) ; // GetItemState sets the anchor pointer! diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index f9f2d23e1685..169a35800f53 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7291,7 +7291,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) pGlobalShell = pSh; bool bNoteURL = pMap && - SFX_ITEM_SET != GetAttrSet().GetItemState( RES_URL, sal_True ); + SFX_ITEM_SET != GetAttrSet().GetItemState( RES_URL, true ); if( bNoteURL ) { OSL_ENSURE( !pNoteURL, "MakeGraphic: pNoteURL already used? " ); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 8e5dfa87d272..6ee3b0ece4d2 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3553,9 +3553,9 @@ void SwRowFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) if( bAttrSetChg ) { const SwAttrSet* pChgSet = ((SwAttrSetChg*)pNew)->GetChgSet(); - pChgSet->GetItemState( RES_FRM_SIZE, sal_False, &pItem); + pChgSet->GetItemState( RES_FRM_SIZE, false, &pItem); if ( !pItem ) - pChgSet->GetItemState( RES_ROW_SPLIT, sal_False, &pItem); + pChgSet->GetItemState( RES_ROW_SPLIT, false, &pItem); } else if ( RES_FRM_SIZE == pNew->Which() || RES_ROW_SPLIT == pNew->Which() ) pItem = pNew; @@ -4940,7 +4940,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) const SfxPoolItem *pItem = 0; if( bAttrSetChg ) - ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_VERT_ORIENT, sal_False, &pItem); + ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_VERT_ORIENT, false, &pItem); else if ( RES_VERT_ORIENT == pNew->Which() ) pItem = pNew; @@ -4963,7 +4963,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } if ( ( bAttrSetChg && - SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, sal_False ) ) || + SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, false ) ) || RES_PROTECT == pNew->Which() ) { SwViewShell *pSh = getRootFrm()->GetCurrShell(); @@ -4972,7 +4972,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } if ( bAttrSetChg && - SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_FRAMEDIR, sal_False, &pItem ) ) + SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_FRAMEDIR, false, &pItem ) ) { SetDerivedVert( sal_False ); CheckDirChange(); @@ -4980,7 +4980,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) // #i29550# if ( bAttrSetChg && - SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_BOX, sal_False, &pItem ) ) + SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_BOX, false, &pItem ) ) { SwFrm* pTmpUpper = GetUpper(); while ( pTmpUpper->GetUpper() && !pTmpUpper->GetUpper()->IsTabFrm() ) diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 987a2877f763..a14351393ea3 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -400,7 +400,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( RES_ATTRSET_CHG == nWhich ) { if (pOld && SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( - RES_FRM_SIZE, sal_False, (const SfxPoolItem**)&pNewSize)) + RES_FRM_SIZE, false, (const SfxPoolItem**)&pNewSize)) { pOldSize = &((SwAttrSetChg*)pOld)->GetChgSet()->GetFrmSize(); } @@ -2043,7 +2043,7 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol, // assign color or save "user color" if( !pTNd->GetpSwAttrSet() || SFX_ITEM_SET != pTNd->GetpSwAttrSet()-> - GetItemState( RES_CHRATR_COLOR, sal_False, &pItem )) + GetItemState( RES_CHRATR_COLOR, false, &pItem )) pItem = 0; const Color* pOldNumFmtColor = rBox.GetSaveNumFmtColor(); @@ -2166,7 +2166,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt ) // assign adjustment if( bChgAlign && pAttrSet && SFX_ITEM_SET == pAttrSet->GetItemState( - RES_PARATR_ADJUST, sal_False, &pItem ) && + RES_PARATR_ADJUST, false, &pItem ) && SVX_ADJUST_RIGHT == ((SvxAdjustItem*)pItem)->GetAdjust() ) { pTNd->SetAttr( SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ) ); @@ -2174,7 +2174,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt ) // assign color or save "user color" if( !pAttrSet || SFX_ITEM_SET != pAttrSet-> - GetItemState( RES_CHRATR_COLOR, sal_False, &pItem )) + GetItemState( RES_CHRATR_COLOR, false, &pItem )) pItem = 0; const Color* pOldNumFmtColor = rBox.GetSaveNumFmtColor(); @@ -2237,12 +2237,12 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { const SfxItemSet& rSet = *((SwAttrSetChg*)pNew)->GetChgSet(); if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_FORMAT, - sal_False, (const SfxPoolItem**)&pNewFmt ) ) + false, (const SfxPoolItem**)&pNewFmt ) ) nOldFmt = ((SwTblBoxNumFormat&)((SwAttrSetChg*)pOld)-> GetChgSet()->Get( RES_BOXATR_FORMAT )).GetValue(); - rSet.GetItemState( RES_BOXATR_FORMULA, sal_False, + rSet.GetItemState( RES_BOXATR_FORMULA, false, (const SfxPoolItem**)&pNewFml ); - rSet.GetItemState( RES_BOXATR_VALUE, sal_False, + rSet.GetItemState( RES_BOXATR_VALUE, false, (const SfxPoolItem**)&pNewVal ); } break; diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index e2b6abec83d7..ce9fd3362b1c 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1098,7 +1098,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) int nClear = 0; MSHORT nCount = rNewSet.Count(); - if( SFX_ITEM_SET == rNewSet.GetItemState( RES_TXTATR_FTN, sal_False, &pItem )) + if( SFX_ITEM_SET == rNewSet.GetItemState( RES_TXTATR_FTN, false, &pItem )) { nPos = *((SwFmtFtn*)pItem)->GetTxtFtn()->GetStart(); if( IsIdxInside( nPos, 1 ) ) @@ -1107,7 +1107,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) --nCount; } - if( SFX_ITEM_SET == rNewSet.GetItemState( RES_TXTATR_FIELD, sal_False, &pItem )) + if( SFX_ITEM_SET == rNewSet.GetItemState( RES_TXTATR_FIELD, false, &pItem )) { nPos = *((SwFmtFld*)pItem)->GetTxtFld()->GetStart(); if( IsIdxInside( nPos, 1 ) ) @@ -1126,9 +1126,9 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) --nCount; } bool bLineSpace = SFX_ITEM_SET == rNewSet.GetItemState( - RES_PARATR_LINESPACING, sal_False ), + RES_PARATR_LINESPACING, false ), bRegister = SFX_ITEM_SET == rNewSet.GetItemState( - RES_PARATR_REGISTER, sal_False ); + RES_PARATR_REGISTER, false ); if ( bLineSpace || bRegister ) { Prepare( bRegister ? PREP_REGISTER : PREP_ADJUST_FRM ); @@ -1158,7 +1158,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) --nCount; } if ( SFX_ITEM_SET == rNewSet.GetItemState( RES_PARATR_SPLIT, - sal_False )) + false )) { if ( GetPrev() ) CheckKeep(); @@ -1168,7 +1168,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) --nCount; } - if( SFX_ITEM_SET == rNewSet.GetItemState( RES_BACKGROUND, sal_False) + if( SFX_ITEM_SET == rNewSet.GetItemState( RES_BACKGROUND, false) && !IsFollow() && GetDrawObjs() ) { SwSortedObjs *pObjs = GetDrawObjs(); @@ -1202,27 +1202,27 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } if ( SFX_ITEM_SET == - rNewSet.GetItemState( RES_TXTATR_CHARFMT, sal_False ) ) + rNewSet.GetItemState( RES_TXTATR_CHARFMT, false ) ) { lcl_SetWrong( *this, 0, COMPLETE_STRING, false ); lcl_SetScriptInval( *this, 0 ); } else if ( SFX_ITEM_SET == - rNewSet.GetItemState( RES_CHRATR_LANGUAGE, sal_False ) || + rNewSet.GetItemState( RES_CHRATR_LANGUAGE, false ) || SFX_ITEM_SET == - rNewSet.GetItemState( RES_CHRATR_CJK_LANGUAGE, sal_False ) || + rNewSet.GetItemState( RES_CHRATR_CJK_LANGUAGE, false ) || SFX_ITEM_SET == - rNewSet.GetItemState( RES_CHRATR_CTL_LANGUAGE, sal_False ) ) + rNewSet.GetItemState( RES_CHRATR_CTL_LANGUAGE, false ) ) lcl_SetWrong( *this, 0, COMPLETE_STRING, false ); else if ( SFX_ITEM_SET == - rNewSet.GetItemState( RES_CHRATR_FONT, sal_False ) || + rNewSet.GetItemState( RES_CHRATR_FONT, false ) || SFX_ITEM_SET == - rNewSet.GetItemState( RES_CHRATR_CJK_FONT, sal_False ) || + rNewSet.GetItemState( RES_CHRATR_CJK_FONT, false ) || SFX_ITEM_SET == - rNewSet.GetItemState( RES_CHRATR_CTL_FONT, sal_False ) ) + rNewSet.GetItemState( RES_CHRATR_CTL_FONT, false ) ) lcl_SetScriptInval( *this, 0 ); else if ( SFX_ITEM_SET == - rNewSet.GetItemState( RES_FRAMEDIR, sal_False ) ) + rNewSet.GetItemState( RES_FRAMEDIR, false ) ) { SetDerivedR2L( sal_False ); CheckDirChange(); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 3a184f3c6535..177972a5ef15 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -580,7 +580,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos ) //muesten. #56977# #55001# #56135# const SfxPoolItem *pItem; if( GetDepends() && SFX_ITEM_SET == pNode->GetSwAttrSet(). - GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) + GetItemState( RES_PAGEDESC, true, &pItem ) ) { pNode->ModifyNotification( (SfxPoolItem*)pItem, (SfxPoolItem*)pItem ); } @@ -2473,7 +2473,7 @@ SwNumRule* SwTxtNode::_GetNumRule(bool bInParent) const if ( pRet && pRet == GetDoc()->GetOutlineNumRule() && ( !HasSwAttrSet() || SFX_ITEM_SET != - GetpSwAttrSet()->GetItemState( RES_PARATR_NUMRULE, sal_False ) ) ) + GetpSwAttrSet()->GetItemState( RES_PARATR_NUMRULE, false ) ) ) { SwTxtFmtColl* pColl = GetTxtColl(); if ( pColl ) @@ -2569,7 +2569,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext, else aClearWhichIds.push_back( RES_PAGEDESC ); - if( SFX_ITEM_SET == pTmpSet->GetItemState( RES_BREAK, sal_False ) ) + if( SFX_ITEM_SET == pTmpSet->GetItemState( RES_BREAK, false ) ) { if ( bNext ) pNewAttrSet->ClearItem( RES_BREAK ); @@ -2577,7 +2577,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext, aClearWhichIds.push_back( RES_BREAK ); bRemoveFromCache = true; } - if( SFX_ITEM_SET == pTmpSet->GetItemState( RES_KEEP, sal_False ) ) + if( SFX_ITEM_SET == pTmpSet->GetItemState( RES_KEEP, false ) ) { if ( bNext ) pNewAttrSet->ClearItem( RES_KEEP ); @@ -2585,7 +2585,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext, aClearWhichIds.push_back( RES_KEEP ); bRemoveFromCache = true; } - if( SFX_ITEM_SET == pTmpSet->GetItemState( RES_PARATR_SPLIT, sal_False ) ) + if( SFX_ITEM_SET == pTmpSet->GetItemState( RES_PARATR_SPLIT, false ) ) { if ( bNext ) pNewAttrSet->ClearItem( RES_PARATR_SPLIT ); @@ -2593,7 +2593,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext, aClearWhichIds.push_back( RES_PARATR_SPLIT ); bRemoveFromCache = true; } - if(SFX_ITEM_SET == pTmpSet->GetItemState(RES_PARATR_NUMRULE, sal_False)) + if(SFX_ITEM_SET == pTmpSet->GetItemState(RES_PARATR_NUMRULE, false)) { SwNumRule * pRule = GetNumRule(); @@ -3542,7 +3542,7 @@ namespace { sOldNumRule = pFormerNumRuleAtTxtNode->GetName(); } - if ( dynamic_cast<const SwAttrSetChg*>(pNewValue)->GetChgSet()->GetItemState( RES_PARATR_NUMRULE, sal_False, &pItem ) == + if ( dynamic_cast<const SwAttrSetChg*>(pNewValue)->GetChgSet()->GetItemState( RES_PARATR_NUMRULE, false, &pItem ) == SFX_ITEM_SET ) { // #i70748# @@ -3821,7 +3821,7 @@ void SwTxtNode::SetAttrListLevel( int nLevel ) bool SwTxtNode::HasAttrListLevel() const { return GetpSwAttrSet() && - GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_LEVEL, sal_False ) == SFX_ITEM_SET; + GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_LEVEL, false ) == SFX_ITEM_SET; } int SwTxtNode::GetAttrListLevel() const @@ -3916,7 +3916,7 @@ void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber bool SwTxtNode::HasAttrListRestartValue() const { return GetpSwAttrSet() && - GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_RESTARTVALUE, sal_False ) == SFX_ITEM_SET; + GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_RESTARTVALUE, false ) == SFX_ITEM_SET; } SwNumberTree::tSwNumTreeNumber SwTxtNode::GetAttrListRestartValue() const { @@ -4115,13 +4115,13 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const bAreListLevelIndentsApplicable = false; } else if ( HasSwAttrSet() && - GetpSwAttrSet()->GetItemState( RES_LR_SPACE, sal_False ) == SFX_ITEM_SET ) + GetpSwAttrSet()->GetItemState( RES_LR_SPACE, false ) == SFX_ITEM_SET ) { // paragraph has hard-set indent attributes bAreListLevelIndentsApplicable = false; } else if ( HasSwAttrSet() && - GetpSwAttrSet()->GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET ) + GetpSwAttrSet()->GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_SET ) { // list style is directly applied to paragraph and paragraph has no // hard-set indent attributes @@ -4136,14 +4136,14 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const const SwTxtFmtColl* pColl = GetTxtColl(); while ( pColl ) { - if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, sal_False ) == SFX_ITEM_SET ) + if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, false ) == SFX_ITEM_SET ) { // indent attributes found in the paragraph style hierarchy. bAreListLevelIndentsApplicable = false; break; } - if ( pColl->GetAttrSet().GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET ) + if ( pColl->GetAttrSet().GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_SET ) { // paragraph style with the list style found and until now no // indent attributes are found in the paragraph style hierarchy. @@ -4433,7 +4433,7 @@ namespace { { const SfxPoolItem* pItem = 0; // handle RES_PARATR_NUMRULE - if ( rItemSet.GetItemState( RES_PARATR_NUMRULE, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_NUMRULE, false, &pItem ) == SFX_ITEM_SET ) { mrTxtNode.RemoveFromList(); @@ -4448,7 +4448,7 @@ namespace { } // handle RES_PARATR_LIST_ID - if ( rItemSet.GetItemState( RES_PARATR_LIST_ID, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_LIST_ID, false, &pItem ) == SFX_ITEM_SET ) { const SfxStringItem* pListIdItem = dynamic_cast<const SfxStringItem*>(pItem); @@ -4465,7 +4465,7 @@ namespace { } // handle RES_PARATR_LIST_LEVEL - if ( rItemSet.GetItemState( RES_PARATR_LIST_LEVEL, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_LIST_LEVEL, false, &pItem ) == SFX_ITEM_SET ) { const SfxInt16Item* pListLevelItem = dynamic_cast<const SfxInt16Item*>(pItem); @@ -4476,7 +4476,7 @@ namespace { } // handle RES_PARATR_LIST_ISRESTART - if ( rItemSet.GetItemState( RES_PARATR_LIST_ISRESTART, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_LIST_ISRESTART, false, &pItem ) == SFX_ITEM_SET ) { const SfxBoolItem* pListIsRestartItem = dynamic_cast<const SfxBoolItem*>(pItem); @@ -4487,7 +4487,7 @@ namespace { } // handle RES_PARATR_LIST_RESTARTVALUE - if ( rItemSet.GetItemState( RES_PARATR_LIST_RESTARTVALUE, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_LIST_RESTARTVALUE, false, &pItem ) == SFX_ITEM_SET ) { const SfxInt16Item* pListRestartValueItem = dynamic_cast<const SfxInt16Item*>(pItem); @@ -4499,7 +4499,7 @@ namespace { } // handle RES_PARATR_LIST_ISCOUNTED - if ( rItemSet.GetItemState( RES_PARATR_LIST_ISCOUNTED, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_LIST_ISCOUNTED, false, &pItem ) == SFX_ITEM_SET ) { const SfxBoolItem* pIsCountedInListItem = dynamic_cast<const SfxBoolItem*>(pItem); @@ -4512,7 +4512,7 @@ namespace { // #i70748# // handle RES_PARATR_OUTLINELEVEL - if ( rItemSet.GetItemState( RES_PARATR_OUTLINELEVEL, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rItemSet.GetItemState( RES_PARATR_OUTLINELEVEL, false, &pItem ) == SFX_ITEM_SET ) { const SfxUInt16Item* pOutlineLevelItem = dynamic_cast<const SfxUInt16Item*>(pItem); @@ -4565,7 +4565,7 @@ namespace { { const SfxPoolItem* pItem = 0; if ( mrTxtNode.GetSwAttrSet().GetItemState( RES_PARATR_NUMRULE, - sal_True, &pItem ) + true, &pItem ) != SFX_ITEM_SET ) { mrTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr(); @@ -4662,7 +4662,7 @@ namespace { else if ( nWhich1 <= RES_PARATR_LIST_ID && RES_PARATR_LIST_ID <= nWhich2 ) { bRemoveFromList = mrTxtNode.GetpSwAttrSet() && - mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET; + mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SFX_ITEM_SET; // #i92898# mbListStyleOrIdReset = true; } @@ -4705,7 +4705,7 @@ namespace { else if ( nWhich1 == RES_PARATR_LIST_ID ) { bRemoveFromList = mrTxtNode.GetpSwAttrSet() && - mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET; + mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SFX_ITEM_SET; // #i92898# mbListStyleOrIdReset = true; } @@ -4764,7 +4764,7 @@ namespace { { bRemoveFromList = bRemoveFromList || ( mrTxtNode.GetpSwAttrSet() && - mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET ); + mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SFX_ITEM_SET ); // #i92898# mbListStyleOrIdReset = true; } diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 8a58a5063ae2..df3da98565ee 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -491,7 +491,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, { const SfxPoolItem* pItem; if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_FONT, - sal_True, &pItem )) + true, &pItem )) { const SvxFontItem *pFont = (const SvxFontItem *)pItem; aSub[SW_LATIN].SetFamily( pFont->GetFamily() ); @@ -501,7 +501,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, aSub[SW_LATIN].Font::SetCharSet( pFont->GetCharSet() ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_FONTSIZE, - sal_True, &pItem )) + true, &pItem )) { const SvxFontHeightItem *pHeight = (const SvxFontHeightItem *)pItem; aSub[SW_LATIN].SvxFont::SetPropr( 100 ); @@ -511,17 +511,17 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, aSub[SW_LATIN].SetSize( aTmpSize ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_POSTURE, - sal_True, &pItem )) + true, &pItem )) aSub[SW_LATIN].Font::SetItalic( ((SvxPostureItem*)pItem)->GetPosture() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_WEIGHT, - sal_True, &pItem )) + true, &pItem )) aSub[SW_LATIN].Font::SetWeight( ((SvxWeightItem*)pItem)->GetWeight() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_LANGUAGE, - sal_True, &pItem )) + true, &pItem )) aSub[SW_LATIN].SetLanguage( ((SvxLanguageItem*)pItem)->GetLanguage() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CJK_FONT, - sal_True, &pItem )) + true, &pItem )) { const SvxFontItem *pFont = (const SvxFontItem *)pItem; aSub[SW_CJK].SetFamily( pFont->GetFamily() ); @@ -531,7 +531,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, aSub[SW_CJK].Font::SetCharSet( pFont->GetCharSet() ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CJK_FONTSIZE, - sal_True, &pItem )) + true, &pItem )) { const SvxFontHeightItem *pHeight = (const SvxFontHeightItem *)pItem; aSub[SW_CJK].SvxFont::SetPropr( 100 ); @@ -541,13 +541,13 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, aSub[SW_CJK].SetSize( aTmpSize ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CJK_POSTURE, - sal_True, &pItem )) + true, &pItem )) aSub[SW_CJK].Font::SetItalic( ((SvxPostureItem*)pItem)->GetPosture() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CJK_WEIGHT, - sal_True, &pItem )) + true, &pItem )) aSub[SW_CJK].Font::SetWeight( ((SvxWeightItem*)pItem)->GetWeight() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CJK_LANGUAGE, - sal_True, &pItem )) + true, &pItem )) { LanguageType eNewLang = ((SvxLanguageItem*)pItem)->GetLanguage(); aSub[SW_CJK].SetLanguage( eNewLang ); @@ -557,7 +557,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CTL_FONT, - sal_True, &pItem )) + true, &pItem )) { const SvxFontItem *pFont = (const SvxFontItem *)pItem; aSub[SW_CTL].SetFamily( pFont->GetFamily() ); @@ -567,7 +567,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, aSub[SW_CTL].Font::SetCharSet( pFont->GetCharSet() ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CTL_FONTSIZE, - sal_True, &pItem )) + true, &pItem )) { const SvxFontHeightItem *pHeight = (const SvxFontHeightItem *)pItem; aSub[SW_CTL].SvxFont::SetPropr( 100 ); @@ -577,53 +577,53 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, aSub[SW_CTL].SetSize( aTmpSize ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CTL_POSTURE, - sal_True, &pItem )) + true, &pItem )) aSub[SW_CTL].Font::SetItalic( ((SvxPostureItem*)pItem)->GetPosture() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CTL_WEIGHT, - sal_True, &pItem )) + true, &pItem )) aSub[SW_CTL].Font::SetWeight( ((SvxWeightItem*)pItem)->GetWeight() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CTL_LANGUAGE, - sal_True, &pItem )) + true, &pItem )) aSub[SW_CTL].SetLanguage( ((SvxLanguageItem*)pItem)->GetLanguage() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_UNDERLINE, - sal_True, &pItem )) + true, &pItem )) { SetUnderline( ((SvxUnderlineItem*)pItem)->GetLineStyle() ); SetUnderColor( ((SvxUnderlineItem*)pItem)->GetColor() ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_OVERLINE, - sal_True, &pItem )) + true, &pItem )) { SetOverline( ((SvxOverlineItem*)pItem)->GetLineStyle() ); SetOverColor( ((SvxOverlineItem*)pItem)->GetColor() ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CROSSEDOUT, - sal_True, &pItem )) + true, &pItem )) SetStrikeout( ((SvxCrossedOutItem*)pItem)->GetStrikeout() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_COLOR, - sal_True, &pItem )) + true, &pItem )) SetColor( ((SvxColorItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_EMPHASIS_MARK, - sal_True, &pItem )) + true, &pItem )) SetEmphasisMark( ((SvxEmphasisMarkItem*)pItem)->GetEmphasisMark() ); SetTransparent( sal_True ); SetAlign( ALIGN_BASELINE ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CONTOUR, - sal_True, &pItem )) + true, &pItem )) SetOutline( ((SvxContourItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_SHADOWED, - sal_True, &pItem )) + true, &pItem )) SetShadow( ((SvxShadowedItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_RELIEF, - sal_True, &pItem )) + true, &pItem )) SetRelief( (FontRelief)((SvxCharReliefItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_SHADOWED, - sal_True, &pItem )) + true, &pItem )) SetPropWidth(((SvxShadowedItem*)pItem)->GetValue() ? 50 : 100 ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_AUTOKERN, - sal_True, &pItem )) + true, &pItem )) { if( ((SvxAutoKernItem*)pItem)->GetValue() ) { @@ -636,11 +636,11 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, SetAutoKern( 0 ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_WORDLINEMODE, - sal_True, &pItem )) + true, &pItem )) SetWordLineMode( ((SvxWordLineModeItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_ESCAPEMENT, - sal_True, &pItem )) + true, &pItem )) { const SvxEscapementItem *pEsc = (const SvxEscapementItem *)pItem; SetEscapement( pEsc->GetEsc() ); @@ -648,28 +648,28 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, SetProportion( pEsc->GetProp() ); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CASEMAP, - sal_True, &pItem )) + true, &pItem )) SetCaseMap( ((SvxCaseMapItem*)pItem)->GetCaseMap() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_KERNING, - sal_True, &pItem )) + true, &pItem )) SetFixKerning( ((SvxKerningItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_NOHYPHEN, - sal_True, &pItem )) + true, &pItem )) SetNoHyph( ((SvxNoHyphenItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_BLINK, - sal_True, &pItem )) + true, &pItem )) SetBlink( ((SvxBlinkItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_ROTATE, - sal_True, &pItem )) + true, &pItem )) SetVertical( ((SvxCharRotateItem*)pItem)->GetValue() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_BACKGROUND, - sal_True, &pItem )) + true, &pItem )) pBackColor = new Color( ((SvxBrushItem*)pItem)->GetColor() ); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_HIGHLIGHT, - sal_True, &pItem )) + true, &pItem )) SetHighlightColor(((SvxBrushItem*)pItem)->GetColor()); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_BOX, - sal_True, &pItem )) + true, &pItem )) { const SvxBoxItem* pBoxItem = static_cast<const SvxBoxItem*>(pItem); SetTopBorder(pBoxItem->GetTop()); @@ -682,7 +682,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, SetLeftBorderDist(pBoxItem->GetDistance(BOX_LINE_LEFT)); } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_SHADOW, - sal_True, &pItem )) + true, &pItem )) { const SvxShadowItem* pShadowItem = static_cast<const SvxShadowItem*>(pItem); SetShadowColor(pShadowItem->GetColor()); @@ -691,7 +691,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, } const SfxPoolItem* pTwoLinesItem = 0; if( SFX_ITEM_SET == - pAttrSet->GetItemState( RES_CHRATR_TWO_LINES, sal_True, &pTwoLinesItem )) + pAttrSet->GetItemState( RES_CHRATR_TWO_LINES, true, &pTwoLinesItem )) if ( ((SvxTwoLinesItem*)pTwoLinesItem)->GetValue() ) SetVertical( 0 ); } @@ -845,17 +845,17 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, SetFixKerning( pAttrSet->GetKerning().GetValue() ); const SfxPoolItem* pItem; if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_BACKGROUND, - sal_True, &pItem )) + true, &pItem )) pBackColor = new Color( ((SvxBrushItem*)pItem)->GetColor() ); else pBackColor = NULL; if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_HIGHLIGHT, - sal_True, &pItem )) + true, &pItem )) SetHighlightColor(((SvxBrushItem*)pItem)->GetColor()); else SetHighlightColor(COL_TRANSPARENT); if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_BOX, - sal_True, &pItem )) + true, &pItem )) { const SvxBoxItem* pBoxItem = static_cast<const SvxBoxItem*>(pItem); SetTopBorder(pBoxItem->GetTop()); @@ -880,7 +880,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, } if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_SHADOW, - sal_True, &pItem )) + true, &pItem )) { const SvxShadowItem* pShadowItem = static_cast<const SvxShadowItem*>(pItem); SetShadowColor(pShadowItem->GetColor()); diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index aec3d2614627..72b2eb08fa08 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -844,7 +844,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, do { const SfxPoolItem* pTmpItem = 0; - if ( SFX_ITEM_SET == rWholeParaAttrSet.GetItemState( pItem->Which(), sal_False, &pTmpItem ) && + if ( SFX_ITEM_SET == rWholeParaAttrSet.GetItemState( pItem->Which(), false, &pTmpItem ) && pTmpItem == pItem ) { // Do not clear item if the attribute is set in a character format: @@ -881,7 +881,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, do { const SfxPoolItem* pTmpItem = 0; - if ( SFX_ITEM_SET == rWholeParaAttrSet.GetItemState( pItem->Which(), sal_False, &pTmpItem ) && + if ( SFX_ITEM_SET == rWholeParaAttrSet.GetItemState( pItem->Which(), false, &pTmpItem ) && pTmpItem == pItem ) { // Do not clear item if the attribute is set in a character format: @@ -1905,7 +1905,7 @@ bool SwTxtNode::SetAttr( // check for auto style: const SfxPoolItem* pItem; - const bool bAutoStyle = SFX_ITEM_SET == aTxtSet.GetItemState( RES_TXTATR_AUTOFMT, sal_False, &pItem ); + const bool bAutoStyle = SFX_ITEM_SET == aTxtSet.GetItemState( RES_TXTATR_AUTOFMT, false, &pItem ); if ( bAutoStyle ) { boost::shared_ptr<SfxItemSet> pAutoStyleSet = static_cast<const SwFmtAutoFmt*>(pItem)->GetStyleHandle(); @@ -2004,7 +2004,7 @@ static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr ) { if( ( nWhich < RES_CHRATR_END || RES_TXTATR_UNKNOWN_CONTAINER == nWhich ) && - ( SFX_ITEM_SET == pCFSet->GetItemState( nWhich, sal_True ) ) ) + ( SFX_ITEM_SET == pCFSet->GetItemState( nWhich, true ) ) ) rSet.Put( pCFSet->Get( nWhich ) ); nWhich = aIter.NextWhich(); } @@ -2029,7 +2029,7 @@ static void lcl_MergeAttr_ExpandChrFmt( SfxItemSet& rSet, const SfxPoolItem& rAt { if( ( nWhich < RES_CHRATR_END || ( RES_TXTATR_AUTOFMT == rAttr.Which() && RES_TXTATR_UNKNOWN_CONTAINER == nWhich ) ) && - ( SFX_ITEM_SET == pCFSet->GetItemState( nWhich, sal_True ) ) ) + ( SFX_ITEM_SET == pCFSet->GetItemState( nWhich, true ) ) ) rSet.Put( pCFSet->Get( nWhich ) ); nWhich = aIter.NextWhich(); } @@ -2541,7 +2541,7 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd ) while( true ) { - if( SFX_ITEM_SET == aNdSet.GetItemState( pItem->Which(), sal_False, &pNdItem ) ) + if( SFX_ITEM_SET == aNdSet.GetItemState( pItem->Which(), false, &pNdItem ) ) { if (*pItem == *pNdItem) // 4 { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 79baeecd3ebe..9a2e518447ec 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -309,7 +309,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, if ( !pSet1 ) { OSL_ENSURE( nWhichId, "lcl_HaveCommonAttributes not used correctly" ); - if ( SFX_ITEM_SET == rSet2.GetItemState( nWhichId, sal_False ) ) + if ( SFX_ITEM_SET == rSet2.GetItemState( nWhichId, false ) ) { pNewSet = rSet2.Clone( sal_True ); pNewSet->ClearItem( nWhichId ); @@ -321,7 +321,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, const SfxPoolItem* pItem = aIter.GetCurItem(); while( true ) { - if ( SFX_ITEM_SET == rSet2.GetItemState( pItem->Which(), sal_False ) ) + if ( SFX_ITEM_SET == rSet2.GetItemState( pItem->Which(), false ) ) { if ( !pNewSet ) pNewSet = rSet2.Clone( sal_True ); @@ -453,7 +453,7 @@ void SwTxtNode::RstTxtAttr( // 1. case: We want to reset only the attributes listed in pSet: if ( pSet ) { - bSkipAttr = SFX_ITEM_SET != pSet->GetItemState( pHt->Which(), sal_False ); + bSkipAttr = SFX_ITEM_SET != pSet->GetItemState( pHt->Which(), false ); if ( bSkipAttr && RES_TXTATR_AUTOFMT == pHt->Which() ) { // if the current attribute is an autostyle, we have to check if the autostyle diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index 5246c6fa3b51..cf5d594a5814 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -207,7 +207,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes // Let the destination page descrition point to the source node position, // from now on this descriptor is responsible for the content nodes! const SfxPoolItem* pItem; - rDest.GetMaster().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); + rDest.GetMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); SfxPoolItem *pNewItem = pItem->Clone(); SwFrmFmt* pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); #if OSL_DEBUG_LEVEL > 1 @@ -221,7 +221,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes // Let the source page description point to zero node position, // it loses the responsible and can be destroyed without removing the content nodes. - rSource.GetMaster().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); + rSource.GetMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -231,7 +231,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes { // Same procedure for unshared header.. const SwFmtHeader& rSourceLeftHead = rSource.GetLeft().GetHeader(); - rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); + rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); #if OSL_DEBUG_LEVEL > 1 @@ -242,7 +242,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes #endif pNewFmt->SetFmtAttr( rSourceLeftHead.GetHeaderFmt()->GetCntnt() ); delete pNewItem; - rSource.GetLeft().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); + rSource.GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -252,7 +252,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes { // Same procedure for unshared header.. const SwFmtHeader& rSourceFirstMasterHead = rSource.GetFirstMaster().GetHeader(); - rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); + rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); #if OSL_DEBUG_LEVEL > 1 @@ -263,7 +263,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes #endif pNewFmt->SetFmtAttr( rSourceFirstMasterHead.GetHeaderFmt()->GetCntnt() ); delete pNewItem; - rSource.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); + rSource.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -276,7 +276,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes if( rDestFoot.IsActive() ) { const SfxPoolItem* pItem; - rDest.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); + rDest.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ); SfxPoolItem *pNewItem = pItem->Clone(); SwFrmFmt *pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( rSourceFoot.GetFooterFmt()->GetCntnt() ); @@ -288,7 +288,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes const SwFmtCntnt& rFooterDestCntnt = rDestFoot.GetFooterFmt()->GetCntnt(); (void)rFooterDestCntnt; #endif - rSource.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); + rSource.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -304,12 +304,12 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes (void)rFooterSourceCntnt2; (void)rFooterDestCntnt2; #endif - rDest.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); + rDest.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( rSourceLeftFoot.GetFooterFmt()->GetCntnt() ); delete pNewItem; - rSource.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); + rSource.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -325,12 +325,12 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes (void)rFooterSourceCntnt2; (void)rFooterDestCntnt2; #endif - rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); + rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( rSourceFirstMasterFoot.GetFooterFmt()->GetCntnt() ); delete pNewItem; - rSource.GetFirstMaster().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); + rSource.GetFirstMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 264d4fa7c576..0e0504e2a10f 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -136,7 +136,7 @@ SwUndoFmtAttr::SwUndoFmtAttr( const SfxPoolItem& rItem, SwFmt& rChgFmt, void SwUndoFmtAttr::Init() { // treat change of anchor specially - if ( SFX_ITEM_SET == m_pOldSet->GetItemState( RES_ANCHOR, sal_False )) + if ( SFX_ITEM_SET == m_pOldSet->GetItemState( RES_ANCHOR, false )) { SaveFlyAnchor( m_bSaveDrawPt ); } @@ -184,7 +184,7 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext) // restored, all other attributes are also restored. // Thus, keep track of its restoration bool bAnchorAttrRestored( false ); - if ( SFX_ITEM_SET == m_pOldSet->GetItemState( RES_ANCHOR, sal_False )) + if ( SFX_ITEM_SET == m_pOldSet->GetItemState( RES_ANCHOR, false )) { bAnchorAttrRestored = RestoreFlyAnchor(rContext); if ( bAnchorAttrRestored ) @@ -839,7 +839,7 @@ void SwUndoAttr::UndoImpl(::sw::UndoRedoContext & rContext) void SwUndoAttr::RepeatImpl(::sw::RepeatContext & rContext) { // RefMarks are not repeat capable - if ( SFX_ITEM_SET != m_AttrSet.GetItemState( RES_TXTATR_REFMARK, sal_False ) ) + if ( SFX_ITEM_SET != m_AttrSet.GetItemState( RES_TXTATR_REFMARK, false ) ) { rContext.GetDoc().InsertItemSet( rContext.GetRepeatPaM(), m_AttrSet, m_nInsertFlags ); @@ -891,7 +891,7 @@ void SwUndoAttr::RedoImpl(::sw::UndoRedoContext & rContext) void SwUndoAttr::RemoveIdx( SwDoc& rDoc ) { - if ( SFX_ITEM_SET != m_AttrSet.GetItemState( RES_TXTATR_FTN, sal_False )) + if ( SFX_ITEM_SET != m_AttrSet.GetItemState( RES_TXTATR_FTN, false )) return ; SwHistoryHint* pHstHnt; @@ -964,7 +964,7 @@ SwUndoDefaultAttr::SwUndoDefaultAttr( const SfxItemSet& rSet ) , m_pTabStop( 0 ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_TABSTOP, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_TABSTOP, false, &pItem ) ) { // store separately, because it may change! m_pTabStop.reset( static_cast<SvxTabStopItem*>(pItem->Clone()) ); diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 51266c1238f0..496a7e6b1eeb 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -190,11 +190,11 @@ SwUndoDelete::SwUndoDelete( { SwRegHistory aRegHist( *pEndTxtNd, pHistory ); if( SFX_ITEM_SET == pEndTxtNd->GetpSwAttrSet()->GetItemState( - RES_BREAK, sal_False ) ) + RES_BREAK, false ) ) pEndTxtNd->ResetAttr( RES_BREAK ); if( pEndTxtNd->HasSwAttrSet() && SFX_ITEM_SET == pEndTxtNd->GetpSwAttrSet()->GetItemState( - RES_PAGEDESC, sal_False ) ) + RES_PAGEDESC, false ) ) pEndTxtNd->ResetAttr( RES_PAGEDESC ); } } diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 22e07f44422f..f44c81073993 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -89,11 +89,11 @@ void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext) if( pNdSet ) { const SfxPoolItem *pItem; - if( SFX_ITEM_SET == pNdSet->GetItemState( RES_PAGEDESC, sal_False, + if( SFX_ITEM_SET == pNdSet->GetItemState( RES_PAGEDESC, false, &pItem ) ) pTableFmt->SetFmtAttr( *pItem ); - if( SFX_ITEM_SET == pNdSet->GetItemState( RES_BREAK, sal_False, + if( SFX_ITEM_SET == pNdSet->GetItemState( RES_BREAK, false, &pItem ) ) pTableFmt->SetFmtAttr( *pItem ); } diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index bf79c6f799ad..d0791a144296 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -905,7 +905,7 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine ) // recalculated. // Save formulas always in plain text. const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pSet->GetItemState( RES_BOXATR_FORMULA, sal_True, &pItem )) + if( SFX_ITEM_SET == pSet->GetItemState( RES_BOXATR_FORMULA, true, &pItem )) { pSet->ClearItem( RES_BOXATR_VALUE ); if( pSwTable && bSaveFormula ) @@ -2164,19 +2164,19 @@ SwUndoTblNumFmt::SwUndoTblNumFmt( const SwTableBox& rBox, { const SfxPoolItem* pItem; if( SFX_ITEM_SET == pNewSet->GetItemState( RES_BOXATR_FORMAT, - sal_False, &pItem )) + false, &pItem )) { bNewFmt = sal_True; nNewFmtIdx = ((SwTblBoxNumFormat*)pItem)->GetValue(); } if( SFX_ITEM_SET == pNewSet->GetItemState( RES_BOXATR_FORMULA, - sal_False, &pItem )) + false, &pItem )) { bNewFml = sal_True; aNewFml = ((SwTblBoxFormula*)pItem)->GetFormula(); } if( SFX_ITEM_SET == pNewSet->GetItemState( RES_BOXATR_VALUE, - sal_False, &pItem )) + false, &pItem )) { bNewValue = sal_True; fNewNum = ((SwTblBoxValue*)pItem)->GetValue(); diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 51c947d1fb4f..4b48e46916cc 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1755,7 +1755,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( else if(pFmt) { const SwAttrSet& rSet = pFmt->GetAttrSet(); - SfxItemState eItemState = rSet.GetItemState(pEntry->nWID, sal_False); + SfxItemState eItemState = rSet.GetItemState(pEntry->nWID, false); if(SFX_ITEM_SET == eItemState) pRet[nProperty] = beans::PropertyState_DIRECT_VALUE; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 9d204bf8020b..b9538e4aafb2 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1874,13 +1874,13 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode(); SfxItemSet aSet(pNoTxt->GetSwAttrSet()); aSet.GetItemState(pEntry->nWID); - if(SFX_ITEM_SET == aSet.GetItemState( pEntry->nWID, sal_False )) + if(SFX_ITEM_SET == aSet.GetItemState( pEntry->nWID, false )) pStates[i] = beans::PropertyState_DIRECT_VALUE; } } else { - if(SFX_ITEM_SET == rFmtSet.GetItemState( pEntry->nWID, sal_False )) + if(SFX_ITEM_SET == rFmtSet.GetItemState( pEntry->nWID, false )) pStates[i] = beans::PropertyState_DIRECT_VALUE; else pStates[i] = beans::PropertyState_DEFAULT_VALUE; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 15a3df98c45a..07a6089f596d 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -302,7 +302,7 @@ SwUnoCursorHelper::SetPageDesc( ::std::auto_ptr<SwFmtPageDesc> pNewDesc; SAL_WNODEPRECATED_DECLARATIONS_POP const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) + if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, true, &pItem ) ) { pNewDesc.reset(new SwFmtPageDesc( *static_cast<const SwFmtPageDesc*>(pItem))); @@ -426,7 +426,7 @@ lcl_setDropcapCharStyle(SwPaM & rPam, SfxItemSet & rItemSet, SAL_WNODEPRECATED_DECLARATIONS_POP SfxPoolItem const* pItem(0); if (SFX_ITEM_SET == - rItemSet.GetItemState(RES_PARATR_DROP, sal_True, &pItem)) + rItemSet.GetItemState(RES_PARATR_DROP, true, &pItem)) { pDrop.reset(new SwFmtDrop(*static_cast<const SwFmtDrop*>(pItem))); } @@ -453,7 +453,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue) SAL_WNODEPRECATED_DECLARATIONS_POP const SfxPoolItem* pItem; if (SFX_ITEM_SET == - rItemSet.GetItemState(RES_TXTATR_CJK_RUBY, sal_True, &pItem)) + rItemSet.GetItemState(RES_TXTATR_CJK_RUBY, true, &pItem)) { pRuby.reset(new SwFmtRuby(*static_cast<const SwFmtRuby*>(pItem))); } diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 931a214d7ea2..c9296528b307 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1116,7 +1116,7 @@ lcl_IsStartNodeInFormat(const bool bHeader, SwStartNode *const pSttNode, const SfxPoolItem* pItem; if (SFX_ITEM_SET == rSet.GetItemState( static_cast<sal_uInt16>(bHeader ? RES_HEADER : RES_FOOTER), - sal_True, &pItem)) + true, &pItem)) { SfxPoolItem *const pItemNonConst(const_cast<SfxPoolItem *>(pItem)); SwFrmFmt *const pHeadFootFmt = (bHeader) ? diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index fc53a05621dd..db571cbff0d2 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -900,7 +900,7 @@ throw (beans::UnknownPropertyException) break; lcl_SwXParagraph_getPropertyStateDEFAULT: default: - if((*ppSet) && SFX_ITEM_SET == (*ppSet)->GetItemState(rEntry.nWID, sal_False)) + if((*ppSet) && SFX_ITEM_SET == (*ppSet)->GetItemState(rEntry.nWID, false)) eRet = beans::PropertyState_DIRECT_VALUE; break; } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index cdec84e6798f..ba97b9c367f4 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1817,7 +1817,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, SwFmtPageDesc* pNewDesc = 0; const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) + if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_PAGEDESC, true, &pItem ) ) { pNewDesc = new SwFmtPageDesc(*((SwFmtPageDesc*)pItem)); } @@ -1972,7 +1972,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, SfxItemSet& rStyleSet = rBase.GetItemSet(); SwFmtRuby* pRuby = 0; const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_TXTATR_CJK_RUBY, sal_True, &pItem ) ) + if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_TXTATR_CJK_RUBY, true, &pItem ) ) pRuby = new SwFmtRuby(*((SwFmtRuby*)pItem)); if(!pRuby) pRuby = new SwFmtRuby(OUString()); @@ -2002,7 +2002,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, SwFmtDrop* pDrop = 0; const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_PARATR_DROP, sal_True, &pItem ) ) + if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_PARATR_DROP, true, &pItem ) ) pDrop = new SwFmtDrop(*((SwFmtDrop*)pItem)); if(!pDrop) pDrop = new SwFmtDrop(); @@ -2234,7 +2234,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, { // Sonderbehandlung RES_PAGEDESC const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) + if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState( RES_PAGEDESC, true, &pItem ) ) { const SwPageDesc* pDesc = ((const SwFmtPageDesc*)pItem)->GetPageDesc(); if(pDesc) @@ -2596,10 +2596,10 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates( const SvxSetItem* pSetItem; if(SFX_ITEM_SET == aSet.GetItemState( bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, - sal_False, (const SfxPoolItem**)&pSetItem)) + false, (const SfxPoolItem**)&pSetItem)) { const SfxItemSet& rSet = pSetItem->GetItemSet(); - SfxItemState eState = rSet.GetItemState(nResId, sal_False); + SfxItemState eState = rSet.GetItemState(nResId, false); if(SFX_ITEM_SET == eState) pStates[i] = beans::PropertyState_DIRECT_VALUE; else @@ -2957,7 +2957,7 @@ static void lcl_putItemToSet(const SvxSetItem* pSetItem, sal_uInt16 nRes, sal_uI SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); const SfxPoolItem* pItem = 0; SfxPoolItem* pNewItem = 0; - rSetSet.GetItemState(nRes, sal_True, &pItem); + rSetSet.GetItemState(nRes, true, &pItem); if(!pItem && nRes != rSetSet.GetPool()->GetSlotId(nRes)) pItem = &rSetSet.GetPool()->GetDefaultItem(nRes); if(pItem) @@ -3101,7 +3101,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( const SvxSetItem* pSetItem; if(SFX_ITEM_SET == aBaseImpl.GetItemSet().GetItemState( bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, - sal_False, (const SfxPoolItem**)&pSetItem)) + false, (const SfxPoolItem**)&pSetItem)) { lcl_putItemToSet(pSetItem, nRes, nItemType, pValues[nProp], pEntry->nMemberId, aBaseImpl); @@ -3110,7 +3110,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( // Need to add this to the other as well if (SFX_ITEM_SET == aBaseImpl.GetItemSet().GetItemState( bFooter ? SID_ATTR_PAGE_HEADERSET : SID_ATTR_PAGE_FOOTERSET, - sal_False, (const SfxPoolItem**)&pSetItem)) + false, (const SfxPoolItem**)&pSetItem)) lcl_putItemToSet(pSetItem, nRes, nItemType, pValues[nProp], pEntry->nMemberId, aBaseImpl); } } @@ -3219,7 +3219,7 @@ lcl_makeHeaderFooter( const SfxItemSet& rSet = pFrmFmt->GetAttrSet(); const SfxPoolItem* pItem; - if (SFX_ITEM_SET == rSet.GetItemState(nRes, sal_True, &pItem)) + if (SFX_ITEM_SET == rSet.GetItemState(nRes, true, &pItem)) { SwFrmFmt *const pHeadFootFmt = (bHeader) ? static_cast<SwFmtHeader*>(const_cast<SfxPoolItem*>(pItem))-> @@ -3358,11 +3358,11 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( const SvxSetItem* pSetItem; if(SFX_ITEM_SET == rSet.GetItemState( bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, - sal_False, (const SfxPoolItem**)&pSetItem)) + false, (const SfxPoolItem**)&pSetItem)) { const SfxItemSet& rTmpSet = pSetItem->GetItemSet(); const SfxPoolItem* pItem = 0; - rTmpSet.GetItemState(nRes, sal_True, &pItem); + rTmpSet.GetItemState(nRes, true, &pItem); if(!pItem && nRes != rTmpSet.GetPool()->GetSlotId(nRes)) pItem = &rTmpSet.GetPool()->GetDefaultItem(nRes); if(pItem) diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 99132e44b100..8d83dbbe0d11 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -271,7 +271,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp const SfxItemSet& rSet = pFmt->GetAttrSet(); const SfxPoolItem* pItem; OUString sPDesc; - if(SFX_ITEM_SET == rSet.GetItemState(RES_PAGEDESC, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(RES_PAGEDESC, false, &pItem)) { const SwPageDesc* pDsc = ((const SwFmtPageDesc*)pItem)->GetPageDesc(); if(pDsc) @@ -759,7 +759,7 @@ void sw_setValue( SwXCell &rCell, double nVal ) // - there is no current number format // - the current number format is not a number format according to the number formatter, but rather a text format // - the current number format is not even a valid number formatter number format, but rather Writer's own 'special' text number format - if(SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem) + if(SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem) || pDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue()) || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT) { @@ -946,7 +946,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException SfxItemSet aSet(pMyDoc->GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_FORMULA); const SfxPoolItem* pItem; SwFrmFmt* pBoxFmt = pBox->GetFrmFmt(); - if(SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem) + if(SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem) || pMyDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue())) { aSet.Put(SwTblBoxNumFormat(0)); @@ -4215,7 +4215,7 @@ void SwXCellRange::GetDataSequence( // look for SwTblBoxNumFormat value in parents as well const SfxPoolItem* pItem; SwFrmFmt *pBoxFmt = pXCell->GetTblBox()->GetFrmFmt(); - SfxItemState eState = pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem); + SfxItemState eState = pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem); if (eState == SFX_ITEM_SET) { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index a415b3a17894..48ee4f422732 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -328,7 +328,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, SwTwips nPageWidth) { const SfxPoolItem* pItem = 0; - if( SFX_ITEM_SET != rFlySet.GetItemState( RES_FRM_SIZE, sal_True, &pItem ) || + 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)); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 1919377447fd..94e2783b11e7 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1085,7 +1085,7 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet, { const SfxPoolItem *pRefItem, *pItem; bool bItemSet = ( SFX_ITEM_SET == - rItemSet.GetItemState( nWhich, sal_False, &pItem) ); + rItemSet.GetItemState( nWhich, false, &pItem) ); bool bRefItemSet; if( pRefScriptItemSet ) @@ -1108,18 +1108,18 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet, case RES_CHRATR_CTL_POSTURE: case RES_CHRATR_CTL_WEIGHT: bRefItemSet = ( SFX_ITEM_SET == - pRefScriptItemSet->GetItemState( nWhich, sal_True, &pRefItem) ); + pRefScriptItemSet->GetItemState( nWhich, true, &pRefItem) ); break; default: bRefItemSet = ( SFX_ITEM_SET == - aRefItemSet.GetItemState( nWhich, sal_False, &pRefItem) ); + aRefItemSet.GetItemState( nWhich, false, &pRefItem) ); break; } } else { bRefItemSet = ( SFX_ITEM_SET == - aRefItemSet.GetItemState( nWhich, sal_False, &pRefItem) ); + aRefItemSet.GetItemState( nWhich, false, &pRefItem) ); } if( bItemSet ) @@ -1245,19 +1245,19 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, { const SfxPoolItem *pItem = 0, *pItemCJK = 0, *pItemCTL = 0, *pTmp; sal_uInt16 nItemCount = 0; - if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], false, &pTmp ) ) { pItem = pTmp; nItemCount++; } - if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i+1], sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i+1], false, &pTmp ) ) { pItemCJK = pTmp; nItemCount++; } - if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i+2], sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i+2], false, &pTmp ) ) { pItemCTL = pTmp; @@ -1293,7 +1293,7 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, const SfxPoolItem *pItem; if( bCheckDropCap && - SFX_ITEM_SET == rItemSet.GetItemState( RES_PARATR_DROP, sal_True, + SFX_ITEM_SET == rItemSet.GetItemState( RES_PARATR_DROP, true, &pItem ) ) { const SwFmtDrop *pDrop = (const SwFmtDrop *)pItem; @@ -1702,7 +1702,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, // Drop-Caps ausgeben const SfxPoolItem *pItem; - if( SFX_ITEM_SET==aItemSet.GetItemState( RES_PARATR_DROP, sal_False, &pItem )) + if( SFX_ITEM_SET==aItemSet.GetItemState( RES_PARATR_DROP, false, &pItem )) { OUString sOut( aSelector ); sOut += ":" + OStringToOUString( sCSS1_first_letter, RTL_TEXTENCODING_ASCII_US ); @@ -1883,13 +1883,13 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet ) // Export der Absatz-Vorlagen beruecksichtigt. const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { OutCSS1_SvxBrush( rWrt, *pItem, CSS1_BACKGROUND_PAGE ); } - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, false, &pItem )) { OutCSS1_SvxBox( rWrt, *pItem ); @@ -2169,9 +2169,9 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt, { const SvxLRSpaceItem *pLRItem = 0; const SvxULSpaceItem *pULItem = 0; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, sal_True ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, true ) ) pLRItem = &aLRItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_UL_SPACE, sal_True ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_UL_SPACE, true ) ) pULItem = &aULItem; if( pLRItem || pULItem ) OutCSS1_SvxULSpace_SvxLRSpace( *this, pULItem, pLRItem ); @@ -2183,7 +2183,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt, const SfxPoolItem* pItem; if( nFrmOpts & HTML_FRMOPT_S_NOBORDER ) OutCSS1_SvxBox( *this, rFrmFmt.GetBox() ); - else if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOX, sal_True, &pItem ) ) + else if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOX, true, &pItem ) ) OutCSS1_SvxBox( *this, *pItem ); } @@ -2206,13 +2206,13 @@ void SwHTMLWriter::OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt ) const SfxPoolItem *pItem; const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); - if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_TABLE ); if( IsHTMLMode( HTMLMODE_PRINT_EXT ) ) OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, sal_False ); - if( SFX_ITEM_SET==rItemSet.GetItemState( RES_LAYOUT_SPLIT, sal_False, &pItem ) ) + if( SFX_ITEM_SET==rItemSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem ) ) OutCSS1_SwFmtLayoutSplit( *this, *pItem ); if( !bFirstCSS1Property ) @@ -2238,7 +2238,7 @@ void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwF const SfxPoolItem *pItem; const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); - if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_SECTION ); if (pCol) diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 367d63ad32ca..2d87eba89d11 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -367,7 +367,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, { const SfxPoolItem *pItem; if( SFX_ITEM_SET==pFmt->GetAttrSet().GetItemState( - RES_PARATR_DROP, sal_True, &pItem ) ) + RES_PARATR_DROP, true, &pItem ) ) { sal_Bool bPut = sal_True; if( pTemplate ) @@ -376,7 +376,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, const SfxPoolItem *pRefItem; sal_Bool bRefItemSet = SFX_ITEM_SET==pReferenceFmt->GetAttrSet().GetItemState( - RES_PARATR_DROP, sal_True, &pRefItem ); + RES_PARATR_DROP, true, &pRefItem ); bPut = !bRefItemSet || *pItem!=*pRefItem; } if( bPut ) @@ -657,7 +657,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, if( rInfo.pItemSet && SFX_ITEM_SET == rInfo.pItemSet->GetItemState( RES_PARATR_ADJUST, - sal_False, &pItem ) ) + false, &pItem ) ) { pAdjItem = pItem; } @@ -865,7 +865,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // export language if it differs from the default language only. const SfxPoolItem *pTmpItem; if( SFX_ITEM_SET == rInfo.pItemSet->GetItemState( aWhichIds[i], - sal_True, &pTmpItem ) && + true, &pTmpItem ) && ((const SvxLanguageItem *)pTmpItem)->GetLanguage() == eLang ) rInfo.pItemSet->ClearItem( aWhichIds[i] ); } @@ -2108,7 +2108,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) return rHTMLWrt; } const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pItemSet->GetItemState( RES_LR_SPACE, sal_False, &pItem )) + if( SFX_ITEM_SET == pItemSet->GetItemState( RES_LR_SPACE, false, &pItem )) { sal_Int32 nLeft = ((SvxLRSpaceItem*)pItem)->GetLeft(); sal_Int32 nRight = ((SvxLRSpaceItem*)pItem)->GetRight(); @@ -2152,7 +2152,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) } } rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); - if( SFX_ITEM_SET == pItemSet->GetItemState( RES_BOX, sal_False, &pItem )) + if( SFX_ITEM_SET == pItemSet->GetItemState( RES_BOX, false, &pItem )) { const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem; const editeng::SvxBorderLine* pBorderLine = pBoxItem->GetBottom(); @@ -2197,7 +2197,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) const SfxPoolItem* pItem; const SfxItemSet *pItemSet = pNd->GetpSwAttrSet(); if( pItemSet && pItemSet->Count() && - SFX_ITEM_SET == pItemSet->GetItemState( RES_CHRATR_FONTSIZE, sal_False, &pItem ) && + SFX_ITEM_SET == pItemSet->GetItemState( RES_CHRATR_FONTSIZE, false, &pItem ) && 40 == ((const SvxFontHeightItem *)pItem)->GetHeight() ) { // ... ausserdem ist die 2pt Schrift eingestellt ... @@ -2239,11 +2239,11 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( pItemSet ) { if( SFX_ITEM_SET == - pItemSet->GetItemState( RES_PAGEDESC, sal_True, &pItem ) && + pItemSet->GetItemState( RES_PAGEDESC, true, &pItem ) && ((SwFmtPageDesc *)pItem)->GetPageDesc() ) bPageBreakBefore = sal_True; else if( SFX_ITEM_SET == - pItemSet->GetItemState( RES_BREAK, sal_True, &pItem ) ) + pItemSet->GetItemState( RES_BREAK, true, &pItem ) ) { switch( ((SvxFmtBreakItem *)pItem)->GetBreak() ) { diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 59f3f9914c5d..74cc7bcd2aab 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -198,7 +198,7 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet ) RES_CHRATR_CTL_FONTSIZE }; for( sal_uInt16 i=0; i<3; i++ ) { - if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], false, &pItem ) && ((const SvxFontHeightItem *)pItem)->GetProp() != 100) { @@ -209,7 +209,7 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet ) pCharFmt->SetFmtAttr( rItemSet ); - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { // Ein Brush-Item mit RES_BACKGROUND muss noch in eines mit // RES_CHRATR_BACKGROUND gewandelt werden @@ -219,7 +219,7 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet ) pCharFmt->SetFmtAttr( aBrushItem ); } - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, false, &pItem ) ) { SvxBoxItem aBoxItem( *(const SvxBoxItem *)pItem ); aBoxItem.SetWhich( RES_CHRATR_BOX ); @@ -238,7 +238,7 @@ void SwCSS1Parser::SetLinkCharFmts() { SfxItemSet& rItemSet = pStyleEntry->GetItemSet(); sal_Bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR, - sal_False)); + false)); pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL ); SetCharFmtAttrs( pUnvisited, rItemSet ); bBodyLinkSet |= bColorSet; @@ -255,7 +255,7 @@ void SwCSS1Parser::SetLinkCharFmts() { SfxItemSet& rItemSet = pStyleEntry->GetItemSet(); sal_Bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR, - sal_False)); + false)); if( !pUnvisited ) pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL ); SetCharFmtAttrs( pUnvisited, rItemSet ); @@ -269,7 +269,7 @@ void SwCSS1Parser::SetLinkCharFmts() { SfxItemSet& rItemSet = pStyleEntry->GetItemSet(); sal_Bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR, - sal_False)); + false)); if( !pVisited ) pVisited = GetCharFmtFromPool( RES_POOLCHR_INET_VISIT ); SetCharFmtAttrs( pVisited, rItemSet ); @@ -291,8 +291,8 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet, rPropInfo.bTextIndent) && (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin || !rPropInfo.bTextIndent) && - SFX_ITEM_SET == rCollItemSet.GetItemState(RES_LR_SPACE,sal_True,&pCollItem) && - SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,sal_False,&pItem) ) + SFX_ITEM_SET == rCollItemSet.GetItemState(RES_LR_SPACE,true,&pCollItem) && + SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) ) { const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -310,9 +310,9 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet, // oberer und unterer Rand if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) && (!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) && - SFX_ITEM_SET == rCollItemSet.GetItemState(RES_UL_SPACE,sal_True, + SFX_ITEM_SET == rCollItemSet.GetItemState(RES_UL_SPACE,true, &pCollItem) && - SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,sal_False,&pItem) ) + SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) ) { const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; @@ -329,7 +329,7 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet, RES_CHRATR_CTL_FONTSIZE }; for( sal_uInt16 i=0; i<3; i++ ) { - if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], false, &pItem ) && ((const SvxFontHeightItem *)pItem)->GetProp() != 100) { @@ -403,7 +403,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, if( pItemSet2 ) { const SfxPoolItem *pItem = 0; - if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_BACKGROUND, false, &pItem ) ) { // ein Hintergrund wird gesetzt @@ -412,7 +412,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, bSetBrush = sal_True; } - if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_BOX, sal_False, &pItem ) ) + if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_BOX, false, &pItem ) ) { // eine Umrandung wird gesetzt aBoxItem = *((const SvxBoxItem *)pItem); @@ -420,7 +420,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, bSetBox = sal_True; } - if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_FRAMEDIR, sal_False, &pItem ) ) + if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_FRAMEDIR, false, &pItem ) ) { // eine Umrandung wird gesetzt aFrmDirItem = *static_cast< const SvxFrameDirectionItem *>( pItem ); @@ -469,11 +469,11 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc, // linker, rechter Rand und Erstzeilen-Einzug if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin) && - SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,sal_False,&pItem) ) + SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) ) { if( (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin) && SFX_ITEM_SET == rPageItemSet.GetItemState(RES_LR_SPACE, - sal_True,&pPageItem) ) + true,&pPageItem) ) { const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -494,11 +494,11 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc, // oberer und unterer Rand if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) && - SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,sal_False,&pItem) ) + SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) ) { if( (!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) && SFX_ITEM_SET == rPageItemSet.GetItemState(RES_UL_SPACE, - sal_True,&pPageItem) ) + true,&pPageItem) ) { const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; @@ -550,7 +550,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc, } // Geht das wirklich? - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { // eine Umrandung wird gesetzt rMaster.SetFmtAttr( *pItem ); @@ -692,7 +692,7 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, const SfxPoolItem *pItem; if( aClearItems[j] || (pParentItemSet && - SFX_ITEM_SET == rItemSet.GetItemState( nWhich, sal_False, &pItem ) && + 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 ) ) ) ) { @@ -821,7 +821,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, // Den Hintergrund muessen wir vor dem Setzen abfragen, // denn in SetPageDescAttrs wird er geloescht. const SfxPoolItem *pItem; - if( SFX_ITEM_SET==rItemSet.GetItemState(RES_BACKGROUND,sal_False,&pItem) ) + if( SFX_ITEM_SET==rItemSet.GetItemState(RES_BACKGROUND,false,&pItem) ) { const SvxBrushItem *pBrushItem = (const SvxBrushItem *)pItem; @@ -842,7 +842,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, // alle noch uebrigen Optionen koennen an der Standard-Vorlage // gesetzt werden und gelten dann automatisch als defaults - if( SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,sal_False) ) + if( SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,false) ) bBodyTextSet = sal_True; SetTxtCollAttrs( GetTxtCollFromPool( RES_POOLCOLL_STANDARD ), @@ -1016,7 +1016,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, const SfxPoolItem *pItem; const SvxBoxItem *pBoxItem = 0; if( SFX_ITEM_SET == - pColl->GetAttrSet().GetItemState(RES_BOX,sal_True,&pItem) ) + pColl->GetAttrSet().GetItemState(RES_BOX,true,&pItem) ) pBoxItem = (const SvxBoxItem *)pItem; rPropInfo.SetBoxItem( rItemSet, MIN_BORDER_DIST, pBoxItem ); if( CSS1_SCRIPT_ALL == nScript && !pParentColl ) @@ -1493,7 +1493,7 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop, // fuer die Hoehe (was passiert mit absoluten Hoehen???) sal_uInt8 nLines = rDrop.GetLines(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_CHRATR_FONTSIZE, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_CHRATR_FONTSIZE, false, &pItem ) ) { sal_uInt16 nProp = ((const SvxFontHeightItem *)pItem)->GetProp(); nLines = (sal_uInt8)((nProp + 50) / 100); @@ -1520,7 +1520,7 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop, rDrop.GetLines() = nLines; // ein rechter Rand wird der Abstand zum Text! - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, false, &pItem ) ) { rDrop.GetDistance() = static_cast< sal_uInt16 >( ((const SvxLRSpaceItem *)pItem)->GetRight() ); @@ -2118,7 +2118,7 @@ void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet, { const SfxPoolItem *pItem; if( (nFlags & HTML_FF_BOX) != 0 && - SFX_ITEM_SET==rItemSet.GetItemState( RES_BOX, sal_True, &pItem ) ) + SFX_ITEM_SET==rItemSet.GetItemState( RES_BOX, true, &pItem ) ) { if( (nFlags & HTML_FF_PADDING) == 0 ) { @@ -2135,14 +2135,14 @@ void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet, } if( (nFlags & HTML_FF_BACKGROUND) != 0 && - SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, sal_True, &pItem ) ) + SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, true, &pItem ) ) { rFrmItemSet.Put( *pItem ); rItemSet.ClearItem( RES_BACKGROUND ); } if( (nFlags & HTML_FF_DIRECTION) != 0 && - SFX_ITEM_SET==rItemSet.GetItemState( RES_FRAMEDIR, sal_True, &pItem ) ) + SFX_ITEM_SET==rItemSet.GetItemState( RES_FRAMEDIR, true, &pItem ) ) { rFrmItemSet.Put( *pItem ); rItemSet.ClearItem( RES_FRAMEDIR ); @@ -2332,7 +2332,7 @@ static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc ) const SfxPoolItem *pItem; for( sal_uInt16 i=0; i<3; i++ ) { - if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], sal_False,&pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( aWhichIds[i], false,&pItem ) ) { const SvxFontItem& rFont = *(const SvxFontItem *)pItem; if( RTL_TEXTENCODING_SYMBOL != rFont.GetCharSet() ) diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 95448f2bbcfe..af3834e8a833 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -109,7 +109,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, // linken/rechten Rand setzen const SfxPoolItem *pItem; - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, sal_True, &pItem ) ) + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, true, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -136,7 +136,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, } // oberen/unteren Rand setzen - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, sal_True, &pItem ) ) + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, true, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; @@ -436,7 +436,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) const SfxPoolItem *pItem; for( sal_uInt16 i=0; nWhichIds[i]; i++ ) { - if( SFX_ITEM_SET == rItemSet.GetItemState( nWhichIds[i], sal_True, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( nWhichIds[i], true, &pItem ) ) PutEEPoolItem( aItemSet, *pItem ); } } @@ -620,7 +620,7 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet, while( nEEWhich ) { const SfxPoolItem *pEEItem; - sal_Bool bSet = SFX_ITEM_SET == rObjItemSet.GetItemState( nEEWhich, sal_False, + sal_Bool bSet = SFX_ITEM_SET == rObjItemSet.GetItemState( nEEWhich, false, &pEEItem ); if( bSet || bSetDefaults ) diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 7e67b99c4a62..9045a8a02618 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -219,7 +219,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt, const SfxPoolItem* pItem; const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); if( SFX_ITEM_SET == rItemSet.GetItemState( RES_COL, - sal_True, &pItem ) && + true, &pItem ) && ((const SwFmtCol *)pItem)->GetNumCols() > 1 ) { // spaltiger Rahmen @@ -589,7 +589,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( (nFrmOpts & HTML_FRMOPT_ALIGN) && !pStr && ( (nFrmOpts & HTML_FRMOPT_S_ALIGN) == 0 || (FLY_AS_CHAR == eAnchorId) ) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem )) { switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() ) { @@ -615,7 +615,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, // HSPACE und VSPACE Size aTwipSpc( 0, 0 ); if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, true, &pItem )) { aTwipSpc.Width() = ( ((SvxLRSpaceItem*)pItem)->GetLeft() + @@ -623,7 +623,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, nDfltLeftMargin = nDfltRightMargin = aTwipSpc.Width(); } if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_UL_SPACE, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem )) { aTwipSpc.Height() = ( ((SvxULSpaceItem*)pItem)->GetUpper() + @@ -670,7 +670,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, } if( !(nFrmOpts & HTML_FRMOPT_ABSSIZE) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, true, &pItem )) { const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem; @@ -683,7 +683,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, // WIDTH und/oder HEIGHT // ATT_VAR_SIZE/ATT_MIN_SIZE nur ausgeben, wenn ANYSIZE gesezut ist if( (nFrmOpts & HTML_FRMOPT_SIZE) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, sal_True, &pItem ) && + SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) && ( (nFrmOpts & HTML_FRMOPT_ANYSIZE) || ATT_FIX_SIZE == ((const SwFmtFrmSize *)pItem)->GetHeightSizeType()) ) { @@ -750,7 +750,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( (nFrmOpts & HTML_FRMOPT_BRCLEAR) && ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) || (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId())) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_SURROUND, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem )) { const SwFmtSurround* pSurround = (const SwFmtSurround*)pItem; sal_Int16 eHoriOri = rFrmFmt.GetHoriOrient().GetHoriOrient(); @@ -836,7 +836,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, // das URL-Attribut nur beruecksichtigen, wenn keine Image-Map // uebergeben wurde if( !pAltImgMap && - SFX_ITEM_SET == rItemSet.GetItemState( RES_URL, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_URL, true, &pItem )) { pURLItem = (const SwFmtURL *)pItem; } @@ -973,7 +973,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, // URL -> <A>...<IMG ... >...</A> const SvxMacroItem *pMacItem = 0; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, sal_True, &pItem )) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, true, &pItem )) pMacItem = (const SvxMacroItem *)pItem; if( pURLItem || pMacItem ) @@ -1048,7 +1048,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, // Umrandung -> <FONT COLOR = ...>...<IMG ... >...</FONT> sal_uInt16 nBorderWidth = 0; if( (nFrmOpts & HTML_FRMOPT_BORDER) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, true, &pItem )) { Size aTwipBorder( 0, 0 ); const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem; @@ -1134,7 +1134,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' ); // Events - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, sal_True, &pItem )) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, true, &pItem )) { const SvxMacroTableDtor& rMacTable = ((const SvxMacroItem *)pItem)->GetMacroTable(); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 9cd60ca910f1..de22a460c470 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -949,7 +949,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( // linken/rechten Rand setzen const SfxPoolItem *pItem; - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, sal_True, + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, true, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten @@ -981,7 +981,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( } // oberen/unteren Rand setzen - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, sal_True, + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, true, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten @@ -1014,7 +1014,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( uno::Reference< beans::XPropertySetInfo > xPropSetInfo = rFCompPropSet->getPropertySetInfo(); OUString sPropName = "BackgroundColor"; - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_BACKGROUND, sal_True, + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_BACKGROUND, true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { @@ -1030,7 +1030,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( } sPropName = "TextColor"; - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_COLOR, sal_True, + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_COLOR, true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { @@ -1041,7 +1041,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontHeight"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_FONTSIZE, - sal_True, &pItem ) && + true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { float fVal = static_cast< float >( @@ -1050,7 +1050,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_FONT, sal_True, + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_FONT, true, &pItem ) ) { const SvxFontItem *pFontItem = (SvxFontItem *)pItem; @@ -1088,7 +1088,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontWeight"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_WEIGHT, - sal_True, &pItem ) && + true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { float fVal = VCLUnoHelper::ConvertFontWeight( @@ -1099,7 +1099,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontSlant"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_POSTURE, - sal_True, &pItem ) && + true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= (sal_Int16)((SvxPostureItem *)pItem)->GetPosture(); @@ -1108,7 +1108,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontUnderline"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_UNDERLINE, - sal_True, &pItem ) && + true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= (sal_Int16)((SvxUnderlineItem *)pItem)->GetLineStyle(); @@ -1117,7 +1117,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontStrikeout"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_CROSSEDOUT, - sal_True, &pItem ) && + true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= (sal_Int16)((SvxCrossedOutItem *)pItem)->GetStrikeout(); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4378c841ec0a..0ca80885d0d9 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -971,7 +971,7 @@ void SwHTMLParser::InsertBodyOptions() RES_CHRATR_CTL_FONTSIZE }; for( sal_uInt16 i=0; i<3; i++ ) { - if( SFX_ITEM_SET == aItemSet.GetItemState( aWhichIds[i], sal_False, + if( SFX_ITEM_SET == aItemSet.GetItemState( aWhichIds[i], false, &pItem ) && static_cast <const SvxFontHeightItem * >(pItem)->GetProp() != 100) { diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 3ca8df45e02d..379edb4c70ae 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -218,7 +218,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, // linken/rechten Rand setzen const SfxPoolItem *pItem; - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, sal_True, &pItem ) ) + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, true, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -256,7 +256,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, } // oberen/unteren Rand setzen - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, sal_True, &pItem ) ) + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, true, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 273b38d0c9f8..54871c6ddb12 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -320,13 +320,13 @@ void SwHTMLParser::NewDivision( int nToken ) Reader::ResetFrmFmtAttrs(aFrmItemSet ); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == aItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == aItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { aFrmItemSet.Put( *pItem ); aItemSet.ClearItem( RES_BACKGROUND ); } - if( SFX_ITEM_SET == aItemSet.GetItemState( RES_FRAMEDIR, sal_False, + if( SFX_ITEM_SET == aItemSet.GetItemState( RES_FRAMEDIR, false, &pItem ) ) { aFrmItemSet.Put( *pItem ); @@ -710,13 +710,13 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) aFrmItemSet.Put( aFmtCol ); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == aItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == aItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { aFrmItemSet.Put( *pItem ); aItemSet.ClearItem( RES_BACKGROUND ); } - if( SFX_ITEM_SET == aItemSet.GetItemState( RES_FRAMEDIR, sal_False, + if( SFX_ITEM_SET == aItemSet.GetItemState( RES_FRAMEDIR, false, &pItem ) ) { aFrmItemSet.Put( *pItem ); @@ -808,14 +808,14 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd, const SfxPoolItem* pItem; if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet() - .GetItemState( RES_PAGEDESC, sal_False, &pItem ) && + .GetItemState( RES_PAGEDESC, false, &pItem ) && ((SwFmtPageDesc *)pItem)->GetPageDesc() ) { pDestCntntNd->SetAttr( *pItem ); pSrcCntntNd->ResetAttr( RES_PAGEDESC ); } if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet() - .GetItemState( RES_BREAK, sal_False, &pItem ) ) + .GetItemState( RES_BREAK, false, &pItem ) ) { switch( ((SvxFmtBreakItem *)pItem)->GetBreak() ) { @@ -836,7 +836,7 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd, const SfxPoolItem* pItem; if( SFX_ITEM_SET == pFrmFmt->GetAttrSet(). - GetItemState( RES_PAGEDESC, sal_False, &pItem ) ) + GetItemState( RES_PAGEDESC, false, &pItem ) ) { pDestCntntNd->SetAttr( *pItem ); pFrmFmt->ResetFmtAttr( RES_PAGEDESC ); diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 632aa8aad44b..592ae51b079c 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1552,7 +1552,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox, const SfxPoolItem *pItem; if( pCNd && pCNd->HasSwAttrSet() && SFX_ITEM_SET==pCNd->GetpSwAttrSet()->GetItemState( - RES_PARATR_ADJUST, sal_False, &pItem ) ) + RES_PARATR_ADJUST, false, &pItem ) ) { eAdjust = ((const SvxAdjustItem *)pItem) ->GetAdjust(); @@ -1599,7 +1599,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox, { OSL_ENSURE( pBox->GetSttNd() || SFX_ITEM_SET!=pFrmFmt->GetAttrSet().GetItemState( - RES_VERT_ORIENT, sal_False ), + RES_VERT_ORIENT, false ), "Box ohne Inhalt hat vertikale Ausrichtung" ); pBox->ChgFrmFmt( (SwTableBoxFmt*)pFrmFmt ); } @@ -1665,7 +1665,7 @@ static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt ) pFrmFmt->ResetFmtAttr( RES_FRM_SIZE ); pFrmFmt->ResetFmtAttr( RES_BACKGROUND ); OSL_ENSURE( SFX_ITEM_SET!=pFrmFmt->GetAttrSet().GetItemState( - RES_VERT_ORIENT, sal_False ), + RES_VERT_ORIENT, false ), "Zeile hat vertikale Ausrichtung" ); } @@ -3013,7 +3013,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor, pCSS1Parser->ParseStyleOption( rStyle, aItemSet, aPropInfo ); const SfxPoolItem *pItem = 0; - if( SFX_ITEM_SET == aItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == aItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { pBrushItem = new SvxBrushItem( *((const SvxBrushItem *)pItem) ); @@ -3556,13 +3556,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, if( bStyleParsed ) { if( SFX_ITEM_SET == aItemSet.GetItemState( - RES_BACKGROUND, sal_False, &pItem ) ) + RES_BACKGROUND, false, &pItem ) ) { pCurTable->SetBGBrush( *(const SvxBrushItem *)pItem ); aItemSet.ClearItem( RES_BACKGROUND ); } if( SFX_ITEM_SET == aItemSet.GetItemState( - RES_PARATR_SPLIT, sal_False, &pItem ) ) + RES_PARATR_SPLIT, false, &pItem ) ) { aItemSet.Put( SwFmtLayoutSplit( ((const SvxFmtSplitItem *)pItem) @@ -3814,14 +3814,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, const SfxPoolItem* pItem2; if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet() - .GetItemState( RES_PAGEDESC, sal_False, &pItem2 ) && + .GetItemState( RES_PAGEDESC, false, &pItem2 ) && ((SwFmtPageDesc *)pItem2)->GetPageDesc() ) { pFrmFmt->SetFmtAttr( *pItem2 ); pOldTxtNd->ResetAttr( RES_PAGEDESC ); } if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet() - .GetItemState( RES_BREAK, sal_True, &pItem2 ) ) + .GetItemState( RES_BREAK, true, &pItem2 ) ) { switch( ((SvxFmtBreakItem *)pItem2)->GetBreak() ) { diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index c8db88e7d9e1..16319b42eeb3 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -418,7 +418,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, rWrt.bTxtAttr = sal_False; rWrt.bOutOpts = sal_True; const SvxBrushItem *pBrushItem = 0; - if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { pBrushItem = (const SvxBrushItem *)pItem; } @@ -439,12 +439,12 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, sal_uInt32 nNumFmt = 0; double nValue = 0.0; sal_Bool bNumFmt = sal_False, bValue = sal_False; - if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem ) ) + if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOXATR_FORMAT, false, &pItem ) ) { nNumFmt = ((const SwTblBoxNumFormat *)pItem)->GetValue(); bNumFmt = sal_True; } - if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOXATR_VALUE, sal_False, &pItem ) ) + if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOXATR_VALUE, false, &pItem ) ) { nValue = ((const SwTblBoxValue *)pItem)->GetValue(); bValue = sal_True; diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 1619ee9d325e..83b13fb5e21c 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -718,41 +718,41 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_ bIgnoreFontFamily( sal_False ) { // Item-Ids auch initialisieren - aItemIds.nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, sal_False ); - aItemIds.nFontCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, sal_False ); - aItemIds.nFontCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, sal_False ); - aItemIds.nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, sal_False ); - aItemIds.nPostureCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, sal_False ); - aItemIds.nPostureCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, sal_False ); - aItemIds.nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, sal_False ); - aItemIds.nWeightCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, sal_False ); - aItemIds.nWeightCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, sal_False ); - aItemIds.nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, sal_False ); - aItemIds.nFontHeightCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, sal_False ); - aItemIds.nFontHeightCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, sal_False ); - aItemIds.nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, sal_False ); - aItemIds.nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, sal_False ); - aItemIds.nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, sal_False ); - aItemIds.nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, sal_False ); - aItemIds.nKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, sal_False ); - aItemIds.nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, sal_False ); - aItemIds.nBlink = rPool.GetTrueWhich( SID_ATTR_FLASH, sal_False ); - - aItemIds.nLineSpacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, sal_False ); - aItemIds.nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, sal_False ); - aItemIds.nWidows = rPool.GetTrueWhich( SID_ATTR_PARA_WIDOWS, sal_False ); - aItemIds.nOrphans = rPool.GetTrueWhich( SID_ATTR_PARA_ORPHANS, sal_False ); - aItemIds.nFmtSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, sal_False ); - - aItemIds.nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, sal_False ); - aItemIds.nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, sal_False ); - aItemIds.nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, sal_False ); - aItemIds.nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, sal_False ); - - aItemIds.nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, sal_False ); - aItemIds.nLanguageCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False ); - aItemIds.nLanguageCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False ); - aItemIds.nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, sal_False ); + aItemIds.nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, false ); + aItemIds.nFontCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, false ); + aItemIds.nFontCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, false ); + aItemIds.nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, false ); + aItemIds.nPostureCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, false ); + aItemIds.nPostureCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, false ); + aItemIds.nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, false ); + aItemIds.nWeightCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, false ); + aItemIds.nWeightCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, false ); + aItemIds.nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, false ); + aItemIds.nFontHeightCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, false ); + aItemIds.nFontHeightCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, false ); + aItemIds.nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, false ); + aItemIds.nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, false ); + aItemIds.nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, false ); + aItemIds.nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, false ); + aItemIds.nKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, false ); + aItemIds.nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, false ); + aItemIds.nBlink = rPool.GetTrueWhich( SID_ATTR_FLASH, false ); + + aItemIds.nLineSpacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, false ); + aItemIds.nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, false ); + aItemIds.nWidows = rPool.GetTrueWhich( SID_ATTR_PARA_WIDOWS, false ); + aItemIds.nOrphans = rPool.GetTrueWhich( SID_ATTR_PARA_ORPHANS, false ); + aItemIds.nFmtSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, false ); + + aItemIds.nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, false ); + aItemIds.nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, false ); + aItemIds.nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, false ); + aItemIds.nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, false ); + + aItemIds.nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, false ); + aItemIds.nLanguageCJK = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, false ); + aItemIds.nLanguageCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, false ); + aItemIds.nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false ); aWhichMap.insert( aWhichMap.begin(), 0 ); SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16 *)&aItemIds, @@ -2023,7 +2023,7 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr, if( bSet ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, false, &pItem ) ) { SvxLRSpaceItem aLRItem( *((const SvxLRSpaceItem*)pItem) ); @@ -2079,7 +2079,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr, if( nLeft < 0 ) nLeft = 0; const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, false, &pItem ) ) { SvxLRSpaceItem aLRItem( *((const SvxLRSpaceItem*)pItem) ); @@ -2135,7 +2135,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr, if( nRight < 0 ) nRight = 0; const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, false, &pItem ) ) { SvxLRSpaceItem aLRItem( *((const SvxLRSpaceItem*)pItem) ); @@ -2194,7 +2194,7 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr, if( bSet ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nULSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nULSpace, false, &pItem ) ) { SvxULSpaceItem aULItem( *((const SvxULSpaceItem*)pItem) ); @@ -2253,7 +2253,7 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr, if( bSet ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nULSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nULSpace, false, &pItem ) ) { SvxULSpaceItem aULItem( *((const SvxULSpaceItem*)pItem) ); @@ -2357,7 +2357,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, } const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nLRSpace, false, &pItem ) ) { SvxLRSpaceItem aLRItem( *((const SvxLRSpaceItem*)pItem) ); @@ -2386,7 +2386,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, nMargins[2] = 0; const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nULSpace, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( aItemIds.nULSpace, false, &pItem ) ) { SvxULSpaceItem aULItem( *((const SvxULSpaceItem*)pItem) ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index b1c99dfae725..3cdcbf3cf147 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -4677,7 +4677,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) pCSS1Parser->GetTxtFmtColl( nTopColl, rTopClass ); const SfxItemSet& rItemSet = pTopColl->GetAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,sal_True, &pItem) ) + if( SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,true, &pItem) ) { const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -4709,7 +4709,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) pContext->SetMargins( nLeftMargin, nRightMargin, nFirstLineIndent ); } - if( SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,sal_True, &pItem) ) + if( SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,true, &pItem) ) { const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index e84dca5d6587..e21718ad10f8 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -345,7 +345,7 @@ sal_uLong SwHTMLWriter::WriteStream() if( !bWriteClipboardDoc && pDoc->GetDocShell() && (!pDoc->get(IDocumentSettingAccess::HTML_MODE) && !pDoc->get(IDocumentSettingAccess::BROWSE_MODE)) && - SFX_ITEM_SET == rPageItemSet.GetItemState( RES_HEADER, sal_True, &pItem) ) + SFX_ITEM_SET == rPageItemSet.GetItemState( RES_HEADER, true, &pItem) ) { const SwFrmFmt *pHeaderFmt = ((const SwFmtHeader *)pItem)->GetHeaderFmt(); @@ -365,7 +365,7 @@ sal_uLong SwHTMLWriter::WriteStream() if( !bWriteClipboardDoc && pDoc->GetDocShell() && (!pDoc->get(IDocumentSettingAccess::HTML_MODE) && !pDoc->get(IDocumentSettingAccess::BROWSE_MODE)) && - SFX_ITEM_SET == rPageItemSet.GetItemState( RES_FOOTER, sal_True, &pItem) ) + SFX_ITEM_SET == rPageItemSet.GetItemState( RES_FOOTER, true, &pItem) ) { const SwFrmFmt *pFooterFmt = ((const SwFmtFooter *)pItem)->GetFooterFmt(); @@ -470,7 +470,7 @@ static const SwFmtCol *lcl_html_GetFmtCol( const SwSection& rSection, const SfxPoolItem* pItem; if( FILE_LINK_SECTION != rSection.GetType() && - SFX_ITEM_SET == rFmt.GetAttrSet().GetItemState(RES_COL,sal_False,&pItem) && + SFX_ITEM_SET == rFmt.GetAttrSet().GetItemState(RES_COL,false,&pItem) && ((const SwFmtCol *)pItem)->GetNumCols() > 1 ) { pCol = (const SwFmtCol *)pItem; @@ -795,10 +795,10 @@ static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt, const SfxItemSet& rItemSet = pFmt->GetAttrSet(); const SfxPoolItem *pRefItem = 0, *pItem = 0; bool bItemSet = SFX_ITEM_SET == rItemSet.GetItemState( RES_CHRATR_COLOR, - sal_True, &pItem); + true, &pItem); bool bRefItemSet = pRefFmt && SFX_ITEM_SET == pRefFmt->GetAttrSet().GetItemState( RES_CHRATR_COLOR, - sal_True, &pRefItem); + true, &pRefItem); if( bItemSet ) { // wenn das Item nur in der Vorlage des aktuellen Doks gesetzt @@ -1139,7 +1139,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, sal_Bool bGrap void SwHTMLWriter::OutBackground( const SfxItemSet& rItemSet, sal_Bool bGraphic ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem )) { OutBackground( ((const SvxBrushItem*)pItem), bGraphic ); diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 18d489689995..1aa9e9397029 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -39,7 +39,7 @@ sal_Int16 SwWriteTableCell::GetVertOri() const { const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) ) { sal_Int16 eBoxVertOri = ((const SwFmtVertOrient *)pItem)->GetVertOrient(); @@ -153,7 +153,7 @@ long SwWriteTable::GetLineHeight( const SwTableBox *pBox ) const const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet(); long nHeight = 0; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, sal_True, &pItem )) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) nHeight = ((SwFmtFrmSize*)pItem)->GetHeight(); return nHeight; @@ -170,7 +170,7 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox, const SfxPoolItem* pItem; const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet(); - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { if( !pLine->GetUpper() ) @@ -594,12 +594,12 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet(); long nHeight = 0; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, sal_True, &pItem )) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) nHeight = ((SwFmtFrmSize*)pItem)->GetHeight(); const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { pLineBrush = (const SvxBrushItem *)pItem; diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 7c69b4924fda..994dad4e2d3d 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -607,13 +607,13 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, if( pSet ) { if( !pTOXAttr->HadBreakItem() - && SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, sal_False, &pItem ) ) + && SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, false, &pItem ) ) { aBkSet.Put( *pItem ); pNd->ResetAttr( RES_BREAK ); } if( !pTOXAttr->HadPageDescItem() - && SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, sal_False, &pItem ) ) + && SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem ) ) { aBkSet.Put( *pItem ); pNd->ResetAttr( RES_PAGEDESC ); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d30840fb54c1..afeb0573e071 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -543,7 +543,7 @@ void DocxAttributeOutput::EndParagraphProperties( const SfxItemSet* pParagraphMa const SfxPoolItem* pItem = 0; while( nWhichId ) { - if( SFX_ITEM_SET == pParagraphMarkerProperties->GetItemState( nWhichId, sal_True, &pItem )) + if( SFX_ITEM_SET == pParagraphMarkerProperties->GetItemState( nWhichId, true, &pItem )) { SAL_INFO( "sw.ww8", "nWhichId " << nWhichId); if (isCHRATR( nWhichId )) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 226259a8e598..f5c6b660f56c 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1136,10 +1136,10 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, bool bWriteReset, // normal header / footer (without a style) const SfxPoolItem* pItem; - if( pAktPageDesc->GetLeft().GetAttrSet().GetItemState( RES_HEADER, sal_False, + if( pAktPageDesc->GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ) == SFX_ITEM_SET) WriteHeaderFooter(*pItem, true); - if( pAktPageDesc->GetLeft().GetAttrSet().GetItemState( RES_FOOTER, sal_False, + if( pAktPageDesc->GetLeft().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ) == SFX_ITEM_SET) WriteHeaderFooter(*pItem, false); @@ -1149,10 +1149,10 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, bool bWriteReset, Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TITLEPG ); pAktPageDesc = &rPgDsc; if( pAktPageDesc->GetMaster().GetAttrSet().GetItemState( RES_HEADER, - sal_False, &pItem ) == SFX_ITEM_SET ) + false, &pItem ) == SFX_ITEM_SET ) WriteHeaderFooter(*pItem, true); if( pAktPageDesc->GetMaster().GetAttrSet().GetItemState( RES_FOOTER, - sal_False, &pItem ) == SFX_ITEM_SET ) + false, &pItem ) == SFX_ITEM_SET ) WriteHeaderFooter(*pItem, false); } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 1fe3ad7c91b8..e6e4130b3736 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -434,7 +434,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby ) sal_uInt16 nWhichId = aIter.FirstWhich(); while( nWhichId ) { - if( SFX_ITEM_SET == pSet->GetItemState( nWhichId, sal_False, &pItem )) + if( SFX_ITEM_SET == pSet->GetItemState( nWhichId, false, &pItem )) { if (nWhichId == nFontId) pFont = &(item_cast<SvxFontItem>(*pItem)); @@ -2389,7 +2389,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) // create new LRSpace item, based on the current (if present) const SfxPoolItem* pPoolItem = NULL; - pTmpSet->GetItemState(RES_LR_SPACE, sal_True, &pPoolItem); + pTmpSet->GetItemState(RES_LR_SPACE, true, &pPoolItem); SvxLRSpaceItem aLRSpace( ( pPoolItem == NULL ) ? SvxLRSpaceItem(0, 0, 0, 0, RES_LR_SPACE) diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index eb3c2fa91cef..3f81acfcf2bc 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2007,7 +2007,7 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR ((SwTxtNode*)pCNd)->GetAttr( aCoreSet, 0, ((SwTxtNode*)pCNd)->GetTxt().getLength()); const SvxCharRotateItem * pRotate = NULL; const SfxPoolItem * pRotItem; - if ( SFX_ITEM_SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, sal_True, &pRotItem)) + if ( SFX_ITEM_SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem)) { pRotate = (SvxCharRotateItem*)pRotItem; if(pRotate && pRotate->GetValue() == 900) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index a729801a0b51..c913499f6af1 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1006,7 +1006,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, const SfxPoolItem* pPoolItem=NULL; SfxItemState eState = aSet.GetItemState( XATTR_FILLCOLOR, - sal_False, &pPoolItem ); + false, &pPoolItem ); if( SFX_ITEM_DEFAULT == eState ) aSet.Put( XFillColorItem( OUString(), Color( mnDefaultColor ) ) ); @@ -5394,7 +5394,7 @@ namespace const SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem *pPasswordItem; - if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, sal_True, &pPasswordItem)) + if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, true, &pPasswordItem)) aPassw = ((const SfxStringItem *)pPasswordItem)->GetValue(); else { diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index e808c5a25e8e..18ddb249bb25 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3345,7 +3345,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh } else if ( pAktItemSet ) { - if ( SFX_ITEM_SET == pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, sal_False ) ) + if ( SFX_ITEM_SET == pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) ) { SvxUnderlineItem *pUnderline = (SvxUnderlineItem *)(pAktItemSet->Get( RES_CHRATR_UNDERLINE, sal_False ) .Clone()); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 1f94975c5fd7..64c1a6eddd65 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -666,7 +666,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() const SfxPoolItem *pItem; SwFmtPageDesc *pFmtPageDesc = 0; - if( SFX_ITEM_SET == pItemSet->GetItemState( RES_PAGEDESC, sal_False, + if( SFX_ITEM_SET == pItemSet->GetItemState( RES_PAGEDESC, false, &pItem ) ) { if( ((SwFmtPageDesc *)pItem)->GetPageDesc() != pPageDesc ) diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index acb473026842..7404235f082b 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -85,7 +85,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) { const SfxPoolItem *pItem; if( SFX_ITEM_SET == rFmt.GetAttrSet().GetItemState( RES_PAGEDESC, - sal_False, &pItem ) ) + false, &pItem ) ) { OUString sName; const SwPageDesc *pPageDesc = @@ -108,7 +108,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) const SfxPoolItem *pItem; if( SFX_ITEM_SET == rFmt.GetAttrSet().GetItemState( RES_BOXATR_FORMAT, - sal_False, &pItem ) ) + false, &pItem ) ) { sal_Int32 nFormat = (sal_Int32) ((const SwTblBoxNumFormat *)pItem)->GetValue(); diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index a6756105d119..1b73883d6c10 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -107,7 +107,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet, { // first get item from itemset const SfxPoolItem* pItem = 0; - SfxItemState eState = rSet.GetItemState( pEntry->nWhichId, sal_True, + SfxItemState eState = rSet.GetItemState( pEntry->nWhichId, true, &pItem ); // if its not set, try the pool @@ -155,7 +155,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet, if( !pUnknownItem ) { const SfxPoolItem* pItem = 0; - if( SFX_ITEM_SET == rSet.GetItemState( nUnknownWhich, sal_True, + if( SFX_ITEM_SET == rSet.GetItemState( nUnknownWhich, true, &pItem ) ) { SfxPoolItem *pNew = pItem->Clone(); diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index be0e27cb8a4d..645d0285e480 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -129,7 +129,7 @@ void SwXMLTableItemMapper_Impl::handleSpecialItem( { const SfxPoolItem *pItem; if( pSet && - SFX_ITEM_SET == pSet->GetItemState( RES_HORI_ORIENT, sal_True, + SFX_ITEM_SET == pSet->GetItemState( RES_HORI_ORIENT, true, &pItem ) ) { sal_Int16 eHoriOrient = diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 1df63c9976a6..6441658e998b 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -165,7 +165,7 @@ bool SwXMLImportTableItemMapper_Impl::handleSpecialItem( // If the item is existing already, a relative value has been set // already that must be preserved. if( SFX_ITEM_SET != rItemSet.GetItemState( RES_FRM_SIZE, - sal_False ) ) + false ) ) bRet = SvXMLImportItemMapper::PutXMLValue( rItem, rValue, nMemberId, rUnitConv ); break; @@ -216,7 +216,7 @@ void SwXMLImportTableItemMapper_Impl::finished( // first get item from itemset SfxPoolItem const* pItem = 0; SfxItemState eState = - rSet.GetItemState(Ids[i][0], sal_True, &pItem); + rSet.GetItemState(Ids[i][0], true, &pItem); // if not set, try the pool if ((SFX_ITEM_SET != eState) && (SFX_WHICH_MAX > Ids[i][0])) @@ -306,7 +306,7 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( { const SfxPoolItem *pItem; if( SFX_ITEM_SET == _rItemSet.GetItemState( RES_BACKGROUND, - sal_False, &pItem ) ) + false, &pItem ) ) { pContext = new SwXMLBrushItemImportContext( GetImport(), nPrefix, rLocalName, xAttrList, diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index a1d36049ac68..e3c8ab72e1a7 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -208,13 +208,13 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, false, &pItem ) ) pFrmSize = (const SwFmtFrmSize *)pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_ROW_SPLIT, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_ROW_SPLIT, false, &pItem ) ) pRowSplit = (const SwFmtRowSplit *)pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) pBrush = (const SvxBrushItem *)pItem; // empty styles have not to be exported @@ -231,7 +231,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, const SvxBrushItem *pTestBrush = 0; const SwFrmFmt *pTestFmt = *i; const SfxItemSet& rTestSet = pTestFmt->GetAttrSet(); - if( SFX_ITEM_SET == rTestSet.GetItemState( RES_FRM_SIZE, sal_False, + if( SFX_ITEM_SET == rTestSet.GetItemState( RES_FRM_SIZE, false, &pItem ) ) { if( !pFrmSize ) @@ -245,7 +245,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, continue; } - if( SFX_ITEM_SET == rTestSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == rTestSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { if( !pBrush ) @@ -259,7 +259,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, continue; } - if( SFX_ITEM_SET == rTestSet.GetItemState( RES_ROW_SPLIT, sal_False, + if( SFX_ITEM_SET == rTestSet.GetItemState( RES_ROW_SPLIT, false, &pItem ) ) { if( !pRowSplit ) @@ -334,21 +334,21 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, sal_False, + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) ) pVertOrient = (const SwFmtVertOrient *)pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) pBrush = (const SvxBrushItem *)pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, false, &pItem ) ) pBox = (const SvxBoxItem *)pItem; if ( SFX_ITEM_SET == rItemSet.GetItemState( RES_BOXATR_FORMAT, - sal_False, &pItem ) ) + false, &pItem ) ) pNumFmt = (const SwTblBoxNumFormat *)pItem; if ( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRAMEDIR, - sal_False, &pItem ) ) + false, &pItem ) ) pFrameDir = (const SvxFrameDirectionItem *)pItem; // empty styles have not to be exported @@ -372,7 +372,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, const SvxFrameDirectionItem *pTestFrameDir = 0; const SwFrmFmt* pTestFmt = *i; const SfxItemSet& rTestSet = pTestFmt->GetAttrSet(); - if( SFX_ITEM_SET == rTestSet.GetItemState( RES_VERT_ORIENT, sal_False, + if( SFX_ITEM_SET == rTestSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) ) { if( !pVertOrient ) @@ -386,7 +386,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, continue; } - if( SFX_ITEM_SET == rTestSet.GetItemState( RES_BACKGROUND, sal_False, + if( SFX_ITEM_SET == rTestSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { if( !pBrush ) @@ -400,7 +400,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, continue; } - if( SFX_ITEM_SET == rTestSet.GetItemState( RES_BOX, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rTestSet.GetItemState( RES_BOX, false, &pItem ) ) { if( !pBox ) break; @@ -414,7 +414,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, } if ( SFX_ITEM_SET == rTestSet.GetItemState( RES_BOXATR_FORMAT, - sal_False, &pItem ) ) + false, &pItem ) ) { if( !pNumFmt ) break; @@ -429,7 +429,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, } if ( SFX_ITEM_SET == rTestSet.GetItemState( RES_FRAMEDIR, - sal_False, &pItem ) ) + false, &pItem ) ) { if( !pFrameDir ) break; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 4d06449a3ec4..11802da12ffc 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -814,7 +814,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( XML_STYLE_FAMILY_TABLE_COLUMN, aStyleName, &pAutoItemSet ) && pAutoItemSet && - SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, sal_False, + SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false, &pItem ) ) { const SwFmtFrmSize *pSize = ((const SwFmtFrmSize *)pItem); @@ -2715,11 +2715,11 @@ void SwXMLTableContext::MakeTable() { const SfxPoolItem *pItem; const SvxLRSpaceItem *pLRSpace = 0; - if( SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_LR_SPACE, sal_False, + if( SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_LR_SPACE, false, &pItem ) ) pLRSpace = (const SvxLRSpaceItem *)pItem; - if( SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_HORI_ORIENT, sal_False, + if( SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_HORI_ORIENT, false, &pItem ) ) { eHoriOrient = ((const SwFmtHoriOrient *)pItem)->GetHoriOrient(); @@ -2749,7 +2749,7 @@ void SwXMLTableContext::MakeTable() } const SwFmtFrmSize *pSize = 0; - if( SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, sal_False, + if( SFX_ITEM_SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false, &pItem ) ) pSize = (const SwFmtFrmSize *)pItem; diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 42ff670c652f..a031f86e9cca 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -311,7 +311,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs //set the first used database as default source on the config item const SfxPoolItem* pItem = 0; if(pArgs && SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_DATABASE_PROPERTIES, sal_False, &pItem)) + FN_PARAM_DATABASE_PROPERTIES, false, &pItem)) { //mailmerge has been called from the database beamer uno::Sequence< beans::PropertyValue> aDBValues; @@ -595,7 +595,7 @@ void SwModule::ExecOther(SfxRequest& rReq) break; case SID_ATTR_METRIC: - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(nWhich, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(nWhich, false, &pItem)) { FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) @@ -622,7 +622,7 @@ void SwModule::ExecOther(SfxRequest& rReq) bSet; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( - nWhich, sal_False, &pItem )) + nWhich, false, &pItem )) bSet = ((SfxBoolItem*)pItem)->GetValue(); else bSet = !pModuleConfig->IsInsTblFormatNum( bWebView ); diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index b36107af9784..2e4636d8890a 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -259,7 +259,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) // Interpret the page Documentview - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_DOCDISP, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_DOCDISP, false, &pItem )) { const SwDocDisplayItem* pDocDispItem = (const SwDocDisplayItem*)pItem; @@ -285,14 +285,14 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } // Elements - interpret Item - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ELEM, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ELEM, false, &pItem ) ) { const SwElemItem* pElemItem = (const SwElemItem*)pItem; pElemItem->FillViewOptions( aViewOpt ); } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_METRIC, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_METRIC, false, &pItem ) ) { SFX_APP()->SetOptions(rSet); PutItem(*pItem); @@ -300,14 +300,14 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ::SetDfltMetric((FieldUnit)pMetricItem->GetValue(), !bTextDialog); } if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, - sal_False, &pItem ) ) + false, &pItem ) ) { SFX_APP()->SetOptions(rSet); const SfxBoolItem* pCharItem = (const SfxBoolItem*)pItem; ::SetApplyCharUnit(pCharItem->GetValue(), !bTextDialog); } - if( SFX_ITEM_SET == rSet.GetItemState(FN_HSCROLL_METRIC, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState(FN_HSCROLL_METRIC, false, &pItem ) ) { const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem; FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue(); @@ -316,7 +316,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) pAppView->ChangeTabMetric(eUnit); } - if( SFX_ITEM_SET == rSet.GetItemState(FN_VSCROLL_METRIC, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState(FN_VSCROLL_METRIC, false, &pItem ) ) { const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem; FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue(); @@ -325,7 +325,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) pAppView->ChangeVRulerMetric(eUnit); } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem ) ) { sal_uInt16 nTabDist = ((const SfxUInt16Item*)pItem)->GetValue(); pPref->SetDefTab(nTabDist); @@ -346,7 +346,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } // Interpret page Grid Settings - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS, false, &pItem )) { const SvxGridItem* pGridItem = (const SvxGridItem*)pItem; @@ -373,7 +373,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } // Interpret Writer Printer Options - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER, false, &pItem )) { SwPrintOptions* pOpt = GetPrtOptions(!bTextDialog); if (pOpt) @@ -387,7 +387,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem )) { ((SwShadowCursorItem*)pItem)->FillViewOptions( aViewOpt ); if(pBindings) @@ -405,7 +405,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) rWrtSh.AlignAllFormulasToBaseline(); } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, false, &pItem )) { aViewOpt.SetCursorInProtectedArea(((const SfxBoolItem*)pItem)->GetValue()); } diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index e6294d3d3aca..1994054386be 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -150,7 +150,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, const SfxPoolItem* pApiItem; const SfxItemSet* pMedSet; if( 0 != ( pMedSet = rMedium.GetItemSet() ) && SFX_ITEM_SET == - pMedSet->GetItemState( FN_API_CALL, sal_True, &pApiItem ) ) + pMedSet->GetItemState( FN_API_CALL, true, &pApiItem ) ) bAPICall = ((const SfxBoolItem*)pApiItem)->GetValue(); const SfxFilter* pFlt = rMedium.GetFilter(); @@ -194,7 +194,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, { const SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem *pPassItem; - if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, sal_True, &pPassItem)) + if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, true, &pPassItem)) aPasswd = ((const SfxStringItem *)pPassItem)->GetValue(); } @@ -220,7 +220,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, const SfxItemSet* pSet; const SfxPoolItem* pItem; if( 0 != ( pSet = rMedium.GetItemSet() ) && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) aOpt.ReadUserData( ((const SfxStringItem*)pItem)->GetValue() ); if( pRead ) @@ -692,7 +692,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if( 0 != ( pSet = rMedium.GetItemSet() ) ) { if( SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, - sal_True, &pItem ) ) + true, &pItem ) ) sItemOpt = ((const SfxStringItem*)pItem)->GetValue(); } if(!sItemOpt.isEmpty()) @@ -1293,7 +1293,7 @@ bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswd = pIDRA->GetRedlinePassword(); - if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, sal_False, &pItem ) + if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, false, &pItem ) && ((SfxBoolItem*)pItem)->GetValue() == (aPasswd.getLength() > 0)) return false; @@ -1329,7 +1329,7 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswdHash( pIDRA->GetRedlinePassword() ); - if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, sal_False, &pItem ) + if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, false, &pItem ) && ((SfxBoolItem*)pItem)->GetValue() == (aPasswdHash.getLength() != 0)) return false; rPasswordHash = aPasswdHash; diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 23a58a630bc0..e3830a7ba4e2 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -358,7 +358,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aSet.Put( aSwOptions ); const SfxPoolItem* pOpenSmartTagOptionsItem = 0; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_OPEN_SMARTTAGOPTIONS, sal_False, &pOpenSmartTagOptionsItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_OPEN_SMARTTAGOPTIONS, false, &pOpenSmartTagOptionsItem ) ) aSet.Put( *static_cast<const SfxBoolItem*>(pOpenSmartTagOptionsItem) ); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -422,7 +422,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } if( pArgs && SFX_ITEM_SET == - pArgs->GetItemState( SID_PRINTPREVIEW, sal_False, &pItem )) + pArgs->GetItemState( SID_PRINTPREVIEW, false, &pItem )) bSet = ((SfxBoolItem*)pItem)->GetValue(); else bSet = !bCurrent; @@ -854,7 +854,7 @@ void SwDocShell::Execute(SfxRequest& rReq) sal_Int32 nTemplateOutlineLevel = 0; OUString aFileName, aTemplateName; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_False, &pItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, false, &pItem ) ) { aFileName = ((const SfxStringItem*)pItem)->GetValue(); SFX_ITEMSET_ARG( pArgs, pTemplItem, SfxStringItem, SID_TEMPLATE_NAME, false ); @@ -1093,7 +1093,7 @@ void SwDocShell::Execute(SfxRequest& rReq) break; case SID_ATTR_YEAR2000: - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , sal_False, &pItem )) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , false, &pItem )) { OSL_ENSURE(pItem->ISA(SfxUInt16Item), "wrong Item"); sal_uInt16 nYear2K = ((SfxUInt16Item*)pItem)->GetValue(); @@ -1519,7 +1519,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh, { const SfxPoolItem* pItem; if( ( SFX_ITEM_SET == pMed->GetItemSet()->GetItemState( - SID_VERSION, sal_False, &pItem ) ) + SID_VERSION, false, &pItem ) ) ? (nVersion == ((SfxInt16Item*)pItem)->GetValue()) : !nVersion ) { diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index c8753479ccf4..41486a6ca150 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -265,7 +265,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) pColl = pDoc->GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]); if( !bHTMLTemplSet || SFX_ITEM_SET != pColl->GetAttrSet().GetItemState( - nFontWhich, sal_False ) ) + nFontWhich, false ) ) { pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(), aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 21a219ac0b4e..896062714055 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -263,21 +263,21 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) { case SID_STYLE_NEW: if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, - sal_False, &pItem )) + false, &pItem )) { const sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue(); OUString sName; sal_uInt16 nMask = 0; if( SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_NEW, - sal_False, &pItem )) + false, &pItem )) sName = ((const SfxStringItem*)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_MASK, - sal_False, &pItem )) + false, &pItem )) nMask = ((const SfxUInt16Item*)pItem)->GetValue(); OUString sParent; if( SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_REFERENCE, - sal_False, &pItem )) + false, &pItem )) sParent = ((const SfxStringItem*)pItem)->GetValue(); nRet = Edit( sName, sParent, nFamily, nMask, sal_True, OString(), 0, rReq.IsAPI() ); @@ -367,14 +367,14 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) SAL_WARN_IF( !pArgs->Count(), "sw.ui", "SfxBug ItemSet is empty" ); SwWrtShell* pShell = GetWrtShell(); - if( SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem )) + if( SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem )) aParam = ((const SfxStringItem*)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState(SID_STYLE_FAMILY, - sal_False, &pItem )) + false, &pItem )) nFamily = ((const SfxUInt16Item*)pItem)->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState(SID_STYLE_FAMILYNAME, sal_False, &pItem )) + if( SFX_ITEM_SET == pArgs->GetItemState(SID_STYLE_FAMILYNAME, false, &pItem )) { OUString aFamily = ((const SfxStringItem*)pItem)->GetValue(); if(aFamily.equalsAscii("CharacterStyles")) @@ -394,10 +394,10 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) } if( SFX_ITEM_SET == pArgs->GetItemState(SID_STYLE_MASK, - sal_False, &pItem )) + false, &pItem )) nMask = ((const SfxUInt16Item*)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_WRTSHELL, - sal_False, &pItem )) + false, &pItem )) pActShell = pShell = (SwWrtShell*)((SwPtrItem*)pItem)->GetValue(); if( nSlot == SID_STYLE_UPDATE_BY_EXAMPLE ) @@ -426,7 +426,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) } break; case SFX_STYLE_FAMILY_PSEUDO: - if(SFX_ITEM_SET == pArgs->GetItemState(SID_STYLE_UPD_BY_EX_NAME, sal_False, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState(SID_STYLE_UPD_BY_EX_NAME, false, &pItem)) { aParam = ((const SfxStringItem*)pItem)->GetValue(); } @@ -569,7 +569,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl) if( SFX_STYLE_FAMILY_PAGE == m_nFamily && SvtLanguageOptions().IsCTLFontEnabled() ) { const SfxPoolItem *pItem = NULL; - if( aTmpSet.GetItemState( m_rDocSh.GetPool().GetTrueWhich( SID_ATTR_FRAMEDIRECTION, sal_False ) , sal_True, &pItem ) == SFX_ITEM_SET ) + if( aTmpSet.GetItemState( m_rDocSh.GetPool().GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false ) , true, &pItem ) == SFX_ITEM_SET ) SwChartHelper::DoUpdateAllCharts( pDoc ); } } diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 8ea1db9c4a54..44548d90a6b9 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -573,7 +573,7 @@ void SwDocStyleSheet::SetHidden( sal_Bool bValue ) } } -sal_Bool SwDocStyleSheet::IsHidden( ) const +bool SwDocStyleSheet::IsHidden( ) const { sal_Bool bRet = sal_False; @@ -1254,13 +1254,13 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, { OSL_ENSURE(pColl, "Where's Collection"); const SfxPoolItem* pAutoUpdate; - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_AUTO_STYLE_UPDATE,sal_False, &pAutoUpdate )) + if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_AUTO_STYLE_UPDATE,false, &pAutoUpdate )) { pColl->SetAutoUpdateFmt(((const SfxBoolItem*)pAutoUpdate)->GetValue()); } const SwCondCollItem* pCondItem; - if( SFX_ITEM_SET != rSet.GetItemState( FN_COND_COLL, sal_False, + if( SFX_ITEM_SET != rSet.GetItemState( FN_COND_COLL, false, (const SfxPoolItem**)&pCondItem )) pCondItem = 0; @@ -1318,8 +1318,8 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, pColl = pCColl; } if ( bResetIndentAttrsAtParagraphStyle && - rSet.GetItemState( RES_PARATR_NUMRULE, sal_False, 0 ) == SFX_ITEM_SET && - rSet.GetItemState( RES_LR_SPACE, sal_False, 0 ) != SFX_ITEM_SET && + rSet.GetItemState( RES_PARATR_NUMRULE, false, 0 ) == SFX_ITEM_SET && + rSet.GetItemState( RES_LR_SPACE, false, 0 ) != SFX_ITEM_SET && pColl->GetItemState( RES_LR_SPACE, sal_False, 0 ) == SFX_ITEM_SET ) { rDoc.ResetAttrAtFormat( RES_LR_SPACE, *pColl ); @@ -1330,7 +1330,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, // neither the paragraph style nor the numbering style is used in the document // the numbering style will not be saved with the document and the assignment got lost. const SfxPoolItem* pNumRuleItem = 0; - if( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE, sal_False, &pNumRuleItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE, false, &pNumRuleItem ) ) { // Setting a numbering rule? const OUString sNumRule = ((SwNumRuleItem*)pNumRuleItem)->GetValue(); if (!sNumRule.isEmpty()) @@ -1379,7 +1379,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, { OSL_ENSURE(pFrmFmt, "Where's FrmFmt"); const SfxPoolItem* pAutoUpdate; - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_AUTO_STYLE_UPDATE,sal_False, &pAutoUpdate )) + if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_AUTO_STYLE_UPDATE,false, &pAutoUpdate )) { pFrmFmt->SetAutoUpdateFmt(((const SfxBoolItem*)pAutoUpdate)->GetValue()); } @@ -1412,7 +1412,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, break; const SfxPoolItem* pItem; - switch( rSet.GetItemState( SID_ATTR_NUMBERING_RULE, sal_False, &pItem )) + switch( rSet.GetItemState( SID_ATTR_NUMBERING_RULE, false, &pItem )) { case SFX_ITEM_SET: { diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 971f63689195..084b7c7521df 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -155,7 +155,7 @@ SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet) const SfxPoolItem* pItem; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) || + if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem) || ( 0 != ( pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { @@ -194,7 +194,7 @@ SwCharURLPage::~SwCharURLPage() void SwCharURLPage::Reset(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == rSet.GetItemState( RES_TXTATR_INETFMT, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( RES_TXTATR_INETFMT, false, &pItem ) ) { const SwFmtINetFmt* pINetFmt = (const SwFmtINetFmt*) pItem; m_pURLED->SetText(INetURLObject::decode(pINetFmt->GetValue(), @@ -228,7 +228,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) if( pINetFmt->GetMacroTbl() ) pINetItem->SetMacroTable( *pINetFmt->GetMacroTbl() ); } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, false, &pItem)) { m_pTextED->SetText(((const SfxStringItem*)pItem)->GetValue()); m_pTextFT->Enable( false ); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 81a8805d4582..01b9e2dfc411 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -72,7 +72,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& const SfxPoolItem* pItem; SfxObjectShell* pObjSh; - if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, sal_False, &pItem) || + if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) || ( 0 != ( pObjSh = SfxObjectShell::Current()) && 0 != (pItem = pObjSh->GetItem(SID_HTML_MODE)))) { diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 958a613f8064..fc66dd61ed2d 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -198,7 +198,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) OUString sDocTitle; const SfxPoolItem* pItem = NULL; SfxObjectShell* pObjShell = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_WRTSHELL, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_WRTSHELL, false, &pItem ) ) m_pWrtShell = (SwWrtShell*)( (const SwPtrItem*)pItem )->GetValue(); if ( m_pWrtShell ) { diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 9560716b4c91..055842934236 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -105,7 +105,7 @@ SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) m_pMetricLB->SetSelectHdl(LINK(this, SwLoadOptPage, MetricHdl)); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem ) + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { m_pTabFT->Hide(); @@ -218,7 +218,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(sal_False); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) m_pWrtShell = (SwWrtShell*)((const SwPtrItem*)pItem)->GetValue(); SwFldUpdateFlags eFldFlags = AUTOUPD_GLOBALSETTING; @@ -262,7 +262,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) ::SetFieldUnit(*m_pTabMF, eFieldUnit); } m_pMetricLB->SaveValue(); - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) { m_nLastTab = ((SfxUInt16Item*)pItem)->GetValue(); m_pTabMF->SetValue(m_pTabMF->Normalize(m_nLastTab), FUNIT_TWIP); @@ -277,7 +277,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) m_pUseSquaredPageMode->SaveValue(); } - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, false, &pItem)) { bool bUseCharUnit = ((const SfxBoolItem*)pItem)->GetValue(); m_pUseCharUnit->Check(bUseCharUnit); @@ -521,7 +521,7 @@ sal_Bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) void SwCaptionOptPage::Reset( const SfxItemSet& rSet) { const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)) { bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 0856e16b25f4..9db3af22a64b 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -101,7 +101,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent, /* This part is visible only with Writer/Web->View dialogue. */ const SfxPoolItem* pItem; - if (! (SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, sal_False, &pItem ) + if (! (SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)) { m_pSettingsFrame->Hide(); @@ -167,7 +167,7 @@ SfxTabPage* SwContentOptPage::Create( Window* pParent, static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet) { const SfxPoolItem* pItem; - if( rSet.GetItemState( nSID, sal_False, &pItem ) >= SFX_ITEM_AVAILABLE ) + if( rSet.GetItemState( nSID, false, &pItem ) >= SFX_ITEM_AVAILABLE ) { FieldUnit eFieldUnit = (FieldUnit)((SfxUInt16Item*)pItem)->GetValue(); for ( sal_uInt16 i = 0; i < rMetric->GetEntryCount(); ++i ) @@ -186,7 +186,7 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet) { const SwElemItem* pElemAttr = 0; - rSet.GetItemState( FN_PARAM_ELEM , sal_False, + rSet.GetItemState( FN_PARAM_ELEM , false, (const SfxPoolItem**)&pElemAttr ); if(pElemAttr) { @@ -338,7 +338,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent, m_pFaxLB->SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) ); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, sal_False, &pItem ) + if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { m_pLeftPageCB->Hide(); @@ -411,7 +411,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& ) const SfxItemSet& rSet = GetItemSet(); const SwAddPrinterItem* pAddPrinterAttr = 0; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , sal_False, + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , false, (const SfxPoolItem**)&pAddPrinterAttr )) { m_pGrfCB->Check(pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw); @@ -749,7 +749,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) sal_uInt16 nLangSlot = nFontGroup == FONT_GROUP_DEFAULT ? SID_ATTR_LANGUAGE : FONT_GROUP_CJK == nFontGroup ? SID_ATTR_CHAR_CJK_LANGUAGE : SID_ATTR_CHAR_CTL_LANGUAGE; - if( SFX_ITEM_SET == rSet.GetItemState(nLangSlot, sal_False, &pLang)) + if( SFX_ITEM_SET == rSet.GetItemState(nLangSlot, false, &pLang)) eLanguage = ((const SvxLanguageItem*)pLang)->GetValue(); OUString sTmp = pLabelFT->GetText(); @@ -767,7 +767,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) delete pPrt; } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_PRINTER, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_PRINTER, false, &pItem)) { pPrt = (SfxPrinter*)((const SwPtrItem*)pItem)->GetValue(); } @@ -804,12 +804,12 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) pIdxBox->InsertEntry( *it ); } } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_STDFONTS, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_STDFONTS, false, &pItem)) { pFontConfig = (SwStdFontConfig*)((const SwPtrItem*)pItem)->GetValue(); } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) { pWrtShell = (SwWrtShell*)((const SwPtrItem*)pItem)->GetValue(); } @@ -876,31 +876,31 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_NUMBUL_BASE); const SvxFontItem& rFontLS = !nFontGroup ? pColl->GetFont() : FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); - bListDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False); + bListDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); sShellList = sListBackup = rFontLS.GetFamilyName(); const SvxFontHeightItem& rFontHeightList = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, sal_True); nListHeight = (sal_Int32)rFontHeightList.GetHeight(); - bListHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False); + bListHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_LABEL); - bLabelDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False); + bLabelDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() : FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); sShellLabel = sCapBackup = rFontCP.GetFamilyName(); const SvxFontHeightItem& rFontHeightLabel = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, sal_True); nLabelHeight = (sal_Int32)rFontHeightLabel.GetHeight(); - bLabelHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False); + bLabelHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_REGISTER_BASE); - bIdxDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False); + bIdxDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); const SvxFontItem& rFontIDX = !nFontGroup ? pColl->GetFont() : FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); sShellIndex = sIdxBackup = rFontIDX.GetFamilyName(); const SvxFontHeightItem& rFontHeightIndex = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, sal_True); nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight(); - bIndexHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False); + bIndexHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); } pStandardBox->SetText(sStdBackup ); pTitleBox->SetText(sOutBackup ); @@ -1210,7 +1210,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) case TBLVAR_CHGABS: pVarRB->Check(); break; } const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)) { bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); } @@ -1292,7 +1292,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, const SfxPoolItem* pItem = 0; SwShadowCursorItem aOpt; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem )) aOpt = *(SwShadowCursorItem*)pItem; m_pOnOffCB->Check( aOpt.IsOn() ); @@ -1302,7 +1302,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, m_pFillTabRB->Check( FILL_TAB == eMode ); m_pFillSpaceRB->Check( FILL_SPACE == eMode ); - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem ) + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { m_pTabCB->Hide(); @@ -1358,7 +1358,7 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) bool bRet = false; const SfxPoolItem* pItem = 0; - if( SFX_ITEM_SET != rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem ) + if( SFX_ITEM_SET != rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem ) || ((SwShadowCursorItem&)*pItem) != aOpt ) { rSet.Put( aOpt ); @@ -1406,7 +1406,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = 0; SwShadowCursorItem aOpt; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem )) aOpt = *(SwShadowCursorItem*)pItem; m_pOnOffCB->Check( aOpt.IsOn() ); @@ -1423,13 +1423,13 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) m_pMathBaselineAlignmentCB->Hide(); } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, false, &pItem )) m_pCrsrInProtCB->Check(((const SfxBoolItem*)pItem)->GetValue()); m_pCrsrInProtCB->SaveValue(); const SwDocDisplayItem* pDocDisplayAttr = 0; - rSet.GetItemState( FN_PARAM_DOCDISP, sal_False, + rSet.GetItemState( FN_PARAM_DOCDISP, false, (const SfxPoolItem**)&pDocDisplayAttr ); if(pDocDisplayAttr) { @@ -2400,7 +2400,7 @@ void SwTestTabPage::Reset( const SfxItemSet& ) const SfxItemSet& rSet = GetItemSet(); const SwTestItem* pTestAttr = 0; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SWTEST , sal_False, + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SWTEST , false, (const SfxPoolItem**)&pTestAttr )) { m_pTest1CBox->Check(pTestAttr->bTest1); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index c78e5c553d4d..3ca58060d976 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1436,11 +1436,11 @@ void SwInsertDBColAutoPilot::SetTabSet() { RES_BACKGROUND, SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE }; for( int i = 0; i < 3; ++i ) if( SFX_ITEM_SET == pTblSet->GetItemState( aIds[ i ], - sal_False, &pItem ) && *pItem == aBrush ) + false, &pItem ) && *pItem == aBrush ) pTblSet->ClearItem( aIds[ i ] ); } - if( SFX_ITEM_SET == pTblSet->GetItemState( FN_PARAM_TABLE_NAME, sal_False, + if( SFX_ITEM_SET == pTblSet->GetItemState( FN_PARAM_TABLE_NAME, false, &pItem ) && ((const SfxStringItem*)pItem)->GetValue() == rSh.GetTableFmt()->GetName() ) pTblSet->ClearItem( FN_PARAM_TABLE_NAME ); diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index af55cd6ee200..6ccdf87274f5 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -129,7 +129,7 @@ bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, { const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, sal_False, &pItem )) + if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, false, &pItem )) { rpINetItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() ); bRet = true; diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 0985ea99c0f3..a7f0fdb7e84b 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -95,7 +95,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) const SfxPoolItem *pItem = 0; OUString aTmpStr; if ( SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_REGION_NAME, sal_True, &pItem) ) + pSet->GetItemState(FN_PARAM_REGION_NAME, true, &pItem) ) { const OUString sRemoveWhenUniStringIsGone = ((const SfxStringItem *)pItem)->GetValue(); aTmpStr = rSh.GetUniqueSectionName(&sRemoveWhenUniStringIsGone); @@ -107,8 +107,8 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) rReq.SetReturnValue(SfxStringItem(FN_INSERT_REGION, aTmpStr)); aSet.Put( *pSet ); - if(SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem)|| - SFX_ITEM_SET == pSet->GetItemState(FN_INSERT_REGION, sal_False, &pItem)) + if(SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_COLUMNS, false, &pItem)|| + SFX_ITEM_SET == pSet->GetItemState(FN_INSERT_REGION, false, &pItem)) { SwFmtCol aCol; SwRect aRect; @@ -122,20 +122,20 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) aSet.Put(aCol); } } - else if(SFX_ITEM_SET == pSet->GetItemState(RES_COL, sal_False, &pItem)) + else if(SFX_ITEM_SET == pSet->GetItemState(RES_COL, false, &pItem)) { aSet.Put(*pItem); } const sal_Bool bHidden = SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_REGION_HIDDEN, sal_True, &pItem)? + pSet->GetItemState(FN_PARAM_REGION_HIDDEN, true, &pItem)? (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False; const sal_Bool bProtect = SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_REGION_PROTECT, sal_True, &pItem)? + pSet->GetItemState(FN_PARAM_REGION_PROTECT, true, &pItem)? (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False; // #114856# edit in readonly sections const sal_Bool bEditInReadonly = SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_REGION_EDIT_IN_READONLY, sal_True, &pItem)? + pSet->GetItemState(FN_PARAM_REGION_EDIT_IN_READONLY, true, &pItem)? (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False; aSection.SetProtectFlag(bProtect); @@ -144,16 +144,16 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) aSection.SetEditInReadonlyFlag(bEditInReadonly); if(SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_REGION_CONDITION, sal_True, &pItem)) + pSet->GetItemState(FN_PARAM_REGION_CONDITION, true, &pItem)) aSection.SetCondition(((const SfxStringItem *)pItem)->GetValue()); OUString aFile, aSub; if(SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_1, sal_True, &pItem)) + pSet->GetItemState(FN_PARAM_1, true, &pItem)) aFile = ((const SfxStringItem *)pItem)->GetValue(); if(SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_3, sal_True, &pItem)) + pSet->GetItemState(FN_PARAM_3, true, &pItem)) aSub = ((const SfxStringItem *)pItem)->GetValue(); @@ -164,7 +164,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) sLinkFileName = comphelper::string::setToken(sLinkFileName, 0, sfx2::cTokenSeparator, aFile); if(SFX_ITEM_SET == - pSet->GetItemState(FN_PARAM_2, sal_True, &pItem)) + pSet->GetItemState(FN_PARAM_2, true, &pItem)) { sLinkFileName = comphelper::string::setToken(sLinkFileName, 1, sfx2::cTokenSeparator, ((const SfxStringItem *)pItem)->GetValue()); @@ -215,7 +215,7 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq) sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pItem = 0; if(pArgs) - pArgs->GetItemState(nSlot, sal_False, &pItem); + pArgs->GetItemState(nSlot, false, &pItem); SwWrtShell& rWrtShell = GetShell(); switch ( nSlot ) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 82b7a102f4e6..299abdbcaf9c 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1097,19 +1097,19 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) *pFtnItem, *pEndItem, *pBalanceItem, *pFrmDirItem, *pLRSpaceItem; SfxItemState eColState = pOutSet->GetItemState( - RES_COL, sal_False, &pColItem ); + RES_COL, false, &pColItem ); SfxItemState eBrushState = pOutSet->GetItemState( - RES_BACKGROUND, sal_False, &pBrushItem ); + RES_BACKGROUND, false, &pBrushItem ); SfxItemState eFtnState = pOutSet->GetItemState( - RES_FTN_AT_TXTEND, sal_False, &pFtnItem ); + RES_FTN_AT_TXTEND, false, &pFtnItem ); SfxItemState eEndState = pOutSet->GetItemState( - RES_END_AT_TXTEND, sal_False, &pEndItem ); + RES_END_AT_TXTEND, false, &pEndItem ); SfxItemState eBalanceState = pOutSet->GetItemState( - RES_COLUMNBALANCE, sal_False, &pBalanceItem ); + RES_COLUMNBALANCE, false, &pBalanceItem ); SfxItemState eFrmDirState = pOutSet->GetItemState( - RES_FRAMEDIR, sal_False, &pFrmDirItem ); + RES_FRAMEDIR, false, &pFrmDirItem ); SfxItemState eLRState = pOutSet->GetItemState( - RES_LR_SPACE, sal_False, &pLRSpaceItem); + RES_LR_SPACE, false, &pLRSpaceItem); if( SFX_ITEM_SET == eColState || SFX_ITEM_SET == eBrushState || @@ -1354,7 +1354,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); sFilterName = pMedium->GetFilter()->GetFilterName(); const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, false, &pItem ) ) sPassword = ( (SfxStringItem*)pItem )->GetValue(); ::lcl_ReadSections(*pMedium, *m_pSubRegionED); delete pMedium; @@ -1505,7 +1505,7 @@ short SwInsertSectionTabDialog::Ok() { SfxRequest aRequest( pViewFrm, FN_INSERT_REGION); const SfxPoolItem* pCol; - if(SFX_ITEM_SET == pOutputItemSet->GetItemState(RES_COL, sal_False, &pCol)) + if(SFX_ITEM_SET == pOutputItemSet->GetItemState(RES_COL, false, &pCol)) { aRequest.AppendItem(SfxUInt16Item(SID_ATTR_COLUMNS, ((const SwFmtCol*)pCol)->GetColumns().size())); @@ -1822,7 +1822,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil m_sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); m_sFilterName = pMedium->GetFilter()->GetFilterName(); const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, false, &pItem ) ) m_sFilePasswd = ( (SfxStringItem*)pItem )->GetValue(); m_pFileNameED->SetText( INetURLObject::decode( m_sFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) ); diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 600c42c97846..d0f728db0564 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -428,7 +428,7 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); const SfxPoolItem *pBoxInfo; if ( SFX_ITEM_SET == pHFFmt->GetAttrSet().GetItemState( SID_ATTR_BORDER_INNER, - sal_True, &pBoxInfo) ) + true, &pBoxInfo) ) aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; aBoxInfo.SetTable( sal_False ); @@ -441,17 +441,17 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) if ( svx::ShowBorderBackgroundDlg( this, &aSet, true ) ) { const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == aSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ) ) { + if ( SFX_ITEM_SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { pHFFmt->SetFmtAttr( *pItem ); rView.GetDocShell()->SetModified(true); } - if ( SFX_ITEM_SET == aSet.GetItemState( RES_BOX, sal_False, &pItem ) ) { + if ( SFX_ITEM_SET == aSet.GetItemState( RES_BOX, false, &pItem ) ) { pHFFmt->SetFmtAttr( *pItem ); rView.GetDocShell()->SetModified(true); } - if ( SFX_ITEM_SET == aSet.GetItemState( RES_SHADOW, sal_False, &pItem ) ) { + if ( SFX_ITEM_SET == aSet.GetItemState( RES_SHADOW, false, &pItem ) ) { pHFFmt->SetFmtAttr( *pItem ); rView.GetDocShell()->SetModified(true); } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 47c17bf4c316..1d2aa2cbd16d 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -757,7 +757,7 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& SfxItemSet aLangSet(rView.GetPool(), nWhich, nWhich); SwWrtShell& rSh = rView.GetWrtShell(); rSh.GetCurAttr(aLangSet); - if(SFX_ITEM_DEFAULT <= aLangSet.GetItemState(nWhich, sal_True)) + if(SFX_ITEM_DEFAULT <= aLangSet.GetItemState(nWhich, true)) { LanguageType eLang = static_cast<const SvxLanguageItem&>(aLangSet.Get(nWhich)).GetLanguage(); if ( eLang == eBufferLanguage ) @@ -2194,7 +2194,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { SfxItemSet aSet(rSh.GetAttrPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, sal_False)) + if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false)) { const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True); bNormalChar = false; diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index b75d39a9f429..bc1ee30302a8 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -313,7 +313,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) sal_uInt16 nNewDist; if( SFX_ITEM_SET == pOutputSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, - sal_False, &pItem ) && + false, &pItem ) && nDefDist != (nNewDist = ((SfxUInt16Item*)pItem)->GetValue()) ) { SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ); diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 3e04c0855a7a..6f737a91c678 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -319,10 +319,10 @@ short SwTemplateDlg::Ok() { const SfxPoolItem *pOutItem, *pExItem; if( SFX_ITEM_SET == pExampleSet->GetItemState( - SID_ATTR_NUMBERING_RULE, sal_False, &pExItem ) && + SID_ATTR_NUMBERING_RULE, false, &pExItem ) && ( !GetOutputItemSet() || SFX_ITEM_SET != GetOutputItemSet()->GetItemState( - SID_ATTR_NUMBERING_RULE, sal_False, &pOutItem ) || + SID_ATTR_NUMBERING_RULE, false, &pOutItem ) || *pExItem != *pOutItem )) { if( GetOutputItemSet() ) diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 38637647ba30..eb5c8152318d 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -45,7 +45,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) SfxItemPool* pPool = rSet.GetPool(); sal_uInt16 nWhich = pPool->GetWhich( SID_ATTR_PAGE ); - if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { // alignment const SvxPageItem* pPage = (const SvxPageItem*)&rSet.Get( nWhich ); @@ -56,14 +56,14 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) nWhich = pPool->GetWhich( SID_ATTR_PAGE_SIZE ); - if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { // orientation and size from PageItem const SvxSizeItem& rSize = (const SvxSizeItem&)rSet.Get( nWhich ); SetSize( rSize.GetSize() ); } nWhich = RES_LR_SPACE; - if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { // set left and right border const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rSet.Get( nWhich ); @@ -79,7 +79,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) nWhich = RES_UL_SPACE; - if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { // set upper and lower border const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)rSet.Get( nWhich ); @@ -97,7 +97,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) // evaluate header-attributes const SfxPoolItem* pItem; if( SFX_ITEM_SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_HEADERSET), - sal_False, &pItem ) ) + false, &pItem ) ) { const SfxItemSet& rHeaderSet = ((SvxSetItem*)pItem)->GetItemSet(); const SfxBoolItem& rHeaderOn = @@ -136,7 +136,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) } if( SFX_ITEM_SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_FOOTERSET), - sal_False, &pItem ) ) + false, &pItem ) ) { const SfxItemSet& rFooterSet = ((SvxSetItem*)pItem)->GetItemSet(); const SfxBoolItem& rFooterOn = @@ -174,7 +174,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) SetFooter( sal_False ); } if( SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, - sal_False, &pItem ) ) + false, &pItem ) ) { SetColor( ( (const SvxBrushItem*)pItem )->GetColor() ); const Graphic* pGrf = ( (const SvxBrushItem*)pItem )->GetGraphic(); @@ -570,9 +570,9 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) { DELETEZ(pGridItem); //get the grid information - if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, sal_True)) + if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, true)) pGridItem = (SwTextGridItem*)((const SwTextGridItem&)rSet.Get(RES_TEXTGRID)).Clone(); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( RES_FRAMEDIR, sal_True )) + if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( RES_FRAMEDIR, true )) { const SvxFrameDirectionItem& rDirItem = (const SvxFrameDirectionItem&)rSet.Get(RES_FRAMEDIR); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 82658bb125ad..a8ce30588ad1 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -609,7 +609,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) if(m_pBalanceColsCB->IsVisible()) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_COLUMNBALANCE, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( RES_COLUMNBALANCE, false, &pItem )) m_pBalanceColsCB->Check(!((const SwFmtNoBalancedColumns*)pItem)->GetValue()); else m_pBalanceColsCB->Check( sal_True ); diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index c271907c0baa..f1a11406a11c 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -115,7 +115,7 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm() { const SfxPoolItem* pItem = 0; - if (m_aSet.GetItemState(FN_SET_FRM_NAME, sal_False, &pItem) == SFX_ITEM_SET) + if (m_aSet.GetItemState(FN_SET_FRM_NAME, false, &pItem) == SFX_ITEM_SET) m_pOwnSh->SetFlyName(((SfxStringItem *)pItem)->GetValue()); m_pOwnSh->SetModified(); @@ -139,11 +139,11 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm() { //JP 6.8.2001: set never an invalid anchor into the core. const SfxPoolItem *pGItem, *pItem; - if( SFX_ITEM_SET == m_aSet.GetItemState( RES_ANCHOR, sal_False, &pItem )) + if( SFX_ITEM_SET == m_aSet.GetItemState( RES_ANCHOR, false, &pItem )) { SfxItemSet aGetSet( *m_aSet.GetPool(), RES_ANCHOR, RES_ANCHOR ); if( m_pOwnSh->GetFlyFrmAttr( aGetSet ) && 1 == aGetSet.Count() && - SFX_ITEM_SET == aGetSet.GetItemState( RES_ANCHOR, sal_False, &pGItem ) + SFX_ITEM_SET == aGetSet.GetItemState( RES_ANCHOR, false, &pGItem ) && ((SwFmtAnchor*)pGItem)->GetAnchorId() == ((SwFmtAnchor*)pItem)->GetAnchorId() ) m_aSet.ClearItem( RES_ANCHOR ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b96e3774af35..fe19d66868f8 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -877,9 +877,9 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) const SfxPoolItem* pItem = NULL; const SwFmtAnchor& rAnchor = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR); - if (SFX_ITEM_SET == rSet.GetItemState(FN_OLE_IS_MATH, sal_False, &pItem)) + if (SFX_ITEM_SET == rSet.GetItemState(FN_OLE_IS_MATH, false, &pItem)) m_bIsMathOLE = ((const SfxBoolItem*)pItem)->GetValue(); - if (SFX_ITEM_SET == rSet.GetItemState(FN_MATH_BASELINE_ALIGNMENT, sal_False, &pItem)) + if (SFX_ITEM_SET == rSet.GetItemState(FN_MATH_BASELINE_ALIGNMENT, false, &pItem)) m_bIsMathBaselineAlignment = ((const SfxBoolItem*)pItem)->GetValue(); EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment && FLY_AS_CHAR == rAnchor.GetAnchorId()) ); @@ -909,7 +909,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) { OSL_ENSURE(pSh , "shell not found"); //OS: only for the variant Insert/Graphic/Properties - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_GRF_REALSIZE, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_GRF_REALSIZE, false, &pItem)) aGrfSize = ((const SvxSizeItem*)pItem)->GetSize(); else pSh->GetGrfSize( aGrfSize ); @@ -2419,7 +2419,7 @@ void SwGrfExtPage::Reset(const SfxItemSet &rSet) sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_GRF_CONNECT, sal_True, &pItem) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_GRF_CONNECT, true, &pItem) && ((const SfxBoolItem *)pItem)->GetValue() ) { m_pBrowseBT->Enable(); @@ -2438,7 +2438,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) sal_Bool bEnable = sal_False; sal_Bool bEnableMirrorRB = sal_False; - SfxItemState eState = rSet.GetItemState(RES_GRFATR_MIRRORGRF, sal_True, &pItem); + SfxItemState eState = rSet.GetItemState(RES_GRFATR_MIRRORGRF, true, &pItem); if( SFX_ITEM_UNKNOWN != eState && !bProtCntnt && !bHtmlMode ) { if( SFX_ITEM_SET != eState ) @@ -2483,7 +2483,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) } } - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) { const SvxBrushItem& rBrush = *(SvxBrushItem*)pItem; if( !rBrush.GetGraphicLink().isEmpty() ) @@ -2752,7 +2752,7 @@ SwFrmURLPage::~SwFrmURLPage() void SwFrmURLPage::Reset( const SfxItemSet &rSet ) { const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_DOCFRAME, sal_True, &pItem)) + if ( SFX_ITEM_SET == rSet.GetItemState( SID_DOCFRAME, true, &pItem)) { TargetList* pList = new TargetList; ((const SfxFrameItem*)pItem)->GetFrame()->GetTargetList(*pList); @@ -2767,7 +2767,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) delete pList; } - if ( SFX_ITEM_SET == rSet.GetItemState( RES_URL, sal_True, &pItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( RES_URL, true, &pItem ) ) { const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem; pURLED->SetText( INetURLObject::decode( pFmtURL->GetURL(), @@ -2916,7 +2916,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) } } - if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem)) { pAltNameED->SetText(((const SfxStringItem*)pItem)->GetValue()); pAltNameED->SaveValue(); @@ -2927,7 +2927,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) // insert graphic - properties // bNew is not set, so recognise by selection OUString aTmpName1; - if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_NAME, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_NAME, false, &pItem)) { aTmpName1 = ((const SfxStringItem*)pItem)->GetValue(); } @@ -3036,7 +3036,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) if( (!bHtmlMode || (0 != (nHtmlMode&HTMLMODE_SOME_STYLES))) && sDlgType != "PictureDialog" && sDlgType != "ObjectDialog" && SFX_ITEM_UNKNOWN != ( eState = rSet.GetItemState( - RES_FRAMEDIR, sal_True )) ) + RES_FRAMEDIR, true )) ) { pTextFlowFT->Show(); pTextFlowLB->Show(); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 8de657a2ebbb..40cdc3f3938f 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -530,7 +530,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( this, aSet, pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), SID_EVENTCONFIG ); if ( pMacroDlg && pMacroDlg->Execute() == RET_OK && - SFX_ITEM_SET == pMacroDlg->GetOutputItemSet()->GetItemState( RES_FRMMACRO, sal_False, &pItem ) ) + SFX_ITEM_SET == pMacroDlg->GetOutputItemSet()->GetItemState( RES_FRMMACRO, false, &pItem ) ) { const SvxMacroTableDtor& rTbl = ((SvxMacroItem*)pItem)->GetMacroTable(); pGlossaryHdl->SetMacros( m_pShortNameEdit->GetText(), diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index d2617851130f..6614161eca54 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -86,7 +86,7 @@ static void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq ) static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) { - if( SFX_ITEM_AVAILABLE >= rSet.GetItemState( SID_SAVEDOC, sal_False )) + if( SFX_ITEM_AVAILABLE >= rSet.GetItemState( SID_SAVEDOC, false )) { if( !rSh.GetDoc()->IsModified() ) rSet.DisableItem( SID_SAVEDOC ); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index b4b3595d142c..7c7a3b0ea6d3 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -367,7 +367,7 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) sal_uInt16 nTmpNumLvl = pOutlineDlg ? pOutlineDlg->GetActNumLevel() : 0; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); - if(pExampleSet && pExampleSet->GetItemState(FN_PARAM_NUM_PRESET, sal_False, &pItem)) + if(pExampleSet && pExampleSet->GetItemState(FN_PARAM_NUM_PRESET, false, &pItem)) { bPreset = ((const SfxBoolItem*)pItem)->GetValue(); } @@ -429,7 +429,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet ) pSaveNum = pOutlineDlg->GetNumRule(); m_pLevelLB->EnableMultiSelection(sal_False); } - else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, sal_False, &pItem)) + else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, false, &pItem)) pSaveNum = ((SwUINumRuleItem*)pItem)->GetNumRule(); nActNumLvl = SwOutlineTabDialog::GetActNumLevel(); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 8e803d77ff8c..3b353553f9c6 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -315,7 +315,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) lMaxHeight = rSize.GetSize().Height(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_HEADERSET), sal_False, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_HEADERSET), false, &pItem ) ) { const SfxItemSet& rHeaderSet = ((SvxSetItem*)pItem)->GetItemSet(); const SfxBoolItem& rHeaderOn = @@ -330,7 +330,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) } if( SFX_ITEM_SET == rSet.GetItemState( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_FOOTERSET), - sal_False, &pItem ) ) + false, &pItem ) ) { const SfxItemSet& rFooterSet = ((SvxSetItem*)pItem)->GetItemSet(); const SfxBoolItem& rFooterOn = @@ -344,7 +344,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) } } - if ( rSet.GetItemState( RES_UL_SPACE , sal_False ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( RES_UL_SPACE , false ) == SFX_ITEM_SET ) { const SvxULSpaceItem &rUL = (const SvxULSpaceItem&)rSet.Get( RES_UL_SPACE ); lMaxHeight -= rUL.GetUpper() + rUL.GetLower(); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index d526fdbd2f5e..d498e0887182 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -190,7 +190,7 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) void SwTextGridPage::Reset(const SfxItemSet &rSet) { - if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, sal_True)) + if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, true)) { const SwTextGridItem& rGridItem = (const SwTextGridItem&)rSet.Get(RES_TEXTGRID); RadioButton* pButton = 0; @@ -279,7 +279,7 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) { - if( SFX_ITEM_UNKNOWN != rSet.GetItemState( RES_FRAMEDIR, sal_True )) + if( SFX_ITEM_UNKNOWN != rSet.GetItemState( RES_FRAMEDIR, true )) { const SvxFrameDirectionItem& rDirItem = (const SvxFrameDirectionItem&)rSet.Get(RES_FRAMEDIR); diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index cc24c27c9438..4aa91e0fe147 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -36,7 +36,7 @@ namespace if (pSh->GetCurAttr( aSet )) { const SfxPoolItem* pItem(0); - if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) && pItem) + if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, true, &pItem ) && pItem) { ::boost::optional<sal_uInt16> oNumOffset = ((const SwFmtPageDesc *)pItem)->GetNumOffset(); if (oNumOffset) diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 6e86f14a0873..6e3452f5a2e4 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -344,7 +344,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { const SfxPoolItem* pItem = 0; if(pNewAttrs) - pNewAttrs->GetItemState(nSlot, sal_False, &pItem); + pNewAttrs->GetItemState(nSlot, false, &pItem); if(pItem) { @@ -399,7 +399,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { const SfxPoolItem* pItem = 0; if(pNewAttrs) - pNewAttrs->GetItemState(nSlot, sal_False, &pItem ); + pNewAttrs->GetItemState(nSlot, false, &pItem ); if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED) pOLV->InsertText(((const SfxStringItem *)pItem)->GetValue()); break; @@ -558,7 +558,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; const SfxPoolItem* pPoolItem; - if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, sal_True, &pPoolItem ) ) + if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, true, &pPoolItem ) ) { if( !( (SfxBoolItem*)pPoolItem)->GetValue() ) bLeftToRight = !bLeftToRight; @@ -569,7 +569,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) 0 ); sal_uInt16 nAdjust = SVX_ADJUST_LEFT; - if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) ) + if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) ) nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue(); if( bLeftToRight ) @@ -732,7 +732,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) eAdjust = SVX_ADJUST_BLOCK; if( !pAdjust ) - aEditAttr.GetItemState( EE_PARA_JUST, sal_False, &pAdjust); + aEditAttr.GetItemState( EE_PARA_JUST, false, &pAdjust); if( !pAdjust || IsInvalidItem( pAdjust )) rSet.InvalidateItem( nSlotId ), nSlotId = 0; @@ -760,7 +760,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) nLSpace = 200; if( !pLSpace ) - aEditAttr.GetItemState( EE_PARA_SBL, sal_False, &pLSpace ); + aEditAttr.GetItemState( EE_PARA_SBL, false, &pLSpace ); if( !pLSpace || IsInvalidItem( pLSpace )) rSet.InvalidateItem( nSlotId ), nSlotId = 0; @@ -835,7 +835,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich); if(nEEWhich == EE_CHAR_KERNING) { - SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, sal_True ); + SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true ); if ( eState == SFX_ITEM_DONTCARE ) { rSet.InvalidateItem(EE_CHAR_KERNING); @@ -915,7 +915,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) { sal_uLong nFormat = 0; const SfxPoolItem* pItem; - if ( rReq.GetArgs() && rReq.GetArgs()->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET && + if ( rReq.GetArgs() && rReq.GetArgs()->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET && pItem->ISA(SfxUInt32Item) ) { nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); @@ -1449,7 +1449,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq) sal_uInt16 nId = rReq.GetSlot(); sal_uInt16 nCnt = 1; const SfxPoolItem* pItem=0; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ) ) nCnt = ((SfxUInt16Item*)pItem)->GetValue(); switch( nId ) { @@ -1634,7 +1634,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if( pArgs ) - pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem); OUString sSym; OUString sFontName; @@ -1642,7 +1642,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) { sSym = ((const SfxStringItem*)pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; - pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem); + pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); if ( pFontItem ) sFontName = pFontItem->GetValue(); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index cab5e145f48e..c50b5944fa7e 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -287,7 +287,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pFmt; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pFmt ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pFmt ) ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( @@ -463,7 +463,7 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq) sal_uInt16 nId = rReq.GetSlot(), nCnt = 1; const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pItem )) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem )) nCnt = ((SfxUInt16Item*)pItem)->GetValue(); // #i106349#: save pointer: undo/redo may delete the shell, i.e., this! @@ -772,7 +772,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) SwTableAutoFmt const* pTAFmt = 0; SwTableAutoFmtTbl* pAutoFmtTbl = 0; bool bDeleteFormat = true; - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_1, sal_True, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_1, true, &pItem)) { aInsTblOpts.mnInsMode = 0; // Delimiter @@ -780,7 +780,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if(!sDelim.isEmpty()) cDelim = sDelim[0]; // AutoFormat - if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_2, sal_True, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_2, true, &pItem)) { OUString sAutoFmt = static_cast< const SfxStringItem* >(pItem)->GetValue(); @@ -799,19 +799,19 @@ void SwBaseShell::Execute(SfxRequest &rReq) } } //WithHeader - if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_3, sal_True, &pItem) && + if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_3, true, &pItem) && static_cast< const SfxBoolItem* >(pItem)->GetValue()) aInsTblOpts.mnInsMode |= tabopts::HEADLINE; // RepeatHeaderLines - if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_4, sal_True, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_4, true, &pItem)) aInsTblOpts.mnRowsToRepeat = (sal_uInt16)static_cast< const SfxInt16Item* >(pItem)->GetValue(); //WithBorder - if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_5, sal_True, &pItem) && + if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_5, true, &pItem) && static_cast< const SfxBoolItem* >(pItem)->GetValue()) aInsTblOpts.mnInsMode |= tabopts::DEFAULT_BORDER; //DontSplitTable - if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem) && + if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_6, true, &pItem) && !static_cast< const SfxBoolItem* >(pItem)->GetValue() ) aInsTblOpts.mnInsMode |= tabopts::SPLIT_LAYOUT; } @@ -1111,7 +1111,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) case FN_XFORMS_DESIGN_MODE: if( pArgs != NULL - && pArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET + && pArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET && pItem != NULL && pItem->ISA( SfxBoolItem ) ) { @@ -1138,7 +1138,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if(bMore && pArgs) { pItem = 0; - pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); if(pItem) switch(nSlot) { @@ -1738,7 +1738,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) rSet.Put( SfxBoolItem( nWhich, bValue ) ); } else - rSet.Put( SfxVisibilityItem( nWhich, sal_False ) ); + rSet.Put( SfxVisibilityItem( nWhich, false ) ); break; } nWhich = aIter.NextWhich(); @@ -2329,7 +2329,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) const SfxItemSet* pOutSet = 0; bool bDone = false; if(pArgs) - pArgs->GetItemState( GetPool().GetWhich(nSlot), sal_False, &pItem ); + pArgs->GetItemState( GetPool().GetWhich(nSlot), false, &pItem ); switch ( nSlot ) { diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index 486a159b9ff7..8ba2d2a184df 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -74,7 +74,7 @@ void SwBezierShell::Execute(SfxRequest &rReq) pSdrView->GetModel()->SetChanged(false); const SfxPoolItem* pItem; if(pArgs) - pArgs->GetItemState(nSlotId, sal_False, &pItem); + pArgs->GetItemState(nSlotId, false, &pItem); switch (nSlotId) { diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index df9bb3f104e2..5932d12c999b 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -202,7 +202,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) const SfxPoolItem* pItem; if(pArgs) - pArgs->GetItemState(nSlotId, sal_False, &pItem); + pArgs->GetItemState(nSlotId, false, &pItem); bool bMirror = true; diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 1025e896b148..49612e5458ed 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -79,7 +79,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) case SID_HYPERLINK_SETLINK: { if(pArgs) - pArgs->GetItemState(SID_HYPERLINK_SETLINK, sal_False, &pItem); + pArgs->GetItemState(SID_HYPERLINK_SETLINK, false, &pItem); if(pItem) { SdrView *pSdrView = rSh.GetDrawView(); diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index bff73cf95a51..c19d90caa019 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -105,7 +105,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) pSdrView->GetModel()->SetChanged(false); const SfxPoolItem* pItem = 0; if(pArgs) - pArgs->GetItemState(nSlotId, sal_False, &pItem); + pArgs->GetItemState(nSlotId, false, &pItem); //Special case align by menu if(pItem && nSlotId == SID_OBJECT_ALIGN) @@ -156,7 +156,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) { const SfxPoolItem* pWrapItem; const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); - if(SFX_ITEM_SET == pOutSet->GetItemState(FN_DRAW_WRAP_DLG, sal_False, &pWrapItem)) + if(SFX_ITEM_SET == pOutSet->GetItemState(FN_DRAW_WRAP_DLG, false, &pWrapItem)) { short nLayer = ((const SfxInt16Item*)pWrapItem)->GetValue(); if (nLayer == 1) @@ -275,9 +275,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) bool bPosCorr = SFX_ITEM_SET != pOutSet->GetItemState( - SID_ATTR_TRANSFORM_POS_X, sal_False ) && + SID_ATTR_TRANSFORM_POS_X, false ) && SFX_ITEM_SET != pOutSet->GetItemState( - SID_ATTR_TRANSFORM_POS_Y, sal_False ); + SID_ATTR_TRANSFORM_POS_Y, false ); SfxItemSet aFrmAttrSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END - 1); @@ -285,7 +285,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) const SfxPoolItem* pAnchorItem; if(SFX_ITEM_SET == pOutSet->GetItemState( - SID_ATTR_TRANSFORM_ANCHOR, sal_False, &pAnchorItem)) + SID_ATTR_TRANSFORM_ANCHOR, false, &pAnchorItem)) { if(!bSingleSelection) pSh->ChgAnchor(((const SfxInt16Item*)pAnchorItem) @@ -301,10 +301,10 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) const SfxPoolItem* pHoriRelation = 0; const SfxPoolItem* pHoriPosition = 0; const SfxPoolItem* pHoriMirror = 0; - pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_ORIENT, sal_False, &pHoriOrient); - pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_RELATION, sal_False, &pHoriRelation); - pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_POSITION, sal_False, &pHoriPosition); - pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_MIRROR, sal_False, &pHoriMirror); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_ORIENT, false, &pHoriOrient); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_RELATION, false, &pHoriRelation); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_POSITION, false, &pHoriPosition); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_MIRROR, false, &pHoriMirror); if(pHoriOrient || pHoriRelation || pHoriPosition || pHoriMirror) { if(pHoriOrient) @@ -323,9 +323,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) const SfxPoolItem* pVertOrient = 0; const SfxPoolItem* pVertRelation = 0; const SfxPoolItem* pVertPosition = 0; - pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_ORIENT, sal_False, &pVertOrient); - pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_RELATION, sal_False, &pVertRelation); - pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_POSITION, sal_False, &pVertPosition); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_ORIENT, false, &pVertOrient); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_RELATION, false, &pVertRelation); + pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_POSITION, false, &pVertPosition); if(pVertOrient || pVertRelation || pVertPosition ) { if(pVertOrient) @@ -339,7 +339,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) aFrmAttrSet.Put( aVOrient ); } const SfxPoolItem* pFollowItem = 0; - pOutSet->GetItemState(RES_FOLLOW_TEXT_FLOW, sal_False, &pFollowItem); + pOutSet->GetItemState(RES_FOLLOW_TEXT_FLOW, false, &pFollowItem); if(pFollowItem) aFrmAttrSet.Put(*pFollowItem); diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 0b5a0b97484d..2f9c543ad0cb 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -461,7 +461,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) { const SfxPoolItem* pItem = 0; if(pNewAttrs) - pNewAttrs->GetItemState(nSlot, sal_False, &pItem); + pNewAttrs->GetItemState(nSlot, false, &pItem); if(pItem) { @@ -519,7 +519,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; const SfxPoolItem* pPoolItem; - if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, sal_True, &pPoolItem ) ) + if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, true, &pPoolItem ) ) { if( !( (SfxBoolItem*)pPoolItem)->GetValue() ) bLeftToRight = !bLeftToRight; @@ -530,7 +530,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) 0 ); sal_uInt16 nAdjust = SVX_ADJUST_LEFT; - if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) ) + if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) ) nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue(); if( bLeftToRight ) @@ -653,7 +653,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) ASK_ADJUST: { if( !pAdjust ) - aEditAttr.GetItemState( EE_PARA_JUST, sal_False, &pAdjust); + aEditAttr.GetItemState( EE_PARA_JUST, false, &pAdjust); if( !pAdjust || IsInvalidItem( pAdjust )) rSet.InvalidateItem( nSlotId ), nSlotId = 0; @@ -710,7 +710,7 @@ ASK_ADJUST: ASK_LINESPACE: { if( !pLSpace ) - aEditAttr.GetItemState( EE_PARA_SBL, sal_False, &pLSpace ); + aEditAttr.GetItemState( EE_PARA_SBL, false, &pLSpace ); if( !pLSpace || IsInvalidItem( pLSpace )) rSet.InvalidateItem( nSlotId ), nSlotId = 0; diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index f4e162a22a4a..885776080f43 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -412,7 +412,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) const SfxPoolItem* pItem = 0; if(pNewAttrs) { - pNewAttrs->GetItemState(nSlot, sal_False, &pItem ); + pNewAttrs->GetItemState(nSlot, false, &pItem ); pOLV->InsertText(((const SfxStringItem *)pItem)->GetValue()); } break; @@ -524,7 +524,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq) { case SID_UNDO: case SID_REDO: - if( SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pItem ) && + if( SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ) && 1 < (nCnt = ((SfxUInt16Item*)pItem)->GetValue()) ) { // then we make by ourself. @@ -692,7 +692,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if( pArgs ) - pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem); OUString sSym; OUString sFontName; @@ -700,7 +700,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) { sSym = ((const SfxStringItem*)pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; - pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem); + pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); if ( pFontItem ) sFontName = pFontItem->GetValue(); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 5467a6f32774..f9ed0949a836 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -156,7 +156,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) { // Frame already exists, only the number of columns will be changed. sal_uInt16 nCols = 1; - if(pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET) nCols = ((SfxUInt16Item *)pItem)->GetValue(); SfxItemSet aSet(GetPool(),RES_COL,RES_COL); @@ -188,7 +188,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) case SID_HYPERLINK_SETLINK: { - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_HYPERLINK_SETLINK, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_HYPERLINK_SETLINK, false, &pItem)) { const SvxHyperlinkItem& rHLinkItem = *(const SvxHyperlinkItem *)pItem; const OUString& rURL = rHLinkItem.GetURL(); @@ -360,7 +360,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) case SID_ATTR_ULSPACE: case SID_ATTR_LRSPACE: { - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem)) { aMgr.SetAttrSet( *pArgs ); bCopyToFmt = true; @@ -373,13 +373,13 @@ void SwFrameShell::Execute(SfxRequest &rReq) bool bApplyNewSize = false; Size aNewSize = aMgr.GetSize(); - if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_WIDTH, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_WIDTH, false, &pItem ) ) { aNewSize.setWidth( static_cast< const SfxUInt32Item* >(pItem)->GetValue() ); bApplyNewSize = true; } - if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_HEIGHT, sal_False, &pItem ) ) + if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_HEIGHT, false, &pItem ) ) { aNewSize.setHeight( static_cast< const SfxUInt32Item* >(pItem)->GetValue() ); bApplyNewSize = true; @@ -463,7 +463,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) ); OString sDefPage; - if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, false, &pItem) == SFX_ITEM_SET) sDefPage = OUStringToOString(((SfxStringItem *)pItem)->GetValue(), RTL_TEXTENCODING_UTF8); aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame()->GetTopFrame())); @@ -494,13 +494,13 @@ void SwFrameShell::Execute(SfxRequest &rReq) { rReq.Done(*pOutSet); if(nSel & nsSelectionType::SEL_OLE && - SFX_ITEM_SET == pOutSet->GetItemState(FN_KEEP_ASPECT_RATIO, sal_True, &pItem)) + SFX_ITEM_SET == pOutSet->GetItemState(FN_KEEP_ASPECT_RATIO, true, &pItem)) { SwViewOption aUsrPref( *pVOpt ); aUsrPref.SetKeepRatio(((const SfxBoolItem*)pItem)->GetValue()); SW_MOD()->ApplyUsrPref(aUsrPref, &GetView()); } - if (SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_ALT_NAME, sal_True, &pItem)) + if (SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_ALT_NAME, true, &pItem)) { // #i73249# rSh.SetObjTitle(((const SfxStringItem*)pItem)->GetValue()); @@ -511,7 +511,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) { rSh.AutoUpdateFrame(pFmt, *pOutSet); // Anything which is not supported by the format must be set hard. - if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, sal_False, &pItem)) + if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem)) rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue()); SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, RES_SURROUND, RES_SURROUND, @@ -520,7 +520,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) 0); aShellSet.Put(*pOutSet); aMgr.SetAttrSet(aShellSet); - if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, sal_False, &pItem)) + if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem)) rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue()); } else @@ -529,7 +529,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) const SwFrmFmt* pCurrFlyFmt = rSh.GetFlyFrmFmt(); if(SFX_ITEM_SET == pOutSet->GetItemState(FN_PARAM_CHAIN_PREVIOUS, - sal_False, &pItem)) + false, &pItem)) { rSh.HideChainMarker(); @@ -563,7 +563,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) rSh.SetChainMarker(); } if(SFX_ITEM_SET == - pOutSet->GetItemState(FN_PARAM_CHAIN_NEXT, sal_False, + pOutSet->GetItemState(FN_PARAM_CHAIN_NEXT, false, &pItem)) { rSh.HideChainMarker(); @@ -814,7 +814,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) SfxItemSet aURLSet(GetPool(), RES_URL, RES_URL); rSh.GetFlyFrmAttr( aURLSet ); - if(SFX_ITEM_SET == aURLSet.GetItemState(RES_URL, sal_True, &pItem)) + if(SFX_ITEM_SET == aURLSet.GetItemState(RES_URL, true, &pItem)) { const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem; aHLinkItem.SetURL(pFmtURL->GetURL()); @@ -986,7 +986,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) { case SID_ATTR_BORDER: { - if (pArgs->GetItemState(RES_BOX, sal_True, &pItem) == SFX_ITEM_SET) + if (pArgs->GetItemState(RES_BOX, true, &pItem) == SFX_ITEM_SET) { SvxBoxItem aNewBox(*((SvxBoxItem *)pItem)); const SvxBorderLine* pBorderLine; @@ -1032,7 +1032,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) case SID_FRAME_LINESTYLE: { - if (pArgs->GetItemState(SID_FRAME_LINESTYLE, sal_False, &pItem) == SFX_ITEM_SET) + if (pArgs->GetItemState(SID_FRAME_LINESTYLE, false, &pItem) == SFX_ITEM_SET) { const SvxLineItem* pLineItem = (const SvxLineItem*)pItem; @@ -1086,7 +1086,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) case SID_FRAME_LINECOLOR: { - if (pArgs->GetItemState(SID_FRAME_LINECOLOR, sal_False, &pItem) == SFX_ITEM_SET) + if (pArgs->GetItemState(SID_FRAME_LINECOLOR, false, &pItem) == SFX_ITEM_SET) { const Color& rNewColor = ((const SvxColorItem*)pItem)->GetValue(); diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 0ad28795b5b8..b8c9b422396a 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -330,7 +330,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) rReq.Done(*pSet); // change the 2 frmsize SizeItems to the correct SwFrmSizeItem if( SFX_ITEM_SET == pSet->GetItemState( - SID_ATTR_GRAF_FRMSIZE, sal_False, &pItem )) + SID_ATTR_GRAF_FRMSIZE, false, &pItem )) { SwFmtFrmSize aSize; const Size& rSz = ((SvxSizeItem*)pItem)->GetSize(); @@ -338,7 +338,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSize.SetHeight( rSz.Height() ); if( SFX_ITEM_SET == pSet->GetItemState( - SID_ATTR_GRAF_FRMSIZE_PERCENT, sal_False, &pItem )) + SID_ATTR_GRAF_FRMSIZE_PERCENT, false, &pItem )) { const Size& rRelativeSize = ((SvxSizeItem*)pItem)->GetSize(); aSize.SetWidthPercent( static_cast< sal_uInt8 >( rRelativeSize.Width() ) ); @@ -368,14 +368,14 @@ void SwGrfShell::Execute(SfxRequest &rReq) bool bApplyUsrPref = false; if (SFX_ITEM_SET == pSet->GetItemState( - FN_KEEP_ASPECT_RATIO, sal_True, &pItem )) + FN_KEEP_ASPECT_RATIO, true, &pItem )) { aUsrPref.SetKeepRatio( ((const SfxBoolItem*)pItem)->GetValue() ); bApplyUsrPref = true; } if( SFX_ITEM_SET == pSet->GetItemState( - SID_ATTR_GRAF_KEEP_ZOOM, sal_True, &pItem )) + SID_ATTR_GRAF_KEEP_ZOOM, true, &pItem )) { aUsrPref.SetGrfKeepZoom( ((const SfxBoolItem*)pItem)->GetValue() ); @@ -387,7 +387,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) // and now set all the graphic attributes and other stuff if( SFX_ITEM_SET == pSet->GetItemState( - SID_ATTR_GRAF_GRAPHIC, sal_True, &pItem )) + SID_ATTR_GRAF_GRAPHIC, true, &pItem )) { if( !((SvxBrushItem*)pItem)->GetGraphicLink().isEmpty() ) sGrfNm = ((SvxBrushItem*)pItem)->GetGraphicLink(); @@ -414,7 +414,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) } } if ( SFX_ITEM_SET == pSet->GetItemState( - FN_SET_FRM_ALT_NAME, sal_True, &pItem )) + FN_SET_FRM_ALT_NAME, true, &pItem )) { // #i73249# rSh.SetObjTitle( ((const SfxStringItem*)pItem)->GetValue() ); @@ -461,7 +461,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; sal_uInt16 nSlot = rReq.GetSlot(); - if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, sal_False, &pItem )) + if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, false, &pItem )) pItem = 0; switch( nSlot ) diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 07af97ce38e6..f28c80e13457 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -426,7 +426,7 @@ namespace SwLangHelper LanguageType nLang = LANGUAGE_SYSTEM; const SfxPoolItem *pItem = 0; - SfxItemState nState = aSet.GetItemState( nLangWhichId, sal_True, &pItem ); + SfxItemState nState = aSet.GetItemState( nLangWhichId, true, &pItem ); if (nState > SFX_ITEM_DEFAULT && pItem) { // the item is set and can be used diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index 9666079beadf..6f9671c42322 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -110,7 +110,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) { const SfxPoolItem* pItem; - if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, sal_False, &pItem ) ) ) + if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, false, &pItem ) ) ) pItem = NULL; if( pItem ) diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx index f821f4cbfac3..012d919b8d20 100644 --- a/sw/source/ui/shells/navsh.cxx +++ b/sw/source/ui/shells/navsh.cxx @@ -53,7 +53,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq) SwNavigationMgr& aSwNavigationMgr = pSh->GetNavigationMgr(); const SfxPoolItem* pItem; if(pArgs) - pArgs->GetItemState(nSlotId, sal_False, &pItem); + pArgs->GetItemState(nSlotId, false, &pItem); switch (nSlotId) { case FN_NAVIGATION_BACK: diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index f94e04455d22..d315be15c2f0 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -269,7 +269,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, SwViewOption aUsrPref( *rSh.GetViewOptions() ); sal_uInt16 nBackgroundDestination = aUsrPref.GetTblDest(); - if(SFX_ITEM_SET == rSet.GetItemState(SID_BACKGRND_DESTINATION, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_BACKGRND_DESTINATION, false, &pItem)) { nBackgroundDestination = ((SfxUInt16Item*)pItem)->GetValue(); aUsrPref.SetTblDest((sal_uInt8)nBackgroundDestination); @@ -278,14 +278,14 @@ void ItemSetToTableParam( const SfxItemSet& rSet, bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) || SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); pItem = 0; - bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); + bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, false, &pItem ); const SfxPoolItem* pRowItem = 0, *pTableItem = 0; - bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem ); - bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem ); + bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, false, &pRowItem ); + bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false, &pTableItem ); const SfxPoolItem* pSplit = 0; - bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pSplit ); + bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, false, &pSplit ); const SfxPoolItem* pBoxDirection = 0; - bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection ); + bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, false, &pBoxDirection ); if( bBackground || bBorder || bRowSplit || bBoxDirection) { // The border will be applied to the present selection. @@ -350,7 +350,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, SwTableRep* pRep = 0; SwFrmFmt *pFmt = rSh.GetTableFmt(); SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); - if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem )) { pRep = (SwTableRep*)((const SwPtrItem*)pItem)->GetValue(); @@ -392,13 +392,13 @@ void ItemSetToTableParam( const SfxItemSet& rSet, } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem)) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem)) rSh.SetRowsToRepeat( ((SfxUInt16Item*)pItem)->GetValue() ); - if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_SET_VERT_ALIGN, sal_False, &pItem)) + if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_SET_VERT_ALIGN, false, &pItem)) rSh.SetBoxAlign(((SfxUInt16Item*)(pItem))->GetValue()); - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, false, &pItem )) rSh.SetTableName( *pFmt, ((const SfxStringItem*)pItem)->GetValue() ); // Copy the chosen attributes in the ItemSet. @@ -417,7 +417,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, 0 }; for( const sal_uInt16* pIds = aIds; *pIds; ++pIds ) - if( SFX_ITEM_SET == rSet.GetItemState( *pIds, sal_False, &pItem)) + if( SFX_ITEM_SET == rSet.GetItemState( *pIds, false, &pItem)) aSet.Put( *pItem ); if( aSet.Count() ) @@ -453,7 +453,7 @@ void SwTableShell::Execute(SfxRequest &rReq) const SfxPoolItem* pItem = 0; sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); bool bCallDone = false; switch ( nSlot ) { @@ -473,7 +473,7 @@ void SwTableShell::Execute(SfxRequest &rReq) const SvxBoxItem& rCoreBox = (const SvxBoxItem&) aCoreSet.Get(RES_BOX); const SfxPoolItem *pBoxItem = 0; - if ( pArgs->GetItemState(RES_BOX, sal_True, &pBoxItem) == SFX_ITEM_SET ) + if ( pArgs->GetItemState(RES_BOX, true, &pBoxItem) == SFX_ITEM_SET ) { aBox = *(SvxBoxItem*)pBoxItem; if ( !rReq.IsAPI() ) @@ -486,9 +486,9 @@ void SwTableShell::Execute(SfxRequest &rReq) //since the drawing layer also supports borders the which id might be a different one SvxBoxInfoItem aInfo( SID_ATTR_BORDER_INNER ); - if (pArgs->GetItemState(SID_ATTR_BORDER_INNER, sal_True, &pBoxItem) == SFX_ITEM_SET) + if (pArgs->GetItemState(SID_ATTR_BORDER_INNER, true, &pBoxItem) == SFX_ITEM_SET) aInfo = *(SvxBoxInfoItem*)pBoxItem; - else if( pArgs->GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_True, &pBoxItem) == SFX_ITEM_SET ) + else if( pArgs->GetItemState(SDRATTR_TABLE_BORDER_INNER, true, &pBoxItem) == SFX_ITEM_SET ) { aInfo = *(SvxBoxInfoItem*)pBoxItem; aInfo.SetWhich(SID_ATTR_BORDER_INNER); @@ -666,7 +666,7 @@ void SwTableShell::Execute(SfxRequest &rReq) } if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState( - SID_ATTR_NUMBERFORMAT_VALUE, sal_False, &pNumberFormatItem )) + SID_ATTR_NUMBERFORMAT_VALUE, false, &pNumberFormatItem )) { SfxItemSet aBoxFormatSet( *aCoreSet.GetPool(), RES_BOXATR_FORMAT, RES_BOXATR_FORMAT ); @@ -824,7 +824,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if (pItem) { nCount = ((const SfxInt16Item* )pItem)->GetValue(); - if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_INSERT_AFTER, sal_True, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_INSERT_AFTER, true, &pItem)) bAfter = ((const SfxBoolItem* )pItem)->GetValue(); } else if( !rReq.IsAPI() ) @@ -1420,7 +1420,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) const SfxPoolItem* pItem = 0; sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); // Always aquire the language from the current cursor position. LanguageType eLang = rSh.GetCurLang(); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 047723733309..2c3c5e8734b3 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -95,7 +95,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) sal_uInt16 nSlot = rReq.GetSlot(); const SfxItemSet* pArgs = rReq.GetArgs(); if(pArgs) - pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); Window *pMDI = &GetView().GetViewFrame()->GetWindow(); bool bMore = false; @@ -213,30 +213,30 @@ void SwTextShell::ExecField(SfxRequest &rReq) sal_Int32 nCommand = 0; if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_TYPE, - sal_False, &pItem )) + false, &pItem )) nType = ((SfxUInt16Item *)pItem)->GetValue(); aPar1 += OUString(DB_DELIM); if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_1, sal_False, &pItem )) + FN_PARAM_1, false, &pItem )) { aPar1 += ((SfxStringItem *)pItem)->GetValue(); } if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_3, sal_False, &pItem )) + FN_PARAM_3, false, &pItem )) nCommand = ((SfxInt32Item*)pItem)->GetValue(); aPar1 += OUString(DB_DELIM); aPar1 += OUString::number(nCommand); aPar1 += OUString(DB_DELIM); if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_2, sal_False, &pItem )) + FN_PARAM_2, false, &pItem )) { aPar1 += ((SfxStringItem *)pItem)->GetValue(); } if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_FIELD_CONTENT, sal_False, &pItem )) + FN_PARAM_FIELD_CONTENT, false, &pItem )) aPar2 = ((SfxStringItem *)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_FIELD_FORMAT, sal_False, &pItem )) + FN_PARAM_FIELD_FORMAT, false, &pItem )) nFormat = ((SfxUInt32Item *)pItem)->GetValue(); OSL_FAIL("Command is not yet used"); sal_Unicode cSeparator = ' '; @@ -260,19 +260,19 @@ void SwTextShell::ExecField(SfxRequest &rReq) sal_Unicode cSeparator = ' '; if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_TYPE, - sal_False, &pItem )) + false, &pItem )) nType = ((SfxUInt16Item *)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_SUBTYPE, - sal_False, &pItem )) + false, &pItem )) nSubType = ((SfxUInt16Item *)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_FIELD_CONTENT, sal_False, &pItem )) + FN_PARAM_FIELD_CONTENT, false, &pItem )) aPar2 = ((SfxStringItem *)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_FIELD_FORMAT, sal_False, &pItem )) + FN_PARAM_FIELD_FORMAT, false, &pItem )) nFormat = ((SfxUInt32Item *)pItem)->GetValue(); if( SFX_ITEM_SET == pArgs->GetItemState( - FN_PARAM_3, sal_False, &pItem )) + FN_PARAM_3, false, &pItem )) { OUString sTmp = ((SfxStringItem *)pItem)->GetValue(); if(!sTmp.isEmpty()) @@ -779,7 +779,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem) rSh.GetCurAttr( aSet ); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem)) + if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem)) { // Select links rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT, sal_False); diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx index 89d02edf5190..365534a38549 100644 --- a/sw/source/ui/shells/textglos.cxx +++ b/sw/source/ui/shells/textglos.cxx @@ -43,7 +43,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if(pArgs) - pArgs->GetItemState(nSlot, sal_False, &pItem ); + pArgs->GetItemState(nSlot, false, &pItem ); switch( nSlot ) { @@ -65,10 +65,10 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) { OUString aGroup = (( const SfxStringItem *)pItem)->GetValue(); OUString aName; - if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem )) + if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem )) aName = (( const SfxStringItem *)pItem)->GetValue(); OUString aShortName; - if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_2, sal_False, &pItem )) + if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_2, false, &pItem )) aShortName = (( const SfxStringItem *)pItem)->GetValue(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -101,7 +101,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) { OUString aGroup = (( const SfxStringItem *)pItem)->GetValue(); OUString aName; - if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem )) + if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem )) aName = (( const SfxStringItem *)pItem)->GetValue(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index a81641c1bfbb..2b8b4197bf57 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -47,7 +47,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) const SfxPoolItem* pItem = 0; sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState(nSlot, sal_False, &pItem ); + pArgs->GetItemState(nSlot, false, &pItem ); SfxViewFrame* pVFrame = GetView().GetViewFrame(); Window *pMDI = &pVFrame->GetWindow(); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 7a9e181c7c7f..daa0b1c4f663 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -137,7 +137,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) const SfxPoolItem* pItem = 0; sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState(nSlot, sal_False, &pItem ); + pArgs->GetItemState(nSlot, false, &pItem ); switch( nSlot ) { @@ -479,9 +479,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if(pArgs) { if(FN_INSERT_FRAME_INTERACT_NOCOL != nSlot && - pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET) + pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET) nCols = ((SfxUInt16Item *)pItem)->GetValue(); - if(pArgs->GetItemState(SID_MODIFIER, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs->GetItemState(SID_MODIFIER, false, &pItem) == SFX_ITEM_SET) bModifier1 |= KEY_MOD1 == ((SfxUInt16Item *)pItem)->GetValue(); } if(bModifier1 ) @@ -534,13 +534,13 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aSize.Width() = GetShell().GetAnyCurRect(RECT_PAGE_PRT).Width(); Point aPos = aMgr.GetPos(); RndStdIds eAnchor = FLY_AT_PARA; - if(pArgs->GetItemState(nSlot, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs->GetItemState(nSlot, false, &pItem) == SFX_ITEM_SET) eAnchor = (RndStdIds)((SfxUInt16Item *)pItem)->GetValue(); - if(pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs->GetItemState(FN_PARAM_1, false, &pItem) == SFX_ITEM_SET) aPos = ((SfxPointItem *)pItem)->GetValue(); - if(pArgs->GetItemState(FN_PARAM_2, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs->GetItemState(FN_PARAM_2, false, &pItem) == SFX_ITEM_SET) aSize = ((SvxSizeItem *)pItem)->GetSize(); - if(pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET) + if(pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET) { sal_uInt16 nCols = ((SfxUInt16Item *)pItem)->GetValue(); if( !bSingleCol && 1 < nCols ) @@ -765,7 +765,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) SvxHyperlinkItem aHLinkItem; const SfxPoolItem* pItem; - if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem)) + if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem)) { const SwFmtINetFmt* pINetFmt = (const SwFmtINetFmt*)pItem; aHLinkItem.SetURL(pINetFmt->GetValue()); @@ -962,14 +962,14 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if( pArgs ) - pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem); OUString aChars, aFontName; if ( pItem ) { aChars = ((const SfxStringItem*)pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; - pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem); + pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); if ( pFontItem ) aFontName = pFontItem->GetValue(); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 4be8724d0460..177bd892aa92 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -200,7 +200,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const sal_Int32 nInsert = 0; // The old item is for unknown reasons back in the set again. - if( !bSelectionPut && SFX_ITEM_SET == aTmpSet.GetItemState(FN_PARAM_SELECTION, sal_False, &pSelectionItem) ) + if( !bSelectionPut && SFX_ITEM_SET == aTmpSet.GetItemState(FN_PARAM_SELECTION, false, &pSelectionItem) ) { OUString sInsert = ((const SfxStringItem*)pSelectionItem)->GetValue(); bInsert = !sInsert.isEmpty(); @@ -276,7 +276,7 @@ void SwTextShell::Execute(SfxRequest &rReq) const SfxPoolItem* pItem = 0; sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); switch( nSlot ) { case SID_LANGUAGE_STATUS: @@ -880,7 +880,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( pArgs ) { const SfxPoolItem* pPaMItem = 0; - pArgs->GetItemState( GetPool().GetWhich( FN_PARAM_PAM ), sal_False, &pPaMItem ); + pArgs->GetItemState( GetPool().GetWhich( FN_PARAM_PAM ), false, &pPaMItem ); if ( pPaMItem ) pPaM = static_cast< const SwPaMItem* >( pPaMItem )->GetValue( ); } @@ -981,7 +981,7 @@ void SwTextShell::Execute(SfxRequest &rReq) // Apply defaults if nessecary. pSet = (SfxItemSet*)pDlg->GetOutputItemSet(); sal_uInt16 nNewDist; - if( SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, sal_False, &pItem ) && + if( SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, false, &pItem ) && nDefDist != (nNewDist = ((SfxUInt16Item*)pItem)->GetValue()) ) { SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ); @@ -990,13 +990,13 @@ void SwTextShell::Execute(SfxRequest &rReq) pSet->ClearItem( SID_ATTR_TABSTOP_DEFAULTS ); } - if ( SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_1,sal_False,&pItem) ) + if ( SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_1,false,&pItem) ) { pSet->Put(SfxStringItem(FN_DROP_TEXT, ((const SfxStringItem*)pItem)->GetValue())); pSet->ClearItem(FN_PARAM_1); } - if( SFX_ITEM_SET == pSet->GetItemState( RES_PARATR_DROP, sal_False, &pItem )) + if( SFX_ITEM_SET == pSet->GetItemState( RES_PARATR_DROP, false, &pItem )) { OUString sCharStyleName; if(((const SwFmtDrop*)pItem)->GetCharFmt()) @@ -1022,7 +1022,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if( pSet->Count() ) { rWrtSh.StartAction(); - if ( SFX_ITEM_SET == pSet->GetItemState(FN_DROP_TEXT, sal_False, &pItem) ) + if ( SFX_ITEM_SET == pSet->GetItemState(FN_DROP_TEXT, false, &pItem) ) { if ( !((SfxStringItem*)pItem)->GetValue().isEmpty() ) rWrtSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue(), pPaM); @@ -1243,7 +1243,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if(pItem) sStyleName = ((const SfxStringItem*)pItem)->GetValue(); sal_Bool bOn = sal_True; - if( SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem)) + if( SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem)) bOn = ((const SfxBoolItem*)pItem)->GetValue(); rWrtSh.ChangeHeaderOrFooter(sStyleName, FN_INSERT_PAGEHEADER == nSlot, bOn, !rReq.IsAPI()); rReq.Done(); @@ -1261,7 +1261,7 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_SELECTION_MODE_BLOCK : { bool bSetBlockMode = !rWrtSh.IsBlockMode(); - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem)) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem)) bSetBlockMode = ((const SfxBoolItem*)pItem)->GetValue(); if( ( nSlot == FN_SELECTION_MODE_DEFAULT ) != bSetBlockMode ) rWrtSh.EnterBlockMode(); @@ -1279,7 +1279,7 @@ void SwTextShell::Execute(SfxRequest &rReq) RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rWrtSh.GetCurAttr(aSet); - if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, sal_True )) + if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true )) { const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, sal_True) ); if( nSlot == FN_COPY_HYPERLINK_LOCATION ) @@ -1625,7 +1625,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, sal_True ) || rSh.HasReadonlySel()) + if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, true ) || rSh.HasReadonlySel()) { rSet.DisableItem(nWhich); } @@ -1639,7 +1639,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) rSh.GetCurAttr(aSet); // If a hyperlink is selected, either alone or along with other text... - if( ((SFX_ITEM_DONTCARE & aSet.GetItemState( RES_TXTATR_INETFMT, sal_True )) == 0) || rSh.HasReadonlySel()) + if( ((SFX_ITEM_DONTCARE & aSet.GetItemState( RES_TXTATR_INETFMT, true )) == 0) || rSh.HasReadonlySel()) { rSet.DisableItem(nWhich); } @@ -1678,7 +1678,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, sal_False )) + if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, false )) rSet.DisableItem(nWhich); } break; diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 65dd2e07a1aa..ebd67d2a4d8a 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -99,29 +99,29 @@ void SwTextShell::ExecDB(SfxRequest &rReq) const SfxPoolItem* pSelectionItem = 0; // first get the selection of rows to be inserted - pArgs->GetItemState(FN_DB_DATA_SELECTION_ANY, sal_False, &pSelectionItem); + pArgs->GetItemState(FN_DB_DATA_SELECTION_ANY, false, &pSelectionItem); Sequence<Any> aSelection; if(pSelectionItem) ((SfxUsrAnyItem*)pSelectionItem)->GetValue() >>= aSelection; // get the data source name - pArgs->GetItemState(FN_DB_DATA_SOURCE_ANY, sal_False, &pSourceItem); + pArgs->GetItemState(FN_DB_DATA_SOURCE_ANY, false, &pSourceItem); if(pSourceItem) ((const SfxUsrAnyItem*)pSourceItem)->GetValue() >>= sSourceArg; // get the command - pArgs->GetItemState(FN_DB_DATA_COMMAND_ANY, sal_False, &pCommandItem); + pArgs->GetItemState(FN_DB_DATA_COMMAND_ANY, false, &pCommandItem); if(pCommandItem) ((const SfxUsrAnyItem*)pCommandItem)->GetValue() >>= sCommandArg; // get the command type - pArgs->GetItemState(FN_DB_DATA_COMMAND_TYPE_ANY, sal_False, &pCommandTypeItem); + pArgs->GetItemState(FN_DB_DATA_COMMAND_TYPE_ANY, false, &pCommandTypeItem); if(pCommandTypeItem) ((const SfxUsrAnyItem*)pCommandTypeItem)->GetValue() >>= nCommandTypeArg; Reference<XConnection> xConnection; - pArgs->GetItemState(FN_DB_CONNECTION_ANY, sal_False, &pConnectionItem); + pArgs->GetItemState(FN_DB_CONNECTION_ANY, false, &pConnectionItem); if ( pConnectionItem ) ((const SfxUsrAnyItem*)pConnectionItem)->GetValue() >>= xConnection; // may be we even get no connection @@ -135,7 +135,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) // get the cursor, we use to travel, may be NULL Reference<XResultSet> xCursor; - pArgs->GetItemState(FN_DB_DATA_CURSOR_ANY, sal_False, &pCursorItem); + pArgs->GetItemState(FN_DB_DATA_CURSOR_ANY, false, &pCursorItem); if ( pCursorItem ) ((const SfxUsrAnyItem*)pCursorItem)->GetValue() >>= xCursor; @@ -192,8 +192,8 @@ void SwTextShell::ExecDB(SfxRequest &rReq) const SfxPoolItem* pColumnItem = 0; const SfxPoolItem* pColumnNameItem = 0; - pArgs->GetItemState(FN_DB_COLUMN_ANY, sal_False, &pColumnItem); - pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, sal_False, &pColumnNameItem); + pArgs->GetItemState(FN_DB_COLUMN_ANY, false, &pColumnItem); + pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, false, &pColumnNameItem); OUString sColumnName; if(pColumnNameItem) diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index c52aaa29d9df..0c1df19d6d21 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -71,7 +71,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) if(pArgs ) { const SfxPoolItem* pItem; - pArgs->GetItemState(nWhich, sal_False, &pItem); + pArgs->GetItemState(nWhich, false, &pItem); eState = ((const SfxBoolItem &) pArgs-> Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF; } @@ -335,7 +335,7 @@ SET_LINESPACE: RES_PARATR_ADJUST, RES_PARATR_ADJUST ); GetShell().GetCurAttr(aAdjustSet); bool bChgAdjust = false; - SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, sal_False); + SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, false); if(eAdjustState >= SFX_ITEM_DEFAULT) { int eAdjust = (int)(( const SvxAdjustItem& ) @@ -410,7 +410,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); + pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); switch ( nSlot ) { case FN_DROP_CHAR_STYLE_NAME: @@ -450,7 +450,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) { rSh.StartAction(); rSh.StartUndo( UNDO_START ); - if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,sal_False,&pItem) ) + if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,false,&pItem) ) { if ( !((SfxStringItem*)pItem)->GetValue().isEmpty() ) rSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue()); @@ -507,7 +507,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) SfxBoolItem aFlagItem; const SfxPoolItem* pItem = 0; int eAdjust = -1; // Illegal value to recognize DONTCARE. - SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, sal_False, &pItem); + SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, false, &pItem); if( SFX_ITEM_DEFAULT == eState ) pItem = &rPool.GetDefaultItem(RES_PARATR_ADJUST); @@ -515,14 +515,14 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) eAdjust = (int)(( SvxAdjustItem* ) pItem)->GetAdjust(); short nEsc = 0; - eState = aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, sal_False, &pItem); + eState = aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, false, &pItem); if( SFX_ITEM_DEFAULT == eState ) pItem = &rPool.GetDefaultItem(RES_CHRATR_ESCAPEMENT); if( eState >= SFX_ITEM_DEFAULT ) nEsc = ((SvxEscapementItem* )pItem)->GetEsc(); sal_uInt16 nLineSpace = 0; - eState = aCoreSet.GetItemState(RES_PARATR_LINESPACING, sal_False, &pItem); + eState = aCoreSet.GetItemState(RES_PARATR_LINESPACING, false, &pItem); if( SFX_ITEM_DEFAULT == eState ) pItem = &rPool.GetDefaultItem(RES_PARATR_LINESPACING); if( SFX_ITEM_DEFAULT <= eState && @@ -671,7 +671,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) // is the item set? sal_uInt16 nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell()); if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) && - aCoreSet.GetItemState( RES_FRAMEDIR, sal_False ) >= SFX_ITEM_DEFAULT) + aCoreSet.GetItemState( RES_FRAMEDIR, false ) >= SFX_ITEM_DEFAULT) { SvxFrameDirection eFrmDir = (SvxFrameDirection) ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index 926424f3dc2c..1c0b43e1181a 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.cxx @@ -54,9 +54,9 @@ void SwTextShell::ExecBasicMove(SfxRequest &rReq) if(pArgs) { const SfxPoolItem *pItem; - if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_COUNT, sal_True, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_COUNT, true, &pItem)) nCount = ((const SfxInt32Item *)pItem)->GetValue(); - if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_SELECTION, sal_True, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_SELECTION, true, &pItem)) bSelect = ((const SfxBoolItem *)pItem)->GetValue(); } switch(rReq.GetSlot()) diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index f82d828b0a98..d953dc297655 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -190,7 +190,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) const SfxPoolItem* pItem; if( RET_OK == nRet ) { - if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState( SID_ATTR_NUMBERING_RULE, sal_False, &pItem )) + if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState( SID_ATTR_NUMBERING_RULE, false, &pItem )) { rReq.AppendItem(*pItem); rReq.Done(); @@ -210,7 +210,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) } // If the Dialog was leaved with OK but nothing was chosen then the // numbering must be at least activated, if it is not already. - else if( !pCurRule && SFX_ITEM_SET == aSet.GetItemState( SID_ATTR_NUMBERING_RULE, sal_False, &pItem )) + else if( !pCurRule && SFX_ITEM_SET == aSet.GetItemState( SID_ATTR_NUMBERING_RULE, false, &pItem )) { rReq.AppendItem( *pItem ); rReq.Done(); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 124a5153d4dd..c464cd93435c 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -94,7 +94,7 @@ SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)) bHtmlMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); bool bCTL = SW_MOD()->GetCTLOptions().IsCTLFontEnabled(); @@ -449,13 +449,13 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) SetMetric(*m_pBottomMF, aMetric); //Name - if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, false, &pItem )) { m_pNameED->SetText(((const SfxStringItem*)pItem)->GetValue()); m_pNameED->SaveValue(); } - if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem )) { pTblData = (SwTableRep*)((const SwPtrItem*) pItem)->GetValue(); nMinTableWidth = pTblData->GetColCount() * MINLAY; @@ -548,7 +548,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) } //Margins - if(SFX_ITEM_SET == rSet.GetItemState( RES_UL_SPACE, sal_False,&pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( RES_UL_SPACE, false,&pItem )) { m_pTopMF->SetValue(m_pTopMF->Normalize( ((const SvxULSpaceItem*)pItem)->GetUpper()), FUNIT_TWIP); @@ -559,7 +559,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) } //text direction - if( SFX_ITEM_SET == rSet.GetItemState( RES_FRAMEDIR, sal_True, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_FRAMEDIR, true, &pItem ) ) { sal_uIntPtr nVal = ((SvxFrameDirectionItem*)pItem)->GetValue(); sal_uInt16 nPos = m_pTextDirectionLB->GetEntryPos( (void*) nVal ); @@ -752,7 +752,7 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); const SfxPoolItem* pItem; - Init((SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, sal_False,&pItem ) + Init((SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, false,&pItem ) && ((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)); }; @@ -774,7 +774,7 @@ void SwTableColumnPage::Reset( const SfxItemSet& ) const SfxItemSet& rSet = GetItemSet(); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem )) { pTblData = (SwTableRep*)((const SwPtrItem*) pItem)->GetValue(); nNoOfVisibleCols = pTblData->GetColCount(); @@ -1325,7 +1325,7 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) #ifndef SW_FILEFORMAT_40 const SfxPoolItem *pItem; - if(SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, sal_False,&pItem ) + if(SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, false,&pItem ) && ((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) #endif { @@ -1486,12 +1486,12 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ) )) m_pPageCollLB->InsertEntry( aFmtName ); - if(SFX_ITEM_SET == rSet.GetItemState( RES_KEEP, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( RES_KEEP, false, &pItem )) { m_pKeepCB->Check( ((const SvxFmtKeepItem*)pItem)->GetValue() ); m_pKeepCB->SaveValue(); } - if(SFX_ITEM_SET == rSet.GetItemState( RES_LAYOUT_SPLIT, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem )) { m_pSplitCB->Check( ((const SwFmtLayoutSplit*)pItem)->GetValue() ); } @@ -1501,7 +1501,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pSplitCB->SaveValue(); SplitHdl_Impl(m_pSplitCB); - if(SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, false, &pItem )) { m_pSplitRowCB->Check( ((const SwFmtRowSplit*)pItem)->GetValue() ); } @@ -1511,7 +1511,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) if(bPageBreak) { - if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, false, &pItem )) { OUString sPageDesc; const SwPageDesc* pDesc = ((const SwFmtPageDesc*)pItem)->GetPageDesc(); @@ -1551,7 +1551,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) } } - if(SFX_ITEM_SET == rSet.GetItemState( RES_BREAK, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( RES_BREAK, false, &pItem )) { const SvxFmtBreakItem* pPageBreak = (const SvxFmtBreakItem*)pItem; SvxBreak eBreak = (SvxBreak)pPageBreak->GetValue(); @@ -1614,7 +1614,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pPageCollLB->Enable(false); } - if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem )) + if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem )) { sal_uInt16 nRep = ((const SfxUInt16Item*)pItem)->GetValue(); m_pHeadLineCB->Check( nRep > 0 ); diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 2394de4a8a0e..1ac159852224 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -141,10 +141,10 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) const SfxPoolItem* pItem = 0; bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) || SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); - bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); + bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, false, &pItem ); const SfxPoolItem* pRowItem = 0, *pTableItem = 0; - bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem ); - bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem ); + bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, false, &pRowItem ); + bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false, &pTableItem ); if(bBackground) { @@ -166,7 +166,7 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) if(bBorder) rSh.SetTabBorders( rSet ); - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem) ) + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem) ) rSh.SetRowsToRepeat( ((SfxUInt16Item*)pItem)->GetValue() ); SwFrmFmt* pFrmFmt = rSh.GetTableFmt(); @@ -174,52 +174,52 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) { //RES_SHADOW pItem=0; - rSet.GetItemState(rSet.GetPool()->GetWhich(RES_SHADOW), sal_False, &pItem); + rSet.GetItemState(rSet.GetPool()->GetWhich(RES_SHADOW), false, &pItem); if(pItem) pFrmFmt->SetFmtAttr( *pItem ); //RES_BREAK pItem=0; - rSet.GetItemState(rSet.GetPool()->GetWhich(RES_BREAK), sal_False, &pItem); + rSet.GetItemState(rSet.GetPool()->GetWhich(RES_BREAK), false, &pItem); if(pItem) pFrmFmt->SetFmtAttr( *pItem ); //RES_PAGEDESC pItem=0; - rSet.GetItemState(rSet.GetPool()->GetWhich(RES_PAGEDESC), sal_False, &pItem); + rSet.GetItemState(rSet.GetPool()->GetWhich(RES_PAGEDESC), false, &pItem); if(pItem) pFrmFmt->SetFmtAttr( *pItem ); //RES_LAYOUT_SPLIT pItem=0; - rSet.GetItemState(rSet.GetPool()->GetWhich(RES_LAYOUT_SPLIT), sal_False, &pItem); + rSet.GetItemState(rSet.GetPool()->GetWhich(RES_LAYOUT_SPLIT), false, &pItem); if(pItem) pFrmFmt->SetFmtAttr( *pItem ); //RES_KEEP pItem=0; - rSet.GetItemState(rSet.GetPool()->GetWhich(RES_KEEP), sal_False, &pItem); + rSet.GetItemState(rSet.GetPool()->GetWhich(RES_KEEP), false, &pItem); if(pItem) pFrmFmt->SetFmtAttr( *pItem ); //RES_FRAMEDIR pItem=0; - rSet.GetItemState(rSet.GetPool()->GetWhich(RES_FRAMEDIR), sal_False, &pItem); + rSet.GetItemState(rSet.GetPool()->GetWhich(RES_FRAMEDIR), false, &pItem); if(pItem) pFrmFmt->SetFmtAttr( *pItem ); } - if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pItem) ) + if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, false, &pItem) ) { SvxFrameDirectionItem aDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR ); aDirection.SetValue(static_cast< const SvxFrameDirectionItem* >(pItem)->GetValue()); rSh.SetBoxDirection(aDirection); } - if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_SET_VERT_ALIGN, sal_False, &pItem)) + if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_SET_VERT_ALIGN, false, &pItem)) rSh.SetBoxAlign(((SfxUInt16Item*)(pItem))->GetValue()); - if( SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pItem) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, false, &pItem) ) rSh.SetRowSplit(*static_cast<const SwFmtRowSplit*>(pItem)); } }//end anonymous namespace @@ -432,7 +432,7 @@ static void lcl_AppendSetItems( ItemVector& rItemVector, const SfxItemSet& rStyl for ( sal_uInt16 nWhich = *pRanges; nWhich <= *(pRanges+1); ++nWhich ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rStyleAttrSet.GetItemState( nWhich, sal_False, &pItem ) ) + if( SFX_ITEM_SET == rStyleAttrSet.GetItemState( nWhich, false, &pItem ) ) { rItemVector.push_back( SfxPoolItemSharedPtr( pItem->Clone() ) ); } @@ -448,7 +448,7 @@ static void lcl_RemoveEqualItems( SfxItemSet& rTemplateItemSet, const ItemVector while( aIter != aEnd ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rTemplateItemSet.GetItemState( (*aIter)->Which(), sal_True, &pItem ) && + if( SFX_ITEM_SET == rTemplateItemSet.GetItemState( (*aIter)->Which(), true, &pItem ) && *pItem == *(*aIter) ) { rTemplateItemSet.ClearItem( (*aIter)->Which() ); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index fc8ee686d773..71c3f903062a 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -705,7 +705,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; bool bBookPreview = GetViewShell()->GetViewOptions()->IsPagePrevBookview(); - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_SHOW_BOOKVIEW, sal_False, &pItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_SHOW_BOOKVIEW, false, &pItem ) ) { bBookPreview = static_cast< const SfxBoolItem* >( pItem )->GetValue(); ( ( SwViewOption* ) GetViewShell()->GetViewOptions() )->SetPagePrevBookview( bBookPreview ); @@ -769,12 +769,12 @@ void SwPagePreview::Execute( SfxRequest &rReq ) { enum SvxZoomType eType = SVX_ZOOM_PERCENT; sal_uInt16 nZoomFactor = USHRT_MAX; - if(SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOM, sal_True, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOM, true, &pItem)) { eType = ((const SvxZoomItem *)pItem)->GetType(); nZoomFactor = ((const SvxZoomItem *)pItem)->GetValue(); } - else if(SFX_ITEM_SET == pArgs->GetItemState(FN_PREVIEW_ZOOM, sal_True, &pItem)) + else if(SFX_ITEM_SET == pArgs->GetItemState(FN_PREVIEW_ZOOM, true, &pItem)) nZoomFactor = ((const SfxUInt16Item *)pItem)->GetValue(); if(USHRT_MAX != nZoomFactor) SetZoom(eType, nZoomFactor); @@ -786,7 +786,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem ) ) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem ) ) { const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); SetZoom( SVX_ZOOM_PERCENT, nCurrentZoom ); @@ -1044,10 +1044,10 @@ void SwPagePreview::GetState( SfxItemSet& rSet ) SfxItemSet aSet( *rSet.GetPool(), SID_PRINTDOC, SID_PRINTDOC ); GetSlotState( SID_PRINTDOC, SfxViewShell::GetInterface(), &aSet ); if( SFX_ITEM_DISABLED == aSet.GetItemState( SID_PRINTDOC, - sal_False, &pItem )) + false, &pItem )) rSet.DisableItem( nWhich ); else if( SFX_ITEM_SET == aSet.GetItemState( SID_PRINTDOC, - sal_False, &pItem )) + false, &pItem )) { ((SfxPoolItem*)pItem)->SetWhich( FN_PRINT_PAGEPREVIEW ); rSet.Put( *pItem ); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index dc4b6528c962..1d5ac4c0d4a0 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -266,7 +266,7 @@ void SwSrcView::Init() } SetNewWindowAllowed( sal_False ); - StartListening(*pDocShell,sal_True); + StartListening(*pDocShell,true); } SwDocShell* SwSrcView::GetDocShell() diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 29f001895aaa..23c6b18d8c1a 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -493,7 +493,7 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify) const SfxPoolItem *pItem; if ( SFX_ITEM_SET != GetObjectShell()->GetMedium()->GetItemSet()-> - GetItemState( SID_HIDDEN, sal_False, &pItem ) || + GetItemState( SID_HIDDEN, false, &pItem ) || !((SfxBoolItem*)pItem)->GetValue() ) { GetViewFrame()->GetBindings().ENTERREGISTRATIONS(); @@ -889,8 +889,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) aUsrPref.SetViewVRuler(sal_False); } - StartListening( *pViewFrame, sal_True ); - StartListening( *pDocSh, sal_True ); + StartListening( *pViewFrame, true ); + StartListening( *pDocSh, true ); // Set Zoom-factor from HRuler Fraction aZoomFract( aUsrPref.GetZoom(), 100 ); diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 721b200d864a..9682f37b85a3 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -349,7 +349,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pAttr=NULL; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlot , sal_False, &pAttr )) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlot , false, &pAttr )) { bSet = ((SfxBoolItem*)pAttr)->GetValue(); eState = bSet ? STATE_ON : STATE_OFF; diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 3a43507e5d1b..fc0a57a9e3e4 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -562,7 +562,7 @@ void SwView::Execute(SfxRequest &rReq) case FN_REDLINE_ON: { if( pArgs && - SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem )) + SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem )) { IDocumentRedlineAccess* pIDRA = m_pWrtShell->getIDocumentRedlineAccess(); Sequence <sal_Int8> aPasswd = pIDRA->GetRedlinePassword(); @@ -572,7 +572,7 @@ void SwView::Execute(SfxRequest &rReq) // xmlsec05: new password dialog Window* pParent; const SfxPoolItem* pParentItem; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, sal_False, &pParentItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); else pParent = &GetViewFrame()->GetWindow(); @@ -601,7 +601,7 @@ void SwView::Execute(SfxRequest &rReq) { IDocumentRedlineAccess* pIDRA = m_pWrtShell->getIDocumentRedlineAccess(); Sequence <sal_Int8> aPasswd = pIDRA->GetRedlinePassword(); - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem ) && ((SfxBoolItem*)pItem)->GetValue() == ( aPasswd.getLength() != 0 ) ) break; @@ -609,7 +609,7 @@ void SwView::Execute(SfxRequest &rReq) // message box for wrong password Window* pParent; const SfxPoolItem* pParentItem; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, sal_False, &pParentItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); else pParent = &GetViewFrame()->GetWindow(); @@ -644,7 +644,7 @@ void SwView::Execute(SfxRequest &rReq) case FN_REDLINE_SHOW: if( pArgs && - SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem)) + SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem)) { sal_uInt16 nMode = ( ~(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) & m_pWrtShell->GetRedlineMode() ) | nsRedlineMode_t::REDLINE_SHOW_INSERT; @@ -734,14 +734,14 @@ void SwView::Execute(SfxRequest &rReq) if( pArgs ) { - if( SFX_ITEM_SET == pArgs->GetItemState( SID_FILE_NAME, sal_False, &pItem )) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_FILE_NAME, false, &pItem )) sFileName = ((const SfxStringItem*)pItem)->GetValue(); bHasFileName = !sFileName.isEmpty(); - if( SFX_ITEM_SET == pArgs->GetItemState( SID_FILTER_NAME, sal_False, &pItem )) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_FILTER_NAME, false, &pItem )) sFilterName = ((const SfxStringItem*)pItem)->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( SID_VERSION, sal_False, &pItem )) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_VERSION, false, &pItem )) { nVersion = ((const SfxInt16Item *)pItem)->GetValue(); m_pViewImpl->SetParam( nVersion ); @@ -943,7 +943,7 @@ void SwView::Execute(SfxRequest &rReq) break; case SID_ATTR_BRUSH: { - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(RES_BACKGROUND, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(RES_BACKGROUND, false, &pItem)) { const sal_uInt16 nCurIdx = m_pWrtShell->GetCurPageDesc(); SwPageDesc aDesc( m_pWrtShell->GetPageDesc( nCurIdx )); @@ -966,7 +966,7 @@ void SwView::Execute(SfxRequest &rReq) case FN_INSERT_CTRL: case FN_INSERT_OBJ_CTRL: { - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem)) { sal_uInt16 nValue = ((SfxUInt16Item*)pItem)->GetValue(); switch ( nSlot ) @@ -996,7 +996,7 @@ void SwView::Execute(SfxRequest &rReq) case SID_ATTR_DEFTABSTOP: { - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) { SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ); sal_uInt16 nTab = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -1006,7 +1006,7 @@ void SwView::Execute(SfxRequest &rReq) } break; case SID_ATTR_LANGUAGE : - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_LANGUAGE, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_LANGUAGE, false, &pItem)) { SvxLanguageItem aLang(((SvxLanguageItem*)pItem)->GetLanguage(), RES_CHRATR_LANGUAGE); m_pWrtShell->SetDefault( aLang ); @@ -1014,14 +1014,14 @@ void SwView::Execute(SfxRequest &rReq) } break; case SID_ATTR_CHAR_CTL_LANGUAGE: - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(RES_CHRATR_CTL_LANGUAGE, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(RES_CHRATR_CTL_LANGUAGE, false, &pItem)) { m_pWrtShell->SetDefault( *pItem ); lcl_SetAllTextToDefaultLanguage( *m_pWrtShell, RES_CHRATR_CTL_LANGUAGE ); } break; case SID_ATTR_CHAR_CJK_LANGUAGE: - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(RES_CHRATR_CJK_LANGUAGE, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(RES_CHRATR_CJK_LANGUAGE, false, &pItem)) { m_pWrtShell->SetDefault( *pItem ); lcl_SetAllTextToDefaultLanguage( *m_pWrtShell, RES_CHRATR_CJK_LANGUAGE ); @@ -1052,7 +1052,7 @@ void SwView::Execute(SfxRequest &rReq) } break; case SID_JUMPTOMARK: - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_JUMPTOMARK, sal_False, &pItem)) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_JUMPTOMARK, false, &pItem)) JumpToSwMark( (( const SfxStringItem*)pItem)->GetValue() ); break; case SID_GALLERY : @@ -1076,7 +1076,7 @@ void SwView::Execute(SfxRequest &rReq) { sal_Bool bShow = sal_False; if( pArgs && - SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem )) + SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem )) bShow = ((const SfxBoolItem*)pItem)->GetValue(); if((bShow && m_bInMailMerge) != GetViewFrame()->HasChildWindow(nSlot)) GetViewFrame()->ToggleChildWindow(nSlot); @@ -1526,7 +1526,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) RES_PARATR_NUMRULE, RES_PARATR_NUMRULE); rShell.GetCurAttr(aSet); if(SFX_ITEM_AVAILABLE <= - aSet.GetItemState(RES_PARATR_NUMRULE, sal_True)) + aSet.GetItemState(RES_PARATR_NUMRULE, true)) { const OUString& rNumStyle = ((const SfxStringItem &) @@ -1627,7 +1627,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) case FN_STAT_BOOKMARK: if ( pArgs ) { - if (SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_True, &pItem)) + if (SFX_ITEM_SET == pArgs->GetItemState( nWhich, true, &pItem)) { const IDocumentMarkAccess* pMarkAccess = rSh.getIDocumentMarkAccess(); const sal_Int32 nIdx = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); @@ -1697,14 +1697,14 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) } const SfxPoolItem* pViewLayoutItem = 0; - if ( pSet && SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_VIEWLAYOUT, sal_True, &pViewLayoutItem)) + if ( pSet && SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_VIEWLAYOUT, true, &pViewLayoutItem)) { const sal_uInt16 nColumns = ((const SvxViewLayoutItem *)pViewLayoutItem)->GetValue(); const bool bBookMode = ((const SvxViewLayoutItem *)pViewLayoutItem)->IsBookMode(); SetViewLayout( nColumns, bBookMode ); } - if ( pSet && SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_ZOOM, sal_True, &pItem)) + if ( pSet && SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_ZOOM, true, &pItem)) { enum SvxZoomType eType = ((const SvxZoomItem *)pItem)->GetType(); SetZoom( eType, ((const SvxZoomItem *)pItem)->GetValue() ); @@ -1722,7 +1722,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) if ( pArgs && !rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) && ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) ) { - if ( SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_VIEWLAYOUT, sal_True, &pItem )) + if ( SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_VIEWLAYOUT, true, &pItem )) { const sal_uInt16 nColumns = ((const SvxViewLayoutItem *)pItem)->GetValue(); const bool bBookMode = (0 == nColumns || 0 != (nColumns % 2)) ? @@ -1744,7 +1744,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) { if ( pArgs && ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) ) { - if ( SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem )) + if ( SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem )) { const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); SetZoom( SVX_ZOOM_PERCENT, nCurrentZoom ); @@ -1793,7 +1793,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) { if ( pArgs ) { - if (SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_True, &pItem)) + if (SFX_ITEM_SET == pArgs->GetItemState( nWhich, true, &pItem)) { switch ( ((const SfxUInt16Item *)pItem)->GetValue() ) { @@ -2040,9 +2040,9 @@ static sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc ) const SwPageDesc& rPageDesc = rDoc.GetPageDesc( i ); const SwFrmFmt& rMaster = rPageDesc.GetMaster(); const SfxPoolItem* pItem; - if( ( SFX_ITEM_SET == rMaster.GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ) && + if( ( SFX_ITEM_SET == rMaster.GetAttrSet().GetItemState( RES_HEADER, false, &pItem ) && ((SwFmtHeader*)pItem)->IsActive() ) || - ( SFX_ITEM_SET == rMaster.GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ) && + ( SFX_ITEM_SET == rMaster.GetAttrSet().GetItemState( RES_FOOTER, false, &pItem ) && ((SwFmtFooter*)pItem)->IsActive()) ) ++nRet; } @@ -2064,7 +2064,7 @@ void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ) { OUString sFile, sFilter; sFile = ( (const SfxStringItem *)pItem )->GetValue(); - if ( SFX_ITEM_SET == rRequest.GetArgs()->GetItemState( FN_PARAM_1, sal_True, &pItem ) ) + if ( SFX_ITEM_SET == rRequest.GetArgs()->GetItemState( FN_PARAM_1, true, &pItem ) ) sFilter = ( (const SfxStringItem *)pItem )->GetValue(); bool bHasFileName = !sFile.isEmpty(); diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx index daa0594b58e3..be4cbf3b2b2e 100644 --- a/sw/source/ui/uiview/viewcoll.cxx +++ b/sw/source/ui/uiview/viewcoll.cxx @@ -47,7 +47,7 @@ void SwView::ExecColl(SfxRequest &rReq) if( pArgs ) { if (pArgs && - SFX_ITEM_SET == pArgs->GetItemState( nWhich , sal_True, &pItem )) + SFX_ITEM_SET == pArgs->GetItemState( nWhich , true, &pItem )) { if( ((SfxStringItem*)pItem)->GetValue() != GetWrtShell().GetCurPageStyle(sal_False) ) diff --git a/sw/source/ui/uiview/viewdlg.cxx b/sw/source/ui/uiview/viewdlg.cxx index 392306804073..b41d6ca345e5 100644 --- a/sw/source/ui/uiview/viewdlg.cxx +++ b/sw/source/ui/uiview/viewdlg.cxx @@ -41,7 +41,7 @@ void SwView::ExecDlg(SfxRequest &rReq) sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) - pArgs->GetItemState( GetPool().GetWhich(nSlot), sal_False, &pItem ); + pArgs->GetItemState( GetPool().GetWhich(nSlot), false, &pItem ); switch ( nSlot ) { diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index 83c5d16c6aee..b0aa5335ecda 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -82,7 +82,7 @@ void SwView::ExecDraw(SfxRequest& rReq) sal_Bool bDeselect = sal_False; sal_uInt16 nSlotId = rReq.GetSlot(); - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlotId), sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlotId), false, &pItem)) { pEItem = dynamic_cast< const SfxAllEnumItem*>(pItem); pStringItem = dynamic_cast< const SfxStringItem*>(pItem); diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 38369d42bfcb..955fb77ec7cd 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -93,7 +93,7 @@ void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, sal_Bool bWeb ) const SfxItemSet& rSet = pNew->GetOptions(); const SwAddPrinterItem* pAddPrinterAttr; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER, sal_False, + if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER, false, (const SfxPoolItem**)&pAddPrinterAttr ) ) { if( pIDDA ) diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 1f6682390409..d51956b4e98e 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -87,7 +87,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; sal_Bool bQuiet = sal_False; - if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_SEARCH_QUIET, sal_False, &pItem)) + if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_SEARCH_QUIET, false, &pItem)) bQuiet = ((const SfxBoolItem*) pItem)->GetValue(); sal_Bool bApi = bQuiet | bNoMessage; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 7ee9cdb84c24..e32db0bb3049 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -354,7 +354,7 @@ void SwView::GetState(SfxItemSet &rSet) break; case SID_VIEW_DATA_SOURCE_BROWSER: if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) - rSet.Put( SfxVisibilityItem( nWhich, sal_False ) ); + rSet.Put( SfxVisibilityItem( nWhich, false ) ); else rSet.Put( SfxBoolItem( nWhich, GetViewFrame()->HasChildWindow( SID_BROWSER ) ) ); break; diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 73a69649191f..1125ca580d6d 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -932,7 +932,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) } sal_Bool bSingleLine = sal_False; const SfxPoolItem* pSingleLine; - if( SFX_ITEM_SET == rReq.GetArgs()->GetItemState(SID_RULER_ACT_LINE_ONLY, sal_False, &pSingleLine)) + if( SFX_ITEM_SET == rReq.GetArgs()->GetItemState(SID_RULER_ACT_LINE_ONLY, false, &pSingleLine)) bSingleLine = ((const SfxBoolItem*)pSingleLine)->GetValue(); if ( m_bSetTabRowFromDoc ) { diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index bab9f955e8d2..6ec8700f3999 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -416,7 +416,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); if( SFX_ITEM_SET == pOutSet->GetItemState( - SID_ATTR_NUMBERFORMAT_VALUE, sal_False, &pItem )) + SID_ATTR_NUMBERFORMAT_VALUE, false, &pItem )) { sal_uInt32 nNumberFormat = ((SfxUInt32Item*)pItem)->GetValue(); // oj #105473# change order of calls @@ -427,7 +427,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) SetDefFormat(nNumberFormat); } if( bShowLanguageControl && SFX_ITEM_SET == pOutSet->GetItemState( - SID_ATTR_NUMBERFORMAT_ADD_AUTO, sal_False, &pItem )) + SID_ATTR_NUMBERFORMAT_ADD_AUTO, false, &pItem )) { bUseAutomaticLanguage = ((const SfxBoolItem*)pItem)->GetValue(); } diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 55e4adb9d086..ea08eca97850 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -101,7 +101,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh) SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); const SfxPoolItem *pBoxInfo; if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, - sal_True, &pBoxInfo)) + true, &pBoxInfo)) aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; // Table variant: If more than one table cells are selected @@ -124,7 +124,7 @@ void ConvertAttrCharToGen(SfxItemSet& rSet, const sal_uInt8 nMode) // Background { const SfxPoolItem *pTmpBrush; - if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_BACKGROUND, sal_True, &pTmpBrush ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_BACKGROUND, true, &pTmpBrush ) ) { SvxBrushItem aTmpBrush( *((SvxBrushItem*)pTmpBrush) ); aTmpBrush.SetWhich( RES_BACKGROUND ); @@ -138,7 +138,7 @@ void ConvertAttrCharToGen(SfxItemSet& rSet, const sal_uInt8 nMode) { // Border const SfxPoolItem *pTmpItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_BOX, sal_True, &pTmpItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_BOX, true, &pTmpItem ) ) { SvxBoxItem aTmpBox( *((SvxBoxItem*)pTmpItem) ); aTmpBox.SetWhich( RES_BOX ); @@ -148,7 +148,7 @@ void ConvertAttrCharToGen(SfxItemSet& rSet, const sal_uInt8 nMode) rSet.ClearItem(RES_BOX); // Border shadow - if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_SHADOW, sal_False, &pTmpItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_SHADOW, false, &pTmpItem ) ) { SvxShadowItem aTmpShadow( *((SvxShadowItem*)pTmpItem) ); aTmpShadow.SetWhich( RES_SHADOW ); @@ -164,7 +164,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode) // Background { const SfxPoolItem *pTmpBrush; - if( SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pTmpBrush ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, false, &pTmpBrush ) ) { SvxBrushItem aTmpBrush( *((SvxBrushItem*)pTmpBrush) ); aTmpBrush.SetWhich( RES_CHRATR_BACKGROUND ); @@ -177,7 +177,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode) { // Border const SfxPoolItem *pTmpItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_BOX, sal_False, &pTmpItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_BOX, false, &pTmpItem ) ) { SvxBoxItem aTmpBox( *((SvxBoxItem*)pTmpItem) ); aTmpBox.SetWhich( RES_CHRATR_BOX ); @@ -186,7 +186,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode) rSet.ClearItem( RES_BOX ); // Border shadow - if( SFX_ITEM_SET == rSet.GetItemState( RES_SHADOW, sal_False, &pTmpItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( RES_SHADOW, false, &pTmpItem ) ) { SvxShadowItem aTmpShadow( *((SvxShadowItem*)pTmpItem) ); aTmpShadow.SetWhich( RES_CHRATR_SHADOW ); @@ -279,7 +279,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) // Evaluate header attributes const SfxPoolItem* pItem; if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PAGE_HEADERSET, - sal_False, &pItem ) ) + false, &pItem ) ) { const SfxItemSet& rHeaderSet = ((SvxSetItem*)pItem)->GetItemSet(); const SfxBoolItem& rHeaderOn = (const SfxBoolItem&)rHeaderSet.Get(SID_ATTR_PAGE_ON); @@ -319,7 +319,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) // Evaluate footer attributes if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PAGE_FOOTERSET, - sal_False, &pItem ) ) + false, &pItem ) ) { const SfxItemSet& rFooterSet = ((SvxSetItem*)pItem)->GetItemSet(); const SfxBoolItem& rFooterOn = (const SfxBoolItem&)rFooterSet.Get(SID_ATTR_PAGE_ON); @@ -360,7 +360,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) // Footnotes // if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_FTN_INFO, - sal_False, &pItem ) ) + false, &pItem ) ) rPageDesc.SetFtnInfo( ((SwPageFtnInfoItem*)pItem)->GetPageFtnInfo() ); // Columns @@ -368,13 +368,13 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) // Register compliant if(SFX_ITEM_SET == rSet.GetItemState( - SID_SWREGISTER_MODE, sal_False, &pItem)) + SID_SWREGISTER_MODE, false, &pItem)) { sal_Bool bSet = ((const SfxBoolItem*)pItem)->GetValue(); if(!bSet) rPageDesc.SetRegisterFmtColl(0); else if(SFX_ITEM_SET == rSet.GetItemState( - SID_SWREGISTER_COLLECTION, sal_False, &pItem)) + SID_SWREGISTER_COLLECTION, false, &pItem)) { const OUString& rColl = ((const SfxStringItem*)pItem)->GetValue(); SwDoc& rDoc = *rMaster.GetDoc(); @@ -421,7 +421,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); const SfxPoolItem *pBoxInfo; if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, - sal_True, &pBoxInfo) ) + true, &pBoxInfo) ) aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; aBoxInfo.SetTable( sal_False ); @@ -577,12 +577,12 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) bool bChanged = false; // Page number - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_PARA_PAGENUM, sal_False, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_PARA_PAGENUM, false, &pItem)) { aPgDesc.SetNumOffset(((SfxUInt16Item*)pItem)->GetValue()); bChanged = true; } - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PARA_MODEL, sal_False, &pItem )) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PARA_MODEL, false, &pItem )) { const OUString& rDescName = ((SvxPageModelItem*)pItem)->GetValue(); if( !rDescName.isEmpty() ) // No name -> disable PageDesc! @@ -601,7 +601,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) { SfxItemSet aCoreSet(rShell.GetView().GetPool(), RES_PAGEDESC, RES_PAGEDESC ); rShell.GetCurAttr( aCoreSet ); - if(SFX_ITEM_SET == aCoreSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) + if(SFX_ITEM_SET == aCoreSet.GetItemState( RES_PAGEDESC, true, &pItem ) ) { if( ((SwFmtPageDesc*)pItem)->GetPageDesc() ) { @@ -621,7 +621,7 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) OUString aName; ::boost::optional<sal_uInt16> oNumOffset; bool bPut = true; - switch( rCoreSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) + switch( rCoreSet.GetItemState( RES_PAGEDESC, true, &pItem ) ) { case SFX_ITEM_SET: { |