summaryrefslogtreecommitdiff
path: root/desktop/source/splash
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-03-30 07:45:57 +0000
committerRüdiger Timm <rt@openoffice.org>2005-03-30 07:45:57 +0000
commit942c5baef30c3f99b7f8c074caceeb44eb5e1907 (patch)
tree7cdfc005c5c5ea6fad20cd1adf441507e51e1720 /desktop/source/splash
parent2d2ec8806e6b248a684312699bd1a5ea97ca8576 (diff)
INTEGRATION: CWS fwkfinal3 (1.5.92); FILE MERGED
2005/03/18 08:43:15 pb 1.5.92.1: fix: #120338# ProgressBar customizable
Diffstat (limited to 'desktop/source/splash')
-rw-r--r--desktop/source/splash/splash.hxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 4af8ee7dbd5f..5321171e3e55 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: splash.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: obo $ $Date: 2005-03-15 12:21:50 $
+ * last change: $Author: rt $ $Date: 2005-03-30 08:45:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -119,6 +119,7 @@ private:
DECL_LINK( AppEventListenerHdl, VclWindowEvent * );
virtual ~SplashScreen();
+ void loadConfig();
void initBitmap();
void updateStatus();
@@ -127,8 +128,11 @@ private:
static osl::Mutex _aMutex;
Reference< XMultiServiceFactory > _rFactory;
- VirtualDevice _vdev;
+ VirtualDevice _vdev;
Bitmap _aIntroBmp;
+ Color _cProgressColor;
+ OUString _sExecutePath;
+
sal_Int32 _iMax;
sal_Int32 _iProgress;
sal_Bool _bPaintBitmap;
@@ -138,7 +142,6 @@ private:
const long _xoffset, _yoffset, _barspace;
long _barheight;
-
public:
static const char* interfaces[];
static const sal_Char *serviceName;