From d40a66cdb86d7a1102435606ad6e9d406c265bca Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 5 Oct 2010 07:57:51 -0500 Subject: [PATCH] FASTBOOL to bool conversion --- basctl/source/basicide/basides2.cxx | 4 +- basctl/source/dlged/dlgedfunc.cxx | 2 +- basctl/source/dlged/dlgedmod.cxx | 6 +- basctl/source/dlged/dlgedobj.cxx | 10 +- basctl/source/dlged/dlgedpage.cxx | 2 +- basctl/source/inc/basidesh.hxx | 2 +- basctl/source/inc/dlgedmod.hxx | 4 +- basctl/source/inc/dlgedobj.hxx | 4 +- basctl/source/inc/dlgedpage.hxx | 2 +- cui/source/dialogs/cuicharmap.cxx | 2 +- cui/source/dialogs/iconcdlg.cxx | 2 +- cui/source/inc/page.hxx | 4 +- cui/source/options/dbregister.cxx | 2 +- cui/source/options/optpath.cxx | 4 +- cui/source/tabpages/backgrnd.cxx | 2 +- cui/source/tabpages/chardlg.cxx | 140 +++++++++++++++++----------------- cui/source/tabpages/numpages.cxx | 4 +- cui/source/tabpages/page.cxx | 4 +- cui/source/tabpages/paragrph.cxx | 48 ++++++------ 19 files changed, 124 insertions(+), 124 deletions(-) diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 78f4079..6c76c7b 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -328,10 +328,10 @@ void __EXPORT BasicIDEShell::Move() ((ModulWindow*)pCurWin)->FrameWindowMoved(); } -void __EXPORT BasicIDEShell::ShowCursor( FASTBOOL bOn ) +void __EXPORT BasicIDEShell::ShowCursor( bool bOn ) { if ( pCurWin && pCurWin->ISA( ModulWindow ) ) - ((ModulWindow*)pCurWin)->ShowCursor( (BOOL)bOn ); + ((ModulWindow*)pCurWin)->ShowCursor( bOn ); } // Hack for #101048 diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index e24f3d1..dd06d1b 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -302,7 +302,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) if ( pView->IsDragObj() ) { - FASTBOOL bWasNoSnap = rDragStat.IsNoSnap(); + bool bWasNoSnap = rDragStat.IsNoSnap(); BOOL bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx index d10f9f7..9ba5204 100644 --- a/basctl/source/dlged/dlgedmod.cxx +++ b/basctl/source/dlged/dlgedmod.cxx @@ -55,7 +55,7 @@ DlgEdModel::~DlgEdModel() //---------------------------------------------------------------------------- -SdrPage* DlgEdModel::AllocPage(FASTBOOL bMasterPage) +SdrPage* DlgEdModel::AllocPage(bool bMasterPage) { DBG_CHKTHIS(DlgEdModel, 0); return new DlgEdPage(*this, bMasterPage); @@ -63,9 +63,9 @@ SdrPage* DlgEdModel::AllocPage(FASTBOOL bMasterPage) //---------------------------------------------------------------------------- -void DlgEdModel::DlgEdModelChanged( FASTBOOL bChanged ) +void DlgEdModel::DlgEdModelChanged(bool bChanged ) { - SetChanged( static_cast< sal_Bool > ( bChanged ) ); + SetChanged( bChanged ); } //---------------------------------------------------------------------------- diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 50b54c6..7f77467 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1051,9 +1051,9 @@ void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti //---------------------------------------------------------------------------- -FASTBOOL DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { - FASTBOOL bResult = SdrUnoObj::EndCreate(rStat, eCmd); + bool bResult = SdrUnoObj::EndCreate(rStat, eCmd); SetDefaults(); StartListening(); @@ -1827,9 +1827,9 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract //---------------------------------------------------------------------------- -FASTBOOL DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { - FASTBOOL bResult = SdrUnoObj::EndCreate(rStat, eCmd); + bool bResult = SdrUnoObj::EndCreate(rStat, eCmd); // stop listening EndListening(sal_False); @@ -1837,7 +1837,7 @@ FASTBOOL DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) // set geometry properties SetPropsFromRect(); - // dialog model changed + // dialog model changed GetDlgEditor()->SetDialogModelChanged(TRUE); // start listening diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx index dab260d..5fbc70c 100644 --- a/basctl/source/dlged/dlgedpage.cxx +++ b/basctl/source/dlged/dlgedpage.cxx @@ -39,7 +39,7 @@ TYPEINIT1( DlgEdPage, SdrPage ); //---------------------------------------------------------------------------- -DlgEdPage::DlgEdPage( DlgEdModel& rModel, FASTBOOL bMasterPage ) +DlgEdPage::DlgEdPage( DlgEdModel& rModel, bool bMasterPage ) :SdrPage( rModel, bMasterPage ) { } diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 56ce8e4..7042d25 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -157,7 +157,7 @@ protected: virtual void Deactivate(BOOL bMDI); virtual void Move(); - virtual void ShowCursor( FASTBOOL bOn = TRUE ); + virtual void ShowCursor( bool bOn = true ); void CreateModulWindowLayout(); void DestroyModulWindowLayout(); diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index 1930fe3..82567a1 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -54,9 +54,9 @@ public: DlgEdModel(); virtual ~DlgEdModel(); - virtual void DlgEdModelChanged( FASTBOOL bChanged = TRUE ); + virtual void DlgEdModelChanged( bool bChanged = true ); - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual Window* GetCurDocViewWin(); }; diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 99dc8ee..11f80d8 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -68,7 +68,7 @@ protected: virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); DECL_LINK(OnCreate, void* ); @@ -160,7 +160,7 @@ protected: virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); public: TYPEINFO(); diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index 0229b5d..ef8db5a 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -45,7 +45,7 @@ private: public: TYPEINFO(); - DlgEdPage( DlgEdModel& rModel, FASTBOOL bMasterPage=FALSE ); + DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false ); DlgEdPage( const DlgEdPage& ); virtual ~DlgEdPage(); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 536e86c..514e1ec 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -312,7 +312,7 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe // the font may not be in the list => // try to find a font name token in list and select found font, // else select topmost entry - FASTBOOL bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND ); + bool bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND ); if( !bFound ) { for ( xub_StrLen i = 0; i < aDefStr.GetTokenCount(); ++i ) diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 2d0dab4..eb017cb 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1131,7 +1131,7 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) { - FASTBOOL bSet = ( pSet != NULL ); + bool bSet = ( pSet != NULL ); pSet = pInSet; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index b761a3d..0633dcf 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -166,7 +166,7 @@ class SvxPageDescPage : public SfxTabPage Size aMaxSize; BOOL bLandscape; - FASTBOOL bBorderModified; + bool bBorderModified; SvxModeType eMode; Paper ePaperStart; Paper ePaperEnd; @@ -178,7 +178,7 @@ class SvxPageDescPage : public SfxTabPage DECL_LINK( LayoutHdl_Impl, ListBox* ); DECL_LINK( PaperBinHdl_Impl, ListBox* ); DECL_LINK( SwapOrientation_Impl, RadioButton* ); - void SwapFirstValues_Impl( FASTBOOL bSet ); + void SwapFirstValues_Impl( bool bSet ); DECL_LINK( BorderModify_Impl, MetricField* ); void InitHeadFoot_Impl( const SfxItemSet& rSet ); DECL_LINK( CenterHdl_Impl, CheckBox* ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index f73435f..ae81bab 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -452,7 +452,7 @@ String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation) // old path is an URL? INetURLObject aObj( _sLocation ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); + bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); Sequence< ::rtl::OUString > aFiles = xFilePicker->getFiles(); INetURLObject aNewObj( aFiles[0] ); aNewObj.removeFinalSlash(); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 75b9c78..d40f66a 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -508,7 +508,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // old path is an URL? INetURLObject aObj( sWritable ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); + bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); rtl::OUString aPathStr( _rFolder ); INetURLObject aNewObj( aPathStr ); aNewObj.removeFinalSlash(); @@ -516,7 +516,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // then the new path also an URL else system path String sNewPathStr = bURL ? aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); - FASTBOOL bChanged = + bool bChanged = #ifdef UNX // Unix is case sensitive ( sNewPathStr != sWritable ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 67f3bee..07479cd 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1190,7 +1190,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() const SfxPoolItem* pItem = NULL; XColorTable* pColorTable = NULL; const Size aSize15x15 = Size( 15, 15 ); - FASTBOOL bOwn = FALSE; + bool bOwn = FALSE; if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 76d49ac..48b4496 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -720,7 +720,7 @@ void SvxCharNamePage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); //DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = FALSE; + bool bKillTable = false; const SfxPoolItem* pItem = NULL; if ( pDocSh ) @@ -733,7 +733,7 @@ void SvxCharNamePage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = true; } m_pColorLB->SetUpdateMode( FALSE ); @@ -1047,8 +1047,8 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp FillStyleBox_Impl( pNameBox ); - FASTBOOL bStyle = FALSE; - FASTBOOL bStyleAvailable = TRUE; + bool bStyle = false; + bool bStyleAvailable = true; FontItalic eItalic = ITALIC_NONE; FontWeight eWeight = WEIGHT_NORMAL; switch ( eLangGrp ) @@ -1063,7 +1063,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp { const SvxPostureItem& rItem = (SvxPostureItem&)rSet.Get( nWhich ); eItalic = (FontItalic)rItem.GetValue(); - bStyle = TRUE; + bStyle = true; } bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); @@ -1081,7 +1081,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp eWeight = (FontWeight)rItem.GetValue(); } else - bStyle = FALSE; + bStyle = false; bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); // Aktuell eingestellter Font @@ -1240,7 +1240,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - FASTBOOL bChanged = TRUE; + bool bChanged = true; const String& rFontName = pNameBox->GetText(); const FontList* pFontList = GetFontList(); String aStyleBoxText =pStyleBox->GetText(); @@ -1257,7 +1257,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SvxFontItem& rItem = *( (const SvxFontItem*)pOld ); if ( rItem.GetFamilyName() == aFontItem.GetFamilyName() ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged ) @@ -1266,12 +1266,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && ( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && rFontName.Len() ) { rSet.Put( aFontItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) rSet.ClearItem( nWhich ); @@ -1296,7 +1296,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SvxWeightItem& rItem = *( (const SvxWeightItem*)pOld ); if ( rItem.GetValue() == aWeightItem.GetValue() ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged ) @@ -1305,7 +1305,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( m_pImpl->m_bInSearchMode && bChanged && aInfo.GetWeight() == WEIGHT_NORMAL && aInfo.GetItalic() != ITALIC_NONE ) - bChanged = FALSE; + bChanged = true; } if ( !bChanged && pExampleSet && @@ -1321,12 +1321,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( bChanged && aText.Len() ) { rSet.Put( aWeightItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_POSTURE; break; @@ -1360,7 +1360,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && ( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() ) - bChanged = TRUE; + bChanged = true; if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) bChanged = ( nEntryPos == ( m_pImpl->m_nExtraEntryPos + 1 ) ); @@ -1368,7 +1368,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( bChanged && aText.Len() ) { rSet.Put( aPostureItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -1379,12 +1379,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck nSize = 0; long nSavedSize = pSizeBox->GetSavedValue().ToInt32(); - FASTBOOL bRel = TRUE; + bool bRel = true; if ( !pSizeBox->IsRelative() ) { nSavedSize *= 10; - bRel = FALSE; + bRel = false; } switch ( eLangGrp ) @@ -1403,7 +1403,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp float fSize = (float)nSize / 10; long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) ); if ( ( (SvxFontHeightItem*)pItem )->GetHeight() != (UINT32)nVal ) - bChanged = TRUE; + bChanged = true; } if ( bChanged || !pOldHeight || @@ -1428,12 +1428,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp float fSize = (float)nSize / 10; rSet.Put( SvxFontHeightItem( CalcToUnit( fSize, eUnit ), 100, nWhich ) ); } - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_LANGUAGE; break; @@ -1459,7 +1459,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxLanguageItem( eLangType, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -1834,7 +1834,7 @@ void SvxCharEffectsPage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = FALSE; + bool bKillTable = false; if ( pDocSh ) { @@ -1846,7 +1846,7 @@ void SvxCharEffectsPage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = true; } m_aUnderlineColorLB.SetUpdateMode( FALSE ); @@ -2244,7 +2244,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(ULONG)m_aUnderlineLB.GetEntryData(i) == eUnderline ) { m_aUnderlineLB.SelectEntryPos(i); - bEnable |= TRUE; + bEnable = TRUE; break; } } @@ -2301,7 +2301,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(ULONG)m_aOverlineLB.GetEntryData(i) == eOverline ) { m_aOverlineLB.SelectEntryPos(i); - bEnable |= TRUE; + bEnable = TRUE; break; } } @@ -2358,7 +2358,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontStrikeout)(ULONG)m_aStrikeoutLB.GetEntryData(i) == eStrikeout ) { m_aStrikeoutLB.SelectEntryPos(i); - bEnable |= TRUE; + bEnable = TRUE; break; } } @@ -2661,7 +2661,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); BOOL bModified = FALSE; - FASTBOOL bChanged = TRUE; + bool bChanged = true; // Underline USHORT nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); @@ -2682,7 +2682,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eUnder && ( UNDERLINE_NONE == eUnder || rItem.GetColor() == m_aUnderlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = FALSE; + bChanged = false; } if ( bChanged ) @@ -2690,12 +2690,12 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxUnderlineItem aNewItem( eUnder, nWhich ); aNewItem.SetColor( m_aUnderlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Overline nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE ); @@ -2716,7 +2716,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eOver && ( UNDERLINE_NONE == eOver || rItem.GetColor() == m_aOverlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = FALSE; + bChanged = false; } if ( bChanged ) @@ -2724,12 +2724,12 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxOverlineItem aNewItem( eOver, nWhich ); aNewItem.SetColor( m_aOverlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); @@ -2749,18 +2749,18 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld ); if ( !m_aStrikeoutLB.IsEnabled() || ((FontStrikeout)rItem.GetValue() == eStrike && !bAllowChg) ) - bChanged = FALSE; + bChanged = false; } if ( bChanged ) { rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Individual words nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); @@ -2770,22 +2770,22 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxWordLineModeItem& rItem = *( (const SvxWordLineModeItem*)pOld ); if ( rItem.GetValue() == m_aIndividualWordsBtn.IsChecked() ) - bChanged = FALSE; + bChanged = false; } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aIndividualWordsBtn.IsChecked() == m_aIndividualWordsBtn.GetSavedValue() ) - bChanged = FALSE; + bChanged = false; if ( bChanged ) { rSet.Put( SvxWordLineModeItem( m_aIndividualWordsBtn.IsChecked(), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); @@ -2805,34 +2805,34 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxEmphasisMarkItem& rItem = *( (const SvxEmphasisMarkItem*)pOld ); if ( rItem.GetEmphasisMark() == eMark ) - bChanged = FALSE; + bChanged = false; } } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aEmphasisLB.GetSavedValue() == nMarkPos && m_aPositionLB.GetSavedValue() == nPosPos ) - bChanged = FALSE; + bChanged = false; if ( bChanged ) { rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Effects nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; - FASTBOOL bChecked = FALSE; + bool bChecked = false; USHORT nCapsPos = m_aEffects2LB.GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { eCaseMap = (SvxCaseMap)nCapsPos; - bChecked = TRUE; + bChecked = true; } if ( pOld ) @@ -2846,18 +2846,18 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld ); if ( (SvxCaseMap)rItem.GetValue() == eCaseMap && !bAllowChg ) - bChanged = FALSE; + bChanged = false; } if ( bChanged && bChecked ) { rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); @@ -2879,22 +2879,22 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxContourItem& rItem = *( (const SvxContourItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aOutlineBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxContourItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); @@ -2905,12 +2905,12 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxShadowedItem& rItem = *( (const SvxShadowedItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aShadowBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxShadowedItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -2920,7 +2920,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); @@ -2931,17 +2931,17 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxBlinkItem& rItem = *( (const SvxBlinkItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aBlinkingBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxBlinkItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) ); - bModified = TRUE; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -2950,18 +2950,18 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_HIDDEN ); eState = m_aHiddenBtn.GetState(); - bChanged = TRUE; + bChanged = true; if ( pOld ) { const SvxCharHiddenItem& rItem = *( (const SvxCharHiddenItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aHiddenBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxCharHiddenItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -3644,7 +3644,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FALSE, bChanged = TRUE; USHORT nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT ); - const FASTBOOL bHigh = m_aHighPosBtn.IsChecked(); + const bool bHigh = m_aHighPosBtn.IsChecked(); short nEsc; BYTE nEscProp; @@ -3719,7 +3719,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxKerningItem( nKerning, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3732,7 +3732,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aPairKerningBtn.IsChecked() != m_aPairKerningBtn.GetSavedValue() ) { rSet.Put( SvxAutoKernItem( m_aPairKerningBtn.IsChecked(), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3742,7 +3742,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aScaleWidthMF.GetText() != m_aScaleWidthMF.GetSavedValue() ) { rSet.Put( SvxCharScaleWidthItem( (USHORT)m_aScaleWidthMF.GetValue(), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3760,7 +3760,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) else if (m_a270degRB.IsChecked()) aItem.SetTopToBotton(); rSet.Put( aItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3885,7 +3885,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, BOOL bStart ) pBox->SelectEntryPos(0); else { - FASTBOOL bFound = FALSE; + bool bFound = FALSE; for ( USHORT i = 1; i < pBox->GetEntryCount(); ++i ) { if ( (ULONG)pBox->GetEntryData(i) != CHRDLG_ENCLOSE_SPECIAL_CHAR ) @@ -4025,7 +4025,7 @@ BOOL SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index f210035..b5bfa04 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1622,7 +1622,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = FALSE; + bool bKillTable = false; if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -1633,7 +1633,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = true; } aBulColLB.InsertEntry( Color( COL_AUTO ), SVX_RESSTR( RID_SVXSTR_AUTOMATIC )); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 20957bd..2c00321 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -561,7 +561,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( pItem ) aPaperSize = ( (const SvxSizeItem*)pItem )->GetSize(); - FASTBOOL bOrientationSupport = + bool bOrientationSupport = pImpl->mpDefPrinter->HasSupport( SUPPORT_SET_ORIENTATION ); #ifdef OS2 // unter OS/2 wird bei HasSupport() immer TRUE returned @@ -1154,7 +1154,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) // ----------------------------------------------------------------------- -void SvxPageDescPage::SwapFirstValues_Impl( FASTBOOL bSet ) +void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode(); Orientation eOri = ORIENTATION_PORTRAIT; diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 0c765b5..61e7459 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -283,7 +283,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aSpacing ); - bModified |= TRUE; + bModified = TRUE; } } @@ -325,10 +325,10 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= TRUE; + bModified = TRUE; } } - FASTBOOL bNullTab = FALSE; + bool bNullTab = false; if ( aLeftIndent.IsValueModified() || aFLineIndent.IsValueModified() || @@ -375,14 +375,14 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } aMargin.SetAutoFirst(aAutoCB.IsChecked()); if ( aMargin.GetTxtFirstLineOfst() < 0 ) - bNullTab = TRUE; + bNullTab = true; eState = GetItemSet().GetItemState( nWhich ); if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) || SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= TRUE; + bModified = TRUE; } } @@ -419,7 +419,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { pRegItem->SetValue(!bSet); rOutSet.Put(*pRegItem); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, FALSE ) ) rOutSet.ClearItem(_nWhich); @@ -1166,26 +1166,26 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { BOOL bModified = FALSE; - FASTBOOL bAdj = FALSE, bChecked = FALSE; + bool bAdj = false, bChecked = false; SvxAdjust eAdjust = SVX_ADJUST_LEFT; if ( aLeft.IsChecked() ) { eAdjust = SVX_ADJUST_LEFT; bAdj = !aLeft.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } else if ( aRight.IsChecked() ) { eAdjust = SVX_ADJUST_RIGHT; bAdj = !aRight.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } else if ( aCenter.IsChecked() ) { eAdjust = SVX_ADJUST_CENTER; bAdj = !aCenter.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } else if ( aJustify.IsChecked() ) { @@ -1193,7 +1193,7 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) bAdj = !aJustify.GetSavedValue() || aExpandCB.IsChecked() != aExpandCB.GetSavedValue() || aLastLineLB.GetSelectEntryPos() != aLastLineLB.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } USHORT _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1211,7 +1211,7 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) else if ( 2 == nLBPos ) eLastBlock = SVX_ADJUST_BLOCK; - FASTBOOL bNothingWasChecked = + bool bNothingWasChecked = !aLeft.GetSavedValue() && !aRight.GetSavedValue() && !aCenter.GetSavedValue() && !aJustify.GetSavedValue(); @@ -1220,7 +1220,7 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) pOld->GetLastBlock() != eLastBlock || ( bChecked && bNothingWasChecked ) ) { - bModified |= TRUE; + bModified = TRUE; SvxAdjustItem aAdj( (const SvxAdjustItem&)GetItemSet().Get( _nWhich ) ); aAdj.SetAdjust( eAdjust ); @@ -1476,7 +1476,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) eHyphenState != aHyphenBox.GetSavedValue()) { rOutSet.Put( aHyphen ); - bModified |= TRUE; + bModified = TRUE; } } @@ -1490,14 +1490,14 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() ) { rOutSet.Put( aPageNum ); - bModified |= TRUE; + bModified = TRUE; } } // Seitenumbruch TriState eState = aApplyCollBtn.GetState(); - FASTBOOL bIsPageModel = FALSE; + bool bIsPageModel = false; _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); String sPage; @@ -1515,13 +1515,13 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage ) { rOutSet.Put( SvxPageModelItem( sPage, FALSE, _nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else - bIsPageModel = FALSE; + bIsPageModel = false; } else if(STATE_CHECK == eState && aApplyCollBtn.IsEnabled()) - bIsPageModel = TRUE; + bIsPageModel = true; else rOutSet.Put( SvxPageModelItem( sPage, FALSE, _nWhich ) ); @@ -1577,7 +1577,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aPageBreakBox.GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { - bModified |= TRUE; + bModified = TRUE; rOutSet.Put( aBreak ); } } @@ -1596,7 +1596,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) ( eState == STATE_NOCHECK ) ) { rOutSet.Put( SvxFmtSplitItem( eState == STATE_NOCHECK, _nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } } @@ -1610,7 +1610,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) // hat sich der Status geaendert, muss immer geputtet werden rOutSet.Put( SvxFmtKeepItem( eState == STATE_CHECK, _nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } // Witwen und Waisen @@ -1627,7 +1627,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aWidowBox.GetSavedValue() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= TRUE; + bModified = TRUE; } } @@ -1646,7 +1646,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) !( *(const SvxOrphansItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= TRUE; + bModified = TRUE; } } -- 1.7.1