diff options
author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
---|---|---|
committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
commit | 8f9b8a80c32063ebe3d5d0e034e1d2432e87423e (patch) | |
tree | 5572a7235419cd34d37cdb06d8c3ac5d0209d6d5 /framework/source/uielement/progressbarwrapper.cxx | |
parent | 293b43ae4de478c550c8461de164f7cb8883daab (diff) | |
parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) |
chart52: merge with DEV300_m100
Diffstat (limited to 'framework/source/uielement/progressbarwrapper.cxx')
-rw-r--r-- | framework/source/uielement/progressbarwrapper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index a20f107ea22e..a411188f5f94 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -149,13 +149,13 @@ throw (uno::RuntimeException) pStatusBar->StartProgressMode( Text ); else { - pStatusBar->SetUpdateMode( FALSE ); + pStatusBar->SetUpdateMode( sal_False ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); - pStatusBar->SetProgressValue( USHORT( nValue )); - pStatusBar->SetUpdateMode( TRUE ); + pStatusBar->SetProgressValue( sal_uInt16( nValue )); + pStatusBar->SetUpdateMode( sal_True ); } - pStatusBar->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pStatusBar->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } } @@ -215,11 +215,11 @@ throw (uno::RuntimeException) StatusBar* pStatusBar = (StatusBar *)pWindow; if( pStatusBar->IsProgressMode() ) { - pStatusBar->SetUpdateMode( FALSE ); + pStatusBar->SetUpdateMode( sal_False ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); - pStatusBar->SetProgressValue( USHORT( nValue )); - pStatusBar->SetUpdateMode( TRUE ); + pStatusBar->SetProgressValue( sal_uInt16( nValue )); + pStatusBar->SetUpdateMode( sal_True ); } else pStatusBar->SetText( Text ); @@ -268,7 +268,7 @@ throw (uno::RuntimeException) StatusBar* pStatusBar = (StatusBar *)pWindow; if ( !pStatusBar->IsProgressMode() ) pStatusBar->StartProgressMode( aText ); - pStatusBar->SetProgressValue( USHORT( nValue )); + pStatusBar->SetProgressValue( sal_uInt16( nValue )); } } } |