diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:49:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:49:35 +0000 |
| commit | e042a9dfc5101e509e6ab3991c775123cf21bee6 (patch) | |
| tree | 08abcf772411ab8f71950728f54d975871b76424 /desktop/source/splash | |
| parent | 07dfe130e94fa3cf36e3b04f0d64971c474855aa (diff) | |
INTEGRATION: CWS sb90 (1.16.40); FILE MERGED
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
Diffstat (limited to 'desktop/source/splash')
| -rw-r--r-- | desktop/source/splash/splash.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 2e9c58406881..51f68d44d830 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -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; |