mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop BitmapMode enum

Browse Source 
since we only use the BM_DEFAULTMODE enumerator

Change-Id: I425a2ca09d4a15d755010e8f963387071c0138ae
This commit is contained in:
Noel Grandin
2017-02-16 10:40:29 +02:00
parent ee36298909
commit b57b51bd01
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
desktop/source/splash/splash.cxx
View File

@@ -68,8 +68,6 @@ class SplashScreen
{ {
friend class SplashScreenWindow; friend class SplashScreenWindow;
private: private:
enum BitmapMode { BM_FULLSCREEN, BM_DEFAULTMODE };
VclPtr<SplashScreenWindow> pWindow; VclPtr<SplashScreenWindow> pWindow;
DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void ); DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void );
@@ -91,7 +89,6 @@ private:
sal_Int32 _iMax; sal_Int32 _iMax;
sal_Int32 _iProgress; sal_Int32 _iProgress;
BitmapMode _eBitmapMode;
bool _bPaintProgress; bool _bPaintProgress;
bool _bVisible; bool _bVisible;
bool _bShowLogo; bool _bShowLogo;
@@ -157,7 +154,6 @@ SplashScreen::SplashScreen()
, _bNativeProgress(true) , _bNativeProgress(true)
, _iMax(100) , _iMax(100)
, _iProgress(0) , _iProgress(0)
, _eBitmapMode(BM_DEFAULTMODE)
, _bPaintProgress(false) , _bPaintProgress(false)
, _bVisible(true) , _bVisible(true)
, _bShowLogo(true) , _bShowLogo(true)
@@ -195,8 +191,6 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
if (_bVisible) { if (_bVisible) {
_bProgressEnd = false; _bProgressEnd = false;
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
if ( _eBitmapMode == BM_FULLSCREEN )
pWindow->ShowFullScreenMode();
pWindow->Show(); pWindow->Show();
pWindow->Redraw(); pWindow->Redraw();
} }
@@ -207,8 +201,6 @@ void SAL_CALL SplashScreen::end()
_iProgress = _iMax; _iProgress = _iMax;
if (_bVisible ) if (_bVisible )
{ {
if ( _eBitmapMode == BM_FULLSCREEN )
pWindow->EndFullScreenMode();
pWindow->Hide(); pWindow->Hide();
} }
_bProgressEnd = true; _bProgressEnd = true;
@@ -219,8 +211,6 @@ void SAL_CALL SplashScreen::reset()
_iProgress = 0; _iProgress = 0;
if (_bVisible && !_bProgressEnd ) if (_bVisible && !_bProgressEnd )
{ {
if ( _eBitmapMode == BM_FULLSCREEN )
pWindow->ShowFullScreenMode();
pWindow->Show(); pWindow->Show();
updateStatus(); updateStatus();
} }
@@ -235,8 +225,6 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
if (_bVisible && !_bProgressEnd) if (_bVisible && !_bProgressEnd)
{ {
if ( _eBitmapMode == BM_FULLSCREEN )
pWindow->ShowFullScreenMode();
pWindow->Show(); pWindow->Show();
updateStatus(); updateStatus();
} }
@@ -249,8 +237,6 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
if (_bVisible && !_bProgressEnd) { if (_bVisible && !_bProgressEnd) {
if ( _eBitmapMode == BM_FULLSCREEN )
pWindow->ShowFullScreenMode();
pWindow->Show(); pWindow->Show();
if (nValue >= _iMax) if (nValue >= _iMax)
_iProgress = _iMax; _iProgress = _iMax;
@@ -291,19 +277,6 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
_barwidth = 263; _barwidth = 263;
if ( NOT_LOADED == _barheight ) if ( NOT_LOADED == _barheight )
_barheight = 8; _barheight = 8;
if (( _eBitmapMode == BM_FULLSCREEN ) &&
_bFullScreenSplash )
{
if( ( _fXPos >= 0.0 ) && ( _fYPos >= 0.0 ))
{
_tlx = sal_Int32( double( aSize.Width() ) * _fXPos );
_tly = sal_Int32( double( aSize.Height() ) * _fYPos );
}
if ( _fWidth >= 0.0 )
_barwidth = sal_Int32( double( aSize.Width() ) * _fWidth );
if ( _fHeight >= 0.0 )
_barheight = sal_Int32( double( aSize.Width() ) * _fHeight );
}
} }
else else
{ {