diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-29 07:43:45 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-29 07:43:45 +0000 |
| commit | 25aa14e2ed93b060b5e0c3378f56f7582e4c9330 (patch) | |
| tree | a08b5552c7cf20f502b25ac83eaa36145eac128e /desktop | |
| parent | 63e6c96e02a15d0a543b9b131f7ae55d6f831a87 (diff) | |
INTEGRATION: CWS pb12 (1.17.40); FILE MERGED
2006/03/01 12:07:14 pb 1.17.40.1: fix: #i62669# use xoffset instead of yoffset to set barwidth
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 213d664b1b..0764a50dd0 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -4,9 +4,9 @@ * * $RCSfile: splash.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2006-01-27 16:22:01 $ + * last change: $Author: obo $ $Date: 2006-03-29 08:43:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,6 +59,7 @@ #include <rtl/logfile.hxx> +#define NOT_LOADED ((long)-1) using namespace ::rtl; using namespace ::com::sun::star::registry; @@ -69,18 +70,18 @@ namespace desktop SplashScreen::SplashScreen(const Reference< XMultiServiceFactory >& rSMgr) : IntroWindow() , _vdev(*((IntroWindow*)this)) - , _cProgressFrameColor( -1 ) - , _cProgressBarColor( -1 ) + , _cProgressFrameColor(NOT_LOADED) + , _cProgressBarColor(NOT_LOADED) , _iProgress(0) , _iMax(100) , _bPaintBitmap(sal_True) , _bPaintProgress(sal_False) - , _tlx(-1) - , _tly(-1) - , _barwidth(-1) + , _tlx(NOT_LOADED) + , _tly(NOT_LOADED) + , _barwidth(NOT_LOADED) , _xoffset(12) , _yoffset(18) - , _barheight(-1) + , _barheight(NOT_LOADED) , _barspace(2) { _rFactory = rSMgr; @@ -95,34 +96,33 @@ SplashScreen::SplashScreen(const Reference< XMultiServiceFactory >& rSMgr) if (_width > 500) { Point xtopleft(212,216); - if ( -1 == _tlx || -1 == _tly ) + if ( NOT_LOADED == _tlx || NOT_LOADED == _tly ) { _tlx = xtopleft.X(); // top-left x _tly = xtopleft.Y(); // top-left y } - if ( -1 == _barwidth ) + if ( NOT_LOADED == _barwidth ) _barwidth = 263; - if ( -1 == _barheight ) + if ( NOT_LOADED == _barheight ) _barheight = 8; - // <-- } else { - if ( -1 == _barwidth ) - _barwidth = _width - (2 * _yoffset); - if ( -1 == _barheight ) + if ( NOT_LOADED == _barwidth ) + _barwidth = _width - (2 * _xoffset); + if ( NOT_LOADED == _barheight ) _barheight = 6; - if ( -1 == _tlx || -1 == _tly ) + if ( NOT_LOADED == _tlx || NOT_LOADED == _tly ) { _tlx = _xoffset; // top-left x _tly = _height - _yoffset; // top-left y } } - if ( -1 == _cProgressFrameColor.GetColor() ) + if ( NOT_LOADED == _cProgressFrameColor.GetColor() ) _cProgressFrameColor = Color( COL_LIGHTGRAY ); - if ( -1 == _cProgressBarColor.GetColor() ) + if ( NOT_LOADED == _cProgressBarColor.GetColor() ) { // progress bar: new color only for big bitmap format if ( _width > 500 ) @@ -340,7 +340,7 @@ void SplashScreen::initBitmap() // First, try to use custom bitmap data. rtl::OUString value; - rtl::Bootstrap::get( + rtl::Bootstrap::get( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomDataUrl" ) ), value ); if ( value.getLength() > 0 ) { |