strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb90 (1.16.40); FILE MERGED

Browse source 
2008/06/25 12:37:16 sb 1.16.40.1: #157787# look for intro bitmap and related bootstrap variables in edition sub-dir first, and no longer look in CustomDataUrl layer
This commit is contained in:
Vladimir Glazounov 2008-07-02 08:49:35 +00:00
parent 07dfe130e9
commit e042a9dfc5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop/source/splash/splash.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: splash.hxx,v $
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* This file is part of OpenOffice.org.
*
@ -41,7 +41,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/mutex.hxx>
#include <vcl/virdev.hxx>
#include <rtl/bootstrap.hxx>
using namespace ::rtl;
@ -77,11 +76,12 @@ private:
void loadConfig();
void initBitmap();
void updateStatus();
bool findScreenBitmap();
bool findAppBitmap();
bool findBitmap( const rtl::OUString aBmpFileName );
bool loadBitmap( const rtl::OUString &rBmpFileName, const rtl::OUString &rExecutePath, Bitmap &rBmp );
void determineProgressRatioValues( rtl::Bootstrap& rIniFile, double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
bool findScreenBitmap(rtl::OUString const & path);
bool findAppBitmap(rtl::OUString const & path);
bool findBitmap(rtl::OUString const & path);
bool loadBitmap(
rtl::OUString const & path, const rtl::OUString &rBmpFileName );
void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
static SplashScreen *_pINSTANCE;
@ -92,7 +92,6 @@ private:
Bitmap _aIntroBmp;
Color _cProgressFrameColor;
Color _cProgressBarColor;
OUString _sExecutePath;
OUString _sAppName;
std::vector< FullScreenProgressRatioValue > _sFullScreenProgressRatioValues;
@ -102,6 +101,7 @@ private:
sal_Bool _bPaintBitmap;
sal_Bool _bPaintProgress;
sal_Bool _bVisible;
sal_Bool _bShowLogo;
sal_Bool _bFullScreenSplash;
sal_Bool _bProgressEnd;
long _height, _width, _tlx, _tly, _barwidth;