diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-26 15:34:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-27 13:45:09 +0200 |
commit | 34002c4e5cf68ac0c98c3922c653c9ea8b898207 (patch) | |
tree | a1a87e45a968cee95e8db7d2f5704070a04b2934 /cui/source/tabpages | |
parent | ffca95023020a24eaff4ece1d4c7bedd469bfb78 (diff) |
sfx2: sal_Bool->bool
Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14
Diffstat (limited to 'cui/source/tabpages')
29 files changed, 98 insertions, 98 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index e8610a7cdd94..3f56ffafc6ad 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -265,7 +265,7 @@ sal_uInt16* AlignmentTabPage::GetRanges() return s_pRanges; } -sal_Bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) { bool bChanged = SfxTabPage::FillItemSet(rSet); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 848190c048b5..81d76d76e2d0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -197,7 +197,7 @@ SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, return new OfaAutocorrOptionsPage(pParent, rSet); } -sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); long nFlags = pAutoCorrect->GetFlags(); @@ -481,7 +481,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet); } -sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) +bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) { bool bModified = false; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -594,7 +594,7 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) rCfg.Commit(); } - return sal_True; + return true; } void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) @@ -921,7 +921,7 @@ int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -959,7 +959,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) pAutoCorrect->MakeCombinedChanges( aNewWords, aDeleteWords, eCurrentLang ); } aChangesTable.clear(); - return sal_False; + return false; } void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, @@ -1422,7 +1422,7 @@ int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); for(StringsTable::reverse_iterator it1 = aStringsTable.rbegin(); it1 != aStringsTable.rend(); ++it1) @@ -1526,7 +1526,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag( SaveWordCplSttLst, m_pAutoAbbrevCB->IsChecked()); if(TriState(m_pAutoCapsCB->IsChecked()) != m_pAutoCapsCB->GetSavedValue()) pAutoCorrect->SetAutoCorrFlag( SaveWordWrdSttLst, m_pAutoCapsCB->IsChecked()); - return sal_False; + return false; } void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) @@ -1823,7 +1823,7 @@ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, return new OfaQuoteTabPage(pParent, rAttrSet); } -sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) +bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -2148,7 +2148,7 @@ SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, return new OfaAutoCompleteTabPage( pParent, rSet ); } -sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) +bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) { bool bModified = false, bCheck; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -2198,7 +2198,7 @@ sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) rCfg.SetModified(); rCfg.Commit(); } - return sal_True; + return true; } void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) @@ -2518,7 +2518,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) /** Propagates the current settings to the smart tag manager. */ -sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) +bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -2526,7 +2526,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) // robust! if ( !pSmartTagMgr ) - return sal_False; + return false; sal_Bool bModifiedSmartTagTypes = sal_False; std::vector< OUString > aDisabledSmartTagTypes; @@ -2556,7 +2556,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) bModifiedSmartTagTypes ? &aDisabledSmartTagTypes : 0 ); } - return sal_True; + return true; } /** Sets the controls based on the current settings at SmartTagMgr. diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 19f5a363e1e4..5eea3323ad67 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -733,7 +733,7 @@ void SvxBackgroundTabPage::FillUserData() -sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() ) { @@ -748,7 +748,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC ); - sal_Bool bModified = sal_False; + bool bModified = false; sal_uInt16 nSlot = SID_ATTR_BRUSH; if ( m_pTblLBox->IsVisible() ) @@ -811,7 +811,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( rOldItem.GetColor() != aBgdColor || (SFX_ITEM_AVAILABLE >= eOldItemState && !m_pBackgroundColorSet->IsNoSelection())) { - bModified = sal_True; + bModified = true; rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) @@ -851,7 +851,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) != aBgdGraphic.GetBitmap() ) ) { - bModified = sal_True; + bModified = true; SvxBrushItem aTmpBrush(nWhich); if ( bIsLink ) @@ -922,7 +922,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != Color( COL_WHITE ) ) { rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); - bModified = sal_True; + bModified = true; } if( m_pTblLBox->IsVisible() ) @@ -936,7 +936,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pTableBck_Impl->pCellBrush != *pOldCell ) { rCoreSet.Put( *pTableBck_Impl->pCellBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -948,7 +948,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pTableBck_Impl->pRowBrush != *pOldRow ) { rCoreSet.Put( *pTableBck_Impl->pRowBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -960,7 +960,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pTableBck_Impl->pTableBrush != *pOldTable ) { rCoreSet.Put( *pTableBck_Impl->pTableBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -968,7 +968,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pTblLBox->GetSelectEntryPos() ) ); - bModified |= sal_True; + bModified |= true; } } else if (m_pParaLBox->GetData() == m_pParaLBox) @@ -982,7 +982,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pParaBck_Impl->pParaBrush != *pOldPara ) { rCoreSet.Put( *pParaBck_Impl->pParaBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -998,7 +998,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) *pParaBck_Impl->pCharBrush != SvxBrushItem(SID_ATTR_BRUSH_CHAR))) { rCoreSet.Put( *pParaBck_Impl->pCharBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -1006,19 +1006,19 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pParaLBox->GetSelectEntryPos() ) ); - bModified |= sal_True; + bModified |= true; } } return bModified; } -sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot) +bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot) { sal_uInt16 nWhich = GetWhich( nSlot ); const SfxPoolItem* pOld = GetOldItem( rCoreSet, nSlot ); DBG_ASSERT(pOld,"FillItemSetWithWallpaperItem: Item not found"); if (!pOld) - return sal_False; + return false; const SfxItemSet& rOldSet = GetItemSet(); SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 10c3c42571d3..d6a35e41a241 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -593,7 +593,7 @@ int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) +bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 652141c58109..5f8e25540e6d 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -839,9 +839,9 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp -sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ) +bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ) { - sal_Bool bModified = sal_False; + bool bModified = false; FontNameBox* pNameBox = NULL; FontStyleBox* pStyleBox = NULL; @@ -915,7 +915,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && !rFontName.isEmpty() ) { rSet.Put( aFontItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) rSet.ClearItem( nWhich ); @@ -965,7 +965,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && !aText.isEmpty() ) { rSet.Put( aWeightItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1012,7 +1012,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && !aText.isEmpty() ) { rSet.Put( aPostureItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1072,7 +1072,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan float fSize = (float)nSize / 10; rSet.Put( SvxFontHeightItem( CalcToUnit( fSize, eUnit ), 100, nWhich ) ); } - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1103,7 +1103,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxLanguageItem( eLangType, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1179,9 +1179,9 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = FillItemSet_Impl( rSet, Western ); + bool bModified = FillItemSet_Impl( rSet, Western ); bModified |= FillItemSet_Impl( rSet, Asian ); bModified |= FillItemSet_Impl( rSet, Ctl ); return bModified; @@ -2161,7 +2161,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); @@ -3119,7 +3119,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { // Position (high, normal or low) const SfxItemSet& rOldSet = GetItemSet(); @@ -3465,7 +3465,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) { const SfxItemSet& rOldSet = GetItemSet(); sal_Bool bModified = sal_False, bChanged = sal_True; diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index e16950107a1e..3fa0f2e395a2 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -308,58 +308,58 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) { - sal_Bool bModified = sal_False; + bool bModified = false; sal_Int32 nValue; if( m_pMtrFldHorz1->GetText() != m_pMtrFldHorz1->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHorz1, eUnit ); rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldHorz2->GetText() != m_pMtrFldHorz2->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHorz2, eUnit ); rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldVert1->GetText() != m_pMtrFldVert1->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldVert1, eUnit ); rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldVert2->GetText() != m_pMtrFldVert2->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldVert2, eUnit ); rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldLine1->GetText() != m_pMtrFldLine1->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldLine1, eUnit ); rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldLine2->GetText() != m_pMtrFldLine2->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldLine2, eUnit ); rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldLine3->GetText() != m_pMtrFldLine3->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldLine3, eUnit ); rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) ); - bModified = sal_True; + bModified = true; } @@ -369,7 +369,7 @@ sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { rAttrs.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) ); - bModified = sal_True; + bModified = true; } } diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 11a546e1b238..4f177947b3f9 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -130,7 +130,7 @@ void SvxDistributePage::Reset(const SfxItemSet& ) |* \************************************************************************/ -sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& ) +bool SvxDistributePage::FillItemSet( SfxItemSet& ) { SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone); SvxDistributeVertical eDistributeVer(SvxDistributeVerticalNone); @@ -157,10 +157,10 @@ sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& ) { m_eDistributeHor = eDistributeHor; m_eDistributeVer = eDistributeVer; - return sal_True; + return true; } - return sal_False; + return false; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index e4bc0aef15c3..0c673b167c38 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -233,7 +233,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) bReset = sal_False; } -sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) +bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) { const SfxItemPool& rPool = *rSet.GetPool(); bool bModified = false; diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index daaad329d804..a46fffdfc44f 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -140,7 +140,7 @@ void SvxCaptionTabPage::Construct() -sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) +bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) { SfxItemPool* pPool = _rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -207,7 +207,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) //NYI-------------the angles have to be added here!!! XXX---------------------- - return( sal_True ); + return true; } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 85d51c0e4588..1f9307854dd9 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -172,7 +172,7 @@ void _SfxMacroTabPage::ScriptChanged() EnableButtons(); } -sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) +bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) { SvxMacroItem aItem( GetWhich( aPageRg[0] ) ); ((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl; @@ -182,9 +182,9 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) || aItem != *(SvxMacroItem*)pItem ) { rSet.Put( aItem ); - return sal_True; + return true; } - return sal_False; + return false; } void _SfxMacroTabPage::LaunchFillGroup() diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index bc617adfc63a..79ba0843c44e 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -418,7 +418,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) +bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; sal_Int32 nValue; diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 4c380af2f37a..837f18ce69d7 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -685,7 +685,7 @@ void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag) #* #************************************************************************/ -sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) +bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { sal_Bool bDataChanged = m_pFtLanguage->IsEnabled() || m_pCbSourceFormat->IsEnabled(); if ( bDataChanged ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index f7716977298d..ffcc27828317 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -228,7 +228,7 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, return new SvxSingleNumPickTabPage(pParent, rAttrSet); } -sal_Bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pSaveNum) { @@ -389,7 +389,7 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, return new SvxBulletPickTabPage(pParent, rAttrSet); } -sal_Bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) { @@ -586,7 +586,7 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, return new SvxNumPickTabPage(pParent, rAttrSet); } -sal_Bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) { @@ -869,11 +869,11 @@ int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( aGrfNames.empty() ) { - return sal_False; + return false; } if( (bPreset || bModified) && pActNum) { @@ -1194,7 +1194,7 @@ int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) return sal_True; } -sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); if(bModified && pActNum) @@ -2961,7 +2961,7 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 58853eef05c8..84bf61c6579b 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -661,7 +661,7 @@ void SvxPageDescPage::FillUserData() -sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) +bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; const SfxItemSet& rOldSet = GetItemSet(); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 35d76d7fd31f..6cb2a847213a 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -198,7 +198,7 @@ SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet& r return new SvxStdParagraphTabPage( pParent, rSet ); } -sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { SfxItemState eState = SFX_ITEM_UNKNOWN; const SfxPoolItem* pOld = 0; @@ -1054,7 +1054,7 @@ sal_uInt16* SvxParaAlignTabPage::GetRanges() return pAlignRanges; } -sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bModified = sal_False; @@ -1324,7 +1324,7 @@ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, return new SvxExtParagraphTabPage( pParent, rSet ); } -sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bModified = sal_False; sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); @@ -2147,7 +2147,7 @@ sal_uInt16* SvxAsianTabPage::GetRanges() return pRanges; } -sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bRet = sal_False; SfxItemPool* pPool = rSet.GetPool(); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 0b9a01cc3d54..a18c90354e47 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -726,7 +726,7 @@ sal_uInt16* SvxSwPosSizeTabPage::GetRanges() return pSwPosRanges; } -sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) +bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { bool bAnchorChanged = false; short nAnchor = GetAnchorType(&bAnchorChanged); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index ae4706eae637..afaff7c771c8 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -201,7 +201,7 @@ sal_uInt16* SvxTabulatorTabPage::GetRanges() -sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 139c3d179b55..accca2fe1b7b 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -332,7 +332,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; sal_Int32 nPos; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 282d00920dba..84c4f2fbbdcd 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -320,7 +320,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) { SfxItemPool* pPool = rAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -460,7 +460,7 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) rAttrs.Put( SdrTextHorzAdjustItem( eTHA ) ); } - return( sal_True ); + return true; } void SvxTextAttrPage::Construct() diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 488c8e1ddf93..43dd000f766d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -293,7 +293,7 @@ sal_uInt16* SvxTransparenceTabPage::GetRanges() return(pTransparenceRanges); } -sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) +bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { const SfxPoolItem* pGradientItem = NULL; const SfxPoolItem* pLinearItem = NULL; @@ -966,7 +966,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { sal_Int32 _nPos; sal_Bool bModified = sal_False; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 17aadf2be2cc..8853bc957c54 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -225,7 +225,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) -sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) +bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) { if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog { @@ -249,7 +249,7 @@ sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) } } - return sal_True; + return true; } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 6f242a794b65..b9bef9861b68 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -556,7 +556,7 @@ long SvxColorTabPage::CheckChanges_Impl() -sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) { if( ( nDlgType != 0 ) || ( *pPageType == PT_COLOR && *pbAreaTP == sal_False ) ) @@ -580,7 +580,7 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) rSet.Put( XFillStyleItem( XFILL_SOLID ) ); } - return( sal_True ); + return true; } void SvxColorTabPage::UpdateModified() diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index def2fa7bfa0f..18b8ccec7f3c 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -306,7 +306,7 @@ long SvxGradientTabPage::CheckChanges_Impl() -sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) { if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False ) { @@ -340,7 +340,7 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) delete pXGradient; } - return sal_True; + return true; } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 374c4c77864b..e79b839e1580 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -278,7 +278,7 @@ long SvxHatchTabPage::CheckChanges_Impl() -sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) { if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog { @@ -309,7 +309,7 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) delete pXHatch; } } - return sal_True; + return true; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 6bd4deddd722..a9a27e4c6c4c 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -666,7 +666,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; sal_Int32 nPos; diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 6f63b82680fb..7be9c1bcc07b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -257,7 +257,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() -sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) { if( nDlgType == 0 ) // line dialog { @@ -270,7 +270,7 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( XLineDashItem( aString, aDash ) ); } } - return( sal_True ); + return true; } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 7e38307ed807..cad882b53a98 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -205,7 +205,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() -sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) { if( nDlgType == 0 ) // line dialog { @@ -220,7 +220,7 @@ sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) rSet.Put( XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); } } - return( sal_True ); + return true; } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 98378f102172..77ca6c1c9fd5 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -244,7 +244,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; sal_Bool bModified = sal_False; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index bdaee0c24cc7..5a991bfb1298 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -273,7 +273,7 @@ void SvxAngleTabPage::Construct() } } -sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) +bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) { sal_Bool bModified = sal_False; @@ -476,7 +476,7 @@ void SvxSlantTabPage::Construct() -sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) +bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; OUString aStr = m_pMtrRadius->GetText(); @@ -782,7 +782,7 @@ void SvxPositionSizeTabPage::Construct() -sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { sal_Bool bModified(sal_False); |