diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/optdlg/tpcalc.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/optdlg/tpcalc.cxx')
| -rw-r--r-- | sc/source/ui/optdlg/tpcalc.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 143cb41d4ea2..a969b311ddf7 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -56,7 +56,7 @@ // STATIC DATA ----------------------------------------------------------- -static USHORT pCalcOptRanges[] = +static sal_uInt16 pCalcOptRanges[] = { SID_SCDOCOPTIONS, SID_SCDOCOPTIONS, @@ -125,7 +125,7 @@ void ScTpCalcOptions::Init() //----------------------------------------------------------------------- -USHORT* ScTpCalcOptions::GetRanges() +sal_uInt16* ScTpCalcOptions::GetRanges() { return pCalcOptRanges; } @@ -141,7 +141,7 @@ SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) { - USHORT d,m,y; + sal_uInt16 d,m,y; *pLocalOptions = *pOldOptions; @@ -190,10 +190,10 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) //----------------------------------------------------------------------- -BOOL ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert - pLocalOptions->SetIterCount( (USHORT)aEdSteps.GetValue() ); + pLocalOptions->SetIterCount( (sal_uInt16)aEdSteps.GetValue() ); pLocalOptions->SetIgnoreCase( !aBtnCase.IsChecked() ); pLocalOptions->SetCalcAsShown( aBtnCalc.IsChecked() ); pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() ); @@ -209,10 +209,10 @@ BOOL ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) if ( *pLocalOptions != *pOldOptions ) { rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); - return TRUE; + return sal_True; } else - return FALSE; + return false; } //------------------------------------------------------------------------ @@ -285,13 +285,13 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) { if ( pBtn->IsChecked() ) { - pLocalOptions->SetIter( TRUE ); + pLocalOptions->SetIter( sal_True ); aFtSteps.Enable(); aEdSteps.Enable(); aFtEps .Enable(); aEdEps .Enable(); } else { - pLocalOptions->SetIter( FALSE ); + pLocalOptions->SetIter( false ); aFtSteps.Disable(); aEdSteps.Disable(); aFtEps .Disable(); aEdEps .Disable(); } |