diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-22 13:29:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 07:20:25 +0100 |
| commit | ace95cf48ee88d78a17765e5f4f26bb93d5940cf (patch) | |
| tree | 206d070d4b9eef0c84a78deda5df863ac174354c /desktop/source | |
| parent | fa2dd2ba03f8be1f148dca8f6164daaf7bbf7d96 (diff) | |
ColorData->Color in various
Change-Id: I22018b6a535224316d93bfd621771248b873a218
Reviewed-on: https://gerrit.libreoffice.org/50167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 5856410ec9d8..a58b8227d928 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -39,6 +39,7 @@ #include <vcl/virdev.hxx> #define NOT_LOADED (long(-1)) +#define NOT_LOADED_COLOR (Color(0xffffffff)) using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; @@ -148,9 +149,9 @@ void SplashScreenWindow::Redraw() SplashScreen::SplashScreen() : pWindow( VclPtr<SplashScreenWindow>::Create(this) ) - , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED)) - , _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED)) - , _cProgressTextColor(sal::static_int_cast< ColorData >(NOT_LOADED)) + , _cProgressFrameColor(NOT_LOADED_COLOR) + , _cProgressBarColor(NOT_LOADED_COLOR) + , _cProgressTextColor(NOT_LOADED_COLOR) , _bNativeProgress(true) , _iMax(100) , _iProgress(0) @@ -294,12 +295,10 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) if ( NOT_LOADED == _textBaseline ) _textBaseline = _height; - if ( sal::static_int_cast< ColorData >(NOT_LOADED) == - _cProgressFrameColor.GetColor() ) + if ( NOT_LOADED_COLOR == _cProgressFrameColor ) _cProgressFrameColor = Color( COL_LIGHTGRAY ); - if ( sal::static_int_cast< ColorData >(NOT_LOADED) == - _cProgressBarColor.GetColor() ) + if ( NOT_LOADED_COLOR == _cProgressBarColor ) { // progress bar: new color only for big bitmap format if ( _width > 500 ) @@ -308,8 +307,7 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) _cProgressBarColor = Color( COL_BLUE ); } - if ( sal::static_int_cast< ColorData >(NOT_LOADED) == - _cProgressTextColor.GetColor() ) + if ( NOT_LOADED_COLOR == _cProgressTextColor ) _cProgressTextColor = Color( COL_BLACK ); Application::AddEventListener( |