diff options
| author | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
| commit | 75ba0870517ea585027812c48dcfbc0827280a84 (patch) | |
| tree | 5df4d546e2fab9c70bf902a0afe27292a36d0812 /desktop/source/splash/splash.hxx | |
| parent | 5521c8065f538b8cedaf2db2dbff9a265394a6b3 (diff) | |
| parent | 7a7f37e3ba0ba89628fb30b035440ff5f91ab551 (diff) | |
sb118: merged in re/DEV300_next towards DEV300_m76
Diffstat (limited to 'desktop/source/splash/splash.hxx')
| -rw-r--r-- | desktop/source/splash/splash.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index f56fff54b931..99677aa107f1 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -34,7 +34,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/interfacecontainer.h> #include <vcl/introwin.hxx> -#include <vcl/bitmap.hxx> +#include <vcl/bitmapex.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/mutex.hxx> #include <vcl/virdev.hxx> @@ -86,9 +86,10 @@ private: Reference< XMultiServiceFactory > _rFactory; VirtualDevice _vdev; - Bitmap _aIntroBmp; + BitmapEx _aIntroBmp; Color _cProgressFrameColor; Color _cProgressBarColor; + bool _bNativeProgress; OUString _sAppName; std::vector< FullScreenProgressRatioValue > _sFullScreenProgressRatioValues; |