diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-02 12:56:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:52 +0200 |
| commit | 0523304875cf810acb1ff7caf9c9a2ec5d982b70 (patch) | |
| tree | 741920994ba1fb097e162ecbf2c8c60929536bd8 | |
| parent | filter/msfilter: sal_Bool->bool (diff) | |
| download | core-0523304875cf810acb1ff7caf9c9a2ec5d982b70.tar.gz core-0523304875cf810acb1ff7caf9c9a2ec5d982b70.zip | |
svl: sal_Bool->bool
Change-Id: I6938314a08d061d2b07d9129742d74a989bd1385
46 files changed, 111 insertions, 111 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index e1aecea7aeca..4bdd7216539a 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1106,7 +1106,7 @@ short IconChoiceDialog::Ok() if ( !pOutSet ) { if ( !pExampleSet && pSet ) - pOutSet = pSet->Clone( sal_False ); // without items + pOutSet = pSet->Clone( false ); // without items else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index ffcc27828317..a85745a6d35a 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -295,7 +295,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } } @@ -453,7 +453,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -650,7 +650,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -897,7 +897,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -1218,7 +1218,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -2986,7 +2986,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 84bf61c6579b..06b3e8b64367 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1184,7 +1184,7 @@ void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet ) if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, sal_False ); + (const SvxSetItem&)rSet.Get( nWhich, false ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); @@ -1215,7 +1215,7 @@ void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet ) if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, sal_False ); + (const SvxSetItem&)rSet.Get( nWhich, false ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 5baa24e125a1..fcabc8605430 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -814,7 +814,7 @@ ATTR_SETUNDERLINE: aUL = *(SvxUnderlineItem*)pItem; } else - aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, sal_False ); + aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, false ); if( UNDERLINE_NONE == aUL.GetLineStyle() ) aUL.SetLineStyle( UNDERLINE_SINGLE ); @@ -909,7 +909,7 @@ ATTR_SETOVERLINE: aOL = *(SvxOverlineItem*)pItem; } else - aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nOverline, sal_False ); + aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nOverline, false ); if( UNDERLINE_NONE == aOL.GetLineStyle() ) aOL.SetLineStyle( UNDERLINE_SINGLE ); diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 0382d901ffc0..8c1cb781e03f 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -133,7 +133,7 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes { const SfxPoolItem* pItem = NULL; { - SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, sal_True ); + SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, true ); rDesc.Name = pFontItem->GetFamilyName(); rDesc.StyleName = pFontItem->GetStyleName(); rDesc.Family = sal::static_int_cast< sal_Int16 >( @@ -143,37 +143,37 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes pFontItem->GetPitch()); } { - pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, sal_True ); + pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, true ); uno::Any aHeight; if( pItem->QueryValue( aHeight, MID_FONTHEIGHT ) ) aHeight >>= rDesc.Height; } { - pItem = &rSet.Get( EE_CHAR_ITALIC, sal_True ); + pItem = &rSet.Get( EE_CHAR_ITALIC, true ); uno::Any aFontSlant; if(pItem->QueryValue( aFontSlant, MID_POSTURE )) aFontSlant >>= rDesc.Slant; } { - pItem = &rSet.Get( EE_CHAR_UNDERLINE, sal_True ); + pItem = &rSet.Get( EE_CHAR_UNDERLINE, true ); uno::Any aUnderline; if(pItem->QueryValue( aUnderline, MID_TL_STYLE )) aUnderline >>= rDesc.Underline; } { - pItem = &rSet.Get( EE_CHAR_WEIGHT, sal_True ); + pItem = &rSet.Get( EE_CHAR_WEIGHT, true ); uno::Any aWeight; if(pItem->QueryValue( aWeight, MID_WEIGHT )) aWeight >>= rDesc.Weight; } { - pItem = &rSet.Get( EE_CHAR_STRIKEOUT, sal_True ); + pItem = &rSet.Get( EE_CHAR_STRIKEOUT, true ); uno::Any aStrikeOut; if(pItem->QueryValue( aStrikeOut, MID_CROSS_OUT )) aStrikeOut >>= rDesc.Strikeout; } { - SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, sal_True ); + SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, true ); rDesc.WordLineMode = pWLMItem->GetValue(); } } diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 37d2d12addb3..c84bcf179bf9 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -106,7 +106,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet SfxItemPropertyMap m_aMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; protected: - virtual bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, sal_Bool bGetProperty) const; + virtual bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index a05b33cdce11..83d6ed7578b0 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -87,13 +87,13 @@ public: SfxItemSet( SfxItemPool&, const sal_uInt16* nWhichPairTable ); virtual ~SfxItemSet(); - virtual SfxItemSet * Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const; + virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = 0) const; // Items erfragen sal_uInt16 Count() const { return _nCount; } sal_uInt16 TotalCount() const; - virtual const SfxPoolItem& Get( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True ) const; + virtual const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; const SfxPoolItem* GetItem( sal_uInt16 nWhich, bool bSrchInParent = true, TypeId aItemType = 0 ) const; @@ -109,8 +109,8 @@ public: virtual void DisableItem(sal_uInt16 nWhich); virtual void InvalidateItem( sal_uInt16 nWhich ); - virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); - virtual void ClearInvalidItems( sal_Bool bHardDefault = sal_False ); + virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); + virtual void ClearInvalidItems( bool bHardDefault = false ); void InvalidateAllItems(); // HACK(via nWhich = 0) ??? void InvalidateDefaultItems(); @@ -126,12 +126,12 @@ public: SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN, SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN ); - virtual bool Set( const SfxItemSet&, sal_Bool bDeep = sal_True ); + virtual bool Set( const SfxItemSet&, bool bDeep = true ); virtual void Intersect( const SfxItemSet& rSet ); - virtual void MergeValues( const SfxItemSet& rSet, sal_Bool bOverwriteDefaults = sal_False ); + virtual void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); virtual void Differentiate( const SfxItemSet& rSet ); - virtual void MergeValue( const SfxPoolItem& rItem, sal_Bool bOverwriteDefaults = sal_False ); + virtual void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); SfxItemPool* GetPool() const { return _pPool; } const sal_uInt16* GetRanges() const { return _pWhichRanges; } @@ -170,7 +170,7 @@ public: SfxAllItemSet( const SfxItemSet & ); SfxAllItemSet( const SfxAllItemSet & ); - virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE; + virtual SfxItemSet * Clone( bool bItems = true, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE; virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ) SAL_OVERRIDE; using SfxItemSet::Put; }; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index b57009b0cc4e..62f528168470 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -554,7 +554,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim SfxItemSet* pDataSet = getCurrentDataSet(); if ( pDataSet ) { - const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True); + const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, true); SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL); if(eState != SFX_ITEM_DONTCARE) aCellProtection = uno::makeAny(rProtAttr.GetProtection()); @@ -587,7 +587,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: SfxItemSet* pDataSet = getCurrentDataSet(); if ( pDataSet ) { - const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True); + const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, true); SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL); if(eState != SFX_ITEM_DONTCARE) aBoolRet = uno::makeAny(rProtAttr.GetHideFormula()); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 853c806df913..6666f830f35c 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -929,7 +929,7 @@ short SfxTabDialog::Ok() if ( !pOutSet ) { if ( !pExampleSet && pSet ) - pOutSet = pSet->Clone( sal_False ); // without Items + pOutSet = pSet->Clone( false ); // without Items else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index e2492d3d6b54..41f1a0433055 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -172,7 +172,7 @@ SfxItemPropertySet::~SfxItemPropertySet() { } -bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const +bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, bool) const { return false; } @@ -194,7 +194,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn else { SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID); - if(FillItem(aSet, rEntry.nWID, sal_True)) + if(FillItem(aSet, rEntry.nWID, true)) { const SfxPoolItem& rItem = aSet.Get(rEntry.nWID); rItem.QueryValue( rAny, rEntry.nMemberId ); @@ -250,7 +250,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn if(eState < SFX_ITEM_DEFAULT) { SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID); - if(FillItem(aSet, rEntry.nWID, sal_False)) + if(FillItem(aSet, rEntry.nWID, false)) { const SfxPoolItem &rItem = aSet.Get(rEntry.nWID); pNewItem = rItem.Clone(); diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index cd48ed66eb80..03905eaa6b2e 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -351,7 +351,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich ) if ( nWhich <= SFX_WHICH_MAX ) { const SfxPoolItem& rNew = _pParent - ? _pParent->Get( nWhich, sal_True ) + ? _pParent->Get( nWhich, true ) : _pPool->GetDefaultItem( nWhich ); Changed( *pItemToClear, rNew ); @@ -389,7 +389,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich ) if ( nWhich <= SFX_WHICH_MAX ) { const SfxPoolItem& rNew = _pParent - ? _pParent->Get( nWhich, sal_True ) + ? _pParent->Get( nWhich, true ) : _pPool->GetDefaultItem( nWhich ); Changed( *pItemToClear, rNew ); @@ -417,7 +417,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich ) -void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault ) +void SfxItemSet::ClearInvalidItems( bool bHardDefault ) { sal_uInt16* pPtr = _pWhichRanges; SfxItemArray ppFnd = _aItems; @@ -592,7 +592,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich if (nWhich <= SFX_WHICH_MAX ) { const SfxPoolItem& rOld = _pParent - ? _pParent->Get( nWhich, sal_True ) + ? _pParent->Get( nWhich, true ) : _pPool->GetDefaultItem( nWhich ); Changed( rOld, rNew ); } @@ -846,12 +846,12 @@ bool SfxItemSet::Set const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems "ubernommen werden sollen */ - sal_Bool bDeep /* sal_True (default) + bool bDeep /* true (default) auch die SfxPoolItems aus den ggf. an rSet vorhandenen Parents werden direkt in das SfxItemSet "ubernommen - sal_False + false die SfxPoolItems aus den Parents von rSet werden nicht ber"ucksichtigt */ ) @@ -950,7 +950,7 @@ const SfxPoolItem* SfxItemSet::GetItem -const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) const +const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const { // suche den Bereich in dem das Which steht: const SfxItemSet* pAktSet = this; @@ -1076,7 +1076,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet ) if(nWhich <= SFX_WHICH_MAX) { const SfxPoolItem& rNew = _pParent - ? _pParent->Get( nWhich, sal_True ) + ? _pParent->Get( nWhich, true ) : _pPool->GetDefaultItem( nWhich ); Changed( **ppFnd1, rNew ); @@ -1146,7 +1146,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet ) if(nWhich <= SFX_WHICH_MAX) { const SfxPoolItem& rNew = _pParent - ? _pParent->Get( nWhich, sal_True ) + ? _pParent->Get( nWhich, true ) : _pPool->GetDefaultItem( nWhich ); Changed( **ppFnd1, rNew ); @@ -1323,7 +1323,7 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount, -void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults ) +void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults ) { // Achtung!!! Bei Aenderungen/Bugfixes immer obenstehende Tabelle pflegen! DBG_ASSERT( GetPool() == rSet.GetPool(), "MergeValues mit verschiedenen Pools" ); @@ -1380,7 +1380,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults ) -void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults ) +void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults ) { SfxItemArray ppFnd = _aItems; const sal_uInt16* pPtr = _pWhichRanges; @@ -1470,7 +1470,7 @@ SvStream &SfxItemSet::Store [Querverweise] - <SfxItemSet::Load(SvStream&,sal_Bool,const SfxItemPool*)> + <SfxItemSet::Load(SvStream&,bool,const SfxItemPool*)> */ { @@ -1541,7 +1541,7 @@ SvStream &SfxItemSet::Load [Querverweise] - <SfxItemSet::Store(Stream&,sal_Bool)const> + <SfxItemSet::Store(Stream&,bool)const> */ { @@ -1660,7 +1660,7 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const -SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const +SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const { if ( pToPool && pToPool != _pPool ) { @@ -1944,7 +1944,7 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi { bIncrementCount = true; pOld = _pParent ? - &_pParent->Get( nWhich, sal_True ) + &_pParent->Get( nWhich, true ) : nWhich <= SFX_WHICH_MAX ? &_pPool->GetDefaultItem( nWhich ) : 0; } @@ -1975,7 +1975,7 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich) -SfxItemSet *SfxAllItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const +SfxItemSet *SfxAllItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const { if ( pToPool && pToPool != _pPool ) { diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index dee7a63b805b..b91b42808df8 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -24,7 +24,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) : SfxPoolItem(which), - pSet(rSet.Clone(sal_True)) + pSet(rSet.Clone(true)) { } @@ -41,7 +41,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) : SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) : SfxPoolItem(rCopy.Which()), - pSet(rCopy.pSet->Clone(sal_True, pPool)) + pSet(rCopy.pSet->Clone(true, pPool)) { } diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 3b79dbc4b9dd..b3d7b8537915 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -369,7 +369,7 @@ public: : maRoot(), mnCount(0), mpIgnorableItems( pIgnorableItems != 0 - ? pIgnorableItems->Clone( sal_False ) + ? pIgnorableItems->Clone( false ) : 0 ) { DBG_ASSERT( !pIgnorableItems || !pIgnorableItems->Count(), diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 6e7f9f10c556..4c6953add537 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -631,7 +631,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, sal_False ); + (const SvxSetItem&)rSet.Get( nWhich, false ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); @@ -661,7 +661,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, sal_False ); + (const SvxSetItem&)rSet.Get( nWhich, false ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 18733132d110..7320727839a6 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -501,7 +501,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if(SFX_ITEM_DONTCARE == eState) mpRemember2DAttributes->InvalidateItem(nWhich); else if(SFX_ITEM_SET == eState) - mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False)); + mpRemember2DAttributes->Put(rAttrs.Get(nWhich, false)); nWhich = aIter.NextWhich(); } @@ -1723,7 +1723,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) if(SFX_ITEM_DONTCARE == eState) rAttrs.InvalidateItem(nWhich); else if(SFX_ITEM_SET == eState) - rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False)); + rAttrs.Put(mpRemember2DAttributes->Get(nWhich, false)); nWhich = aIter.NextWhich(); } diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 9b2976cec051..87df67803e93 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -267,7 +267,7 @@ namespace sdr ImpRemoveStyleSheet(); } - mpItemSet = mpItemSet->Clone(sal_False, pDestPool); + mpItemSet = mpItemSet->Clone(false, pDestPool); GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel); // set stylesheet (if used) diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index d3806c4090df..4eb2bafce908 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -52,7 +52,7 @@ namespace sdr { if(rProps.mpItemSet) { - mpItemSet = rProps.mpItemSet->Clone(sal_True); + mpItemSet = rProps.mpItemSet->Clone(true); // do not keep parent info, this may be changed by later construrtors. // This class just copies the ItemSet, ignore parent. diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 58d1acecfe7d..da8e51f8cbb7 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -98,7 +98,7 @@ namespace sdr } else { - mpItemSet->MergeValue(rSet.Get(nWhich), sal_True); + mpItemSet->MergeValue(rSet.Get(nWhich), true); } } @@ -121,7 +121,7 @@ namespace sdr { // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items. // #i50808# Leak fix, Clone produces a new instance and we get ownership here - SfxItemSet* pNewSet = rSet.Clone(sal_True); + SfxItemSet* pNewSet = rSet.Clone(true); DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)"); for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++) diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 2336fddfa95a..9f6ff55a07c1 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -98,7 +98,7 @@ namespace sdr } else { - mpItemSet->MergeValue(rSet.Get(nWhich), sal_True); + mpItemSet->MergeValue(rSet.Get(nWhich), true); } nWhich = aIter.NextWhich(); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 7fef31665bdb..d65585e89910 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2003,12 +2003,12 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false)) rAttr.InvalidateItem(nWhich); else - rAttr.MergeValue(rSet.Get(nWhich), sal_True); + rAttr.MergeValue(rSet.Get(nWhich), true); } else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false)) { const SfxPoolItem& rItem = rSet.Get(nWhich); - rAttr.MergeValue(rItem, sal_True); + rAttr.MergeValue(rItem, true); } nWhich = aIter.NextWhich(); diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 4a2c26d1cd9a..1ebfce5ccbb6 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -182,7 +182,7 @@ public: SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable ); SwAttrSet( const SwAttrSet& ); - virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const SAL_OVERRIDE; + virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = 0) const SAL_OVERRIDE; bool Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew ); bool Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index fbda6e10afa0..3e3ba568831f 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -162,7 +162,7 @@ SwAttrSet::SwAttrSet( const SwAttrSet& rSet ) { } -SfxItemSet* SwAttrSet::Clone( sal_Bool bItems, SfxItemPool *pToPool ) const +SfxItemSet* SwAttrSet::Clone( bool bItems, SfxItemPool *pToPool ) const { if ( pToPool && pToPool != GetPool() ) { diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cac57ef73351..f56be968ce47 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1232,7 +1232,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, /* #i6447#: Only the selected items are copied from the old format. */ - SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( sal_True ); + SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( true ); // Copy only the set attributes. // The others should apply from the Templates. @@ -1537,7 +1537,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, // The TxtAttribute needs to be destroyed. // Unfortunately, this also destroys the Format next to the Frames. // To avoid this, we disconnect the attribute from the Format. - SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( sal_False ); + SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( false ); // Protect the Frame's size and position if ( rSdrObj.IsMoveProtect() || rSdrObj.IsResizeProtect() ) diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index c7d8b14338b4..125cc2b20efd 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1588,7 +1588,7 @@ sal_Bool SwCntntNode::GetAttr( SfxItemSet& rSet, sal_Bool bInParent ) const const SwAttrSet& rAttrSet = GetSwAttrSet(); if( bInParent ) - return rSet.Set( rAttrSet, sal_True ) ? sal_True : sal_False; + return rSet.Set( rAttrSet, true ) ? sal_True : sal_False; rSet.Put( rAttrSet ); return rSet.Count() ? sal_True : sal_False; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 53bed9a939e9..1ceadbf9c9b3 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1047,7 +1047,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const SET_CURR_SHELL( (SwViewShell*)this ); - if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), sal_True ) ) + if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), true ) ) return sal_False; // now examine all attributes. Remove forbidden attributes, then diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx index 61e4b888103f..43702d967adb 100644 --- a/sw/source/core/txtnode/swfntcch.cxx +++ b/sw/source/core/txtnode/swfntcch.cxx @@ -42,7 +42,7 @@ SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) : aSwFont.GoMagic( pSh, aSwFont.GetActual() ); const SwAttrSet& rAttrSet = ((SwTxtFmtColl *)pOwn)->GetAttrSet(); for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++) - pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, sal_True ); + pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true ); } SwFontObj::~SwFontObj() diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index b6e23cec0301..e9dbd89d9a09 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -884,7 +884,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, if ( !pCurrentCharFmt || 0 == CharFmt::GetItem( *pCurrentCharFmt, pItem->Which() ) ) { if ( !pNewSet ) - pNewSet = pNewStyle->Clone( sal_True ); + pNewSet = pNewStyle->Clone( true ); pNewSet->ClearItem( pItem->Which() ); } } @@ -1001,7 +1001,7 @@ SwTxtAttr* MakeTxtAttr( // different from rDoc's pool, we have to correct this: const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_cast<const SwFmtAutoFmt&>(rAttr).GetStyleHandle(); boost::scoped_ptr<const SfxItemSet> pNewSet( - pAutoStyle->SfxItemSet::Clone( sal_True, &rDoc.GetAttrPool() )); + pAutoStyle->SfxItemSet::Clone( true, &rDoc.GetAttrPool() )); SwTxtAttr* pNew = MakeTxtAttr( rDoc, *pNewSet, nStt, nEnd ); return pNew; } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 8cb04356a4ff..3c8adbec8b3b 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -311,7 +311,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, OSL_ENSURE( nWhichId, "lcl_HaveCommonAttributes not used correctly" ); if ( SFX_ITEM_SET == rSet2.GetItemState( nWhichId, false ) ) { - pNewSet = rSet2.Clone( sal_True ); + pNewSet = rSet2.Clone( true ); pNewSet->ClearItem( nWhichId ); } } @@ -324,7 +324,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, if ( SFX_ITEM_SET == rSet2.GetItemState( pItem->Which(), false ) ) { if ( !pNewSet ) - pNewSet = rSet2.Clone( sal_True ); + pNewSet = rSet2.Clone( true ); pNewSet->ClearItem( pItem->Which() ); } diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx index 75530245ff31..b133211a3ad6 100644 --- a/sw/source/core/uibase/docvw/edtwin.cxx +++ b/sw/source/core/uibase/docvw/edtwin.cxx @@ -2188,7 +2188,7 @@ KEYINPUT_CHECKTABLE_INSDEL: rSh.GetCurAttr(aSet); if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false)) { - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); bNormalChar = false; eKeyState = KS_End; rSh.ClickToINetAttr((const SwFmtINetFmt&)rItem, URLLOAD_NOFILTER); diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx index 8b96156db999..cf098136a655 100644 --- a/sw/source/core/uibase/shells/annotsh.cxx +++ b/sw/source/core/uibase/shells/annotsh.cxx @@ -824,7 +824,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) if(nEEWhich) { - rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich); + rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich); if(nEEWhich == EE_CHAR_KERNING) { SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true ); diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx index 8511fe50a303..b700ffeb618b 100644 --- a/sw/source/core/uibase/shells/drwtxtex.cxx +++ b/sw/source/core/uibase/shells/drwtxtex.cxx @@ -945,7 +945,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) } } if(nEEWhich) - rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich); + rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich); nWhich = aIter.NextWhich(); } diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx index 652ef4bbfabf..0a10d18f3568 100644 --- a/sw/source/core/uibase/shells/frmsh.cxx +++ b/sw/source/core/uibase/shells/frmsh.cxx @@ -737,7 +737,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case RES_PRINT: case RES_SURROUND: { - rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), sal_True )); + rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), true )); } break; case SID_OBJECT_ALIGN_LEFT : diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx index 57314e0e8848..635e21ec09fd 100644 --- a/sw/source/core/uibase/shells/textsh.cxx +++ b/sw/source/core/uibase/shells/textsh.cxx @@ -1083,17 +1083,17 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) nScript = g_pBreakIt->GetAllScriptsOfText( aChars ); if( SCRIPTTYPE_LATIN & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, sal_True ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_FONT); } if( SCRIPTTYPE_ASIAN & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, sal_True ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_CJK_FONT ); } if( SCRIPTTYPE_COMPLEX & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, sal_True ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_CTL_FONT ); } diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx index 05fccf2ec750..52efc16ab8ea 100644 --- a/sw/source/core/uibase/shells/textsh1.cxx +++ b/sw/source/core/uibase/shells/textsh1.cxx @@ -1281,7 +1281,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rWrtSh.GetCurAttr(aSet); if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true )) { - const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, sal_True) ); + const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, true) ); if( nSlot == FN_COPY_HYPERLINK_LOCATION ) { ::uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetView().GetEditWin().GetClipboard(); diff --git a/sw/source/core/uibase/shells/txtattr.cxx b/sw/source/core/uibase/shells/txtattr.cxx index 1b4350b31c08..628529c74d5c 100644 --- a/sw/source/core/uibase/shells/txtattr.cxx +++ b/sw/source/core/uibase/shells/txtattr.cxx @@ -692,10 +692,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) case RES_PARATR_DROP: { #if OSL_DEBUG_LEVEL > 1 - const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), sal_True); + const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), true); rSet.Put(rItem); #else - rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), sal_True)); + rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), true)); #endif nSlot = 0; } @@ -716,7 +716,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) { SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); rSet.Put(rItem); nSlot = 0; } diff --git a/sw/source/core/uibase/uiview/viewtab.cxx b/sw/source/core/uibase/uiview/viewtab.cxx index 83cd76885e3b..6d60fbd4b5d3 100644 --- a/sw/source/core/uibase/uiview/viewtab.cxx +++ b/sw/source/core/uibase/uiview/viewtab.cxx @@ -847,7 +847,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) SwFmtCol aCols( bSect ? pSectFmt->GetCol() : - (const SwFmtCol&)aSet.Get( RES_COL, sal_False )); + (const SwFmtCol&)aSet.Get( RES_COL, false )); SwRect aCurRect = rSh.GetAnyCurRect(bSect ? RECT_SECTION_PRT : RECT_FLY_PRT_EMBEDDED); const long lWidth = bVerticalWriting ? aCurRect.Height() : aCurRect.Width(); ::lcl_ConvertToCols( aColItem, sal_uInt16(lWidth), aCols ); diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx index da000d40c140..945bc0a7b31e 100644 --- a/sw/source/core/uibase/uno/unotxdoc.cxx +++ b/sw/source/core/uibase/uno/unotxdoc.cxx @@ -3230,19 +3230,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( LanguageType nLang = LANGUAGE_DONTKNOW; if (bLatin) { - nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bAsian) { - nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bComplex) { - nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } @@ -3278,19 +3278,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( LanguageType nLang = LANGUAGE_DONTKNOW; if (bLatin) { - nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bAsian) { - nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } if (bComplex) { - nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, sal_False )).GetLanguage(); + nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, false )).GetLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) aAllLangs.insert( nLang ); } diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 73b3a6b4f556..84ba271d71e2 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -124,7 +124,7 @@ SwUndoFmtAttr::SwUndoFmtAttr( const SfxPoolItem& rItem, SwFmt& rChgFmt, bool bSaveDrawPt ) : SwUndo( UNDO_INSFMTATTR ) , m_pFmt( &rChgFmt ) - , m_pOldSet( m_pFmt->GetAttrSet().Clone( sal_False ) ) + , m_pOldSet( m_pFmt->GetAttrSet().Clone( false ) ) , m_nNodeIndex( 0 ) , m_nFmtWhich( rChgFmt.Which() ) , m_bSaveDrawPt( bSaveDrawPt ) @@ -411,7 +411,7 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt ) } const SwFmtAnchor& rAnchor = - static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, sal_False ) ); + static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) ); if( !rAnchor.GetCntntAnchor() ) return; @@ -443,7 +443,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) SwDoc *const pDoc = & rContext.GetDoc(); SwFlyFrmFmt* pFrmFmt = static_cast<SwFlyFrmFmt*>(m_pFmt); const SwFmtAnchor& rAnchor = - static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, sal_False ) ); + static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) ); SwFmtAnchor aNewAnchor( rAnchor.GetAnchorId() ); if (FLY_AT_PAGE != rAnchor.GetAnchorId()) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 248bd160e6ff..1eeddb71fef4 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2028,7 +2028,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) { if (!pSetParent.get()) { - pSetParent.reset( pSet->Clone( sal_False ) ); + pSetParent.reset( pSet->Clone( false ) ); // #i63870# SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSetParent, true, false ); diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 8374d19e668c..3df30abc523c 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -318,7 +318,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, if( SFX_ITEM_SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) || MINFLY > ((SwFmtFrmSize*)pItem)->GetWidth() ) { - SwFmtFrmSize aSz((SwFmtFrmSize&)rFlySet.Get(RES_FRM_SIZE, sal_True)); + SwFmtFrmSize aSz((SwFmtFrmSize&)rFlySet.Get(RES_FRM_SIZE, true)); if (pItem) aSz = (SwFmtFrmSize&)(*pItem); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index dae3d002ede8..22b38d0eb0d3 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1261,7 +1261,7 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, 0 ); - aTstItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True ); + aTstItemSet.Set( pDCCharFmt->GetAttrSet(), true ); return HasScriptDependentItems( aTstItemSet, sal_False ); } } @@ -1413,7 +1413,7 @@ static void OutCSS1DropCapRule( RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT, 0 ); if( pDCCharFmt ) - aScriptItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True ); + aScriptItemSet.Set( pDCCharFmt->GetAttrSet(), true ); OUString aNewSelector( aSelector ); aNewSelector += ".western" + aPseudo; @@ -1525,7 +1525,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, // (all but for nDeep==1) const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet(); SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() ); - aItemSet.Set( rFmtItemSet, sal_True ); // Was nDeep!=1 that is not working + aItemSet.Set( rFmtItemSet, true ); // Was nDeep!=1 that is not working // for script dependent items buts should // not make a difference for any other @@ -1727,7 +1727,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, const SwFrmFmt &rMaster = rPageDesc.GetMaster(); SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(), RES_LR_SPACE, RES_UL_SPACE ); - aItemSet.Set( rMaster.GetAttrSet(), sal_True ); + aItemSet.Set( rMaster.GetAttrSet(), true ); if( pRefPageDesc ) { @@ -1779,7 +1779,7 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo, { const SfxItemSet& rFmtItemSet = pSymCharFmt->GetAttrSet(); SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() ); - aItemSet.Set( rFmtItemSet, sal_True ); + aItemSet.Set( rFmtItemSet, true ); // If there are footnotes or endnotes, then all Attributes have to be // exported, so that Netscape displays the document correctly. diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 2a85ebcb4421..1753a89c653b 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -293,7 +293,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, // sollen ist harte Attributierung noetig. Fuer Vorlagen, die // nicht von HTML-Tag-Vorlagen abgeleitet sind, gilt das immer - pItemSet->Set( pFmt->GetAttrSet(), sal_True ); + pItemSet->Set( pFmt->GetAttrSet(), true ); if( pReferenceFmt ) SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFmt->GetAttrSet(), diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 17a02cddec0c..2a1668243558 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -689,8 +689,8 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, if( aClearItems[j] || (pParentItemSet && SFX_ITEM_SET == rItemSet.GetItemState( nWhich, false, &pItem ) && - (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, sal_True ) ) - : *pItem == pParentItemSet->Get(nWhich, sal_True ) ) ) ) + (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, true ) ) + : *pItem == pParentItemSet->Get(nWhich, true ) ) ) ) { rItemSet.ClearItem( nWhich ); } diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 59ac277848b6..3d93e702274a 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -1918,7 +1918,7 @@ void SwFltOutDoc::EndFly() /*virtual*/ const SfxPoolItem& SwFltFormatCollection::GetFlyFrmAttr(sal_uInt16 nWhich) { if( pFlyAttrs ) - return pFlyAttrs->Get( nWhich, sal_False ); + return pFlyAttrs->Get( nWhich, false ); else return GetDoc().GetAttrPool().GetDefaultItem(nWhich); } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 465f04339ef7..76e2d16d3999 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3329,7 +3329,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh { const SwAttrSet& aSet = pAktColl->GetAttrSet(); SvxUnderlineItem *pUnderline - = (SvxUnderlineItem *)(aSet.Get( RES_CHRATR_UNDERLINE, sal_False ).Clone()); + = (SvxUnderlineItem *)(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone()); if(pUnderline){ pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) ); pAktColl->SetFmtAttr( *pUnderline ); @@ -3342,7 +3342,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh if ( SFX_ITEM_SET == pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) ) { SvxUnderlineItem *pUnderline - = (SvxUnderlineItem *)(pAktItemSet->Get( RES_CHRATR_UNDERLINE, sal_False ) .Clone()); + = (SvxUnderlineItem *)(pAktItemSet->Get( RES_CHRATR_UNDERLINE, false ) .Clone()); if(pUnderline){ pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) ); pAktItemSet->Put( *pUnderline ); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index fc7af67f8f25..cafe6f1fedce 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -776,7 +776,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) sal_uInt16 nNewPos = rDocFmts.GetPos( pFmt ); if( USHRT_MAX != nNewPos ) { - SfxItemSet* pSet = pFmt->GetAttrSet().Clone( sal_False ); + SfxItemSet* pSet = pFmt->GetAttrSet().Clone( false ); if( pFmt->GetCol() != pRepr->GetCol() ) pSet->Put( pRepr->GetCol() ); @@ -2025,9 +2025,9 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn, void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet ) { ResetState( sal_True, (const SwFmtFtnAtTxtEnd&)rSet.Get( - RES_FTN_AT_TXTEND, sal_False )); + RES_FTN_AT_TXTEND, false )); ResetState( sal_False, (const SwFmtEndAtTxtEnd&)rSet.Get( - RES_END_AT_TXTEND, sal_False )); + RES_END_AT_TXTEND, false )); } SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, |