diff options
Diffstat (limited to 'sc/source/ui/miscdlgs/filldlg.cxx')
-rw-r--r-- | sc/source/ui/miscdlgs/filldlg.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 2b247f0f9a07..67584198bce8 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -61,7 +61,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, String aStartStr, double fStep, double fMax, - USHORT nPossDir ) + sal_uInt16 nPossDir ) : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), @@ -115,7 +115,7 @@ __EXPORT ScFillSeriesDlg::~ScFillSeriesDlg() //---------------------------------------------------------------------------- -void ScFillSeriesDlg::SetEdStartValEnabled(BOOL bFlag) +void ScFillSeriesDlg::SetEdStartValEnabled(sal_Bool bFlag) { bStartValFlag=bFlag; if(bFlag) @@ -132,7 +132,7 @@ void ScFillSeriesDlg::SetEdStartValEnabled(BOOL bFlag) //---------------------------------------------------------------------------- -void ScFillSeriesDlg::Init( USHORT nPossDir ) +void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) { aBtnOk.SetClickHdl ( LINK( this, ScFillSeriesDlg, OKHdl ) ); aBtnArithmetic.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) ); @@ -221,7 +221,7 @@ void ScFillSeriesDlg::Init( USHORT nPossDir ) rDoc.GetFormatTable()->GetInputLineString( fEndVal, 0, aEndTxt ); aEdEndVal.SetText( aEndTxt ); - bStartValFlag=FALSE; + bStartValFlag=sal_False; aFlSep1.SetStyle( aFlSep1.GetStyle() | WB_VERT ); aFlSep2.SetStyle( aFlSep2.GetStyle() | WB_VERT ); @@ -230,16 +230,16 @@ void ScFillSeriesDlg::Init( USHORT nPossDir ) //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckStartVal() +sal_Bool __EXPORT ScFillSeriesDlg::CheckStartVal() { - BOOL bValOk = FALSE; + sal_Bool bValOk = sal_False; sal_uInt32 nKey = 0; String aStr( aEdStartVal.GetText() ); if ( aStr.Len() == 0 || aBtnAutoFill.IsChecked()) { fStartVal = MAXDOUBLE; - bValOk = TRUE; + bValOk = sal_True; } else bValOk = rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fStartVal ); @@ -250,7 +250,7 @@ BOOL __EXPORT ScFillSeriesDlg::CheckStartVal() //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() +sal_Bool __EXPORT ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; String aStr( aEdIncrement.GetText() ); @@ -261,16 +261,16 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckEndVal() +sal_Bool __EXPORT ScFillSeriesDlg::CheckEndVal() { - BOOL bValOk = FALSE; + sal_Bool bValOk = sal_False; sal_uInt32 nKey = 0; String aStr( aEdEndVal.GetText() ); if ( aStr.Len() == 0 ) { fEndVal = (fIncrement < 0) ? -MAXDOUBLE : MAXDOUBLE; - bValOk = TRUE; + bValOk = sal_True; } else bValOk = rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fEndVal ); @@ -339,21 +339,21 @@ IMPL_LINK( ScFillSeriesDlg, OKHdl, void *, EMPTYARG ) else if ( aBtnMonth.IsChecked() ) theFillDateCmd = FILL_MONTH; else if ( aBtnYear.IsChecked() ) theFillDateCmd = FILL_YEAR; - BOOL bAllOk = TRUE; + sal_Bool bAllOk = sal_True; Edit* pEdWrong = NULL; if ( !CheckStartVal() ) { - bAllOk = FALSE; + bAllOk = sal_False; pEdWrong = &aEdStartVal; } else if ( !CheckIncrementVal() ) { - bAllOk = FALSE; + bAllOk = sal_False; pEdWrong = &aEdIncrement; } else if ( !CheckEndVal() ) { - bAllOk = FALSE; + bAllOk = sal_False; pEdWrong = &aEdEndVal; } if ( bAllOk ) |