diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-02-01 14:12:55 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-02-01 14:12:55 +0100 |
| commit | f3673d43d977cf808434aefe9054df299be82df7 (patch) | |
| tree | 845292ecf70230e1cdf9ecca0e4a255f28541798 /desktop | |
| parent | f7c8eb150d15300e19986667a1feaed2db0df0b5 (diff) | |
native0: #161580# make native intro progress optional
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 11 | ||||
| -rw-r--r-- | desktop/source/splash/splash.hxx | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 56be47ce44..be36d3b14d 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -63,6 +63,7 @@ SplashScreen::SplashScreen(const Reference< XMultiServiceFactory >& rSMgr) , _vdev(*((IntroWindow*)this)) , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED)) , _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED)) + , _bNativeProgress(true) , _iMax(100) , _iProgress(0) , _eBitmapMode(BM_DEFAULTMODE) @@ -300,6 +301,9 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressPosition" ) ) ); OUString sFullScreenSplash = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) ); + OUString sNativeProgress = implReadBootstrapKey( + OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) ); + // Determine full screen splash mode _bFullScreenSplash = (( sFullScreenSplash.getLength() > 0 ) && @@ -349,6 +353,11 @@ void SplashScreen::loadConfig() _cProgressBarColor = Color( nRed, nGreen, nBlue ); } } + + if( sNativeProgress.getLength() ) + { + _bNativeProgress = sNativeProgress.toBoolean(); + } if ( sSize.getLength() ) { @@ -621,7 +630,7 @@ void SplashScreen::Paint( const Rectangle&) BOOL bNativeOK = FALSE; // in case of native controls we need to draw directly to the window - if( IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) ) + if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) ) { DrawBitmapEx( Point(), _aIntroBmp ); diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 1dcd65dab3..680a91382c 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -92,6 +92,7 @@ private: BitmapEx _aIntroBmp; Color _cProgressFrameColor; Color _cProgressBarColor; + bool _bNativeProgress; OUString _sAppName; std::vector< FullScreenProgressRatioValue > _sFullScreenProgressRatioValues; |