INTEGRATION: CWS c01v006 (1.7.30); FILE MERGED

2005/04/27 10:59:02 pb 1.7.30.1: fix: #120401# separate colors (bar and frame)

1 files changed, 6 insertions, 5 deletions

diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 5321171e3e55..01d7822d596e 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: splash.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-03-30 08:45:57 $
+ *  last change: $Author: rt $ $Date: 2005-05-13 08:26:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,8 @@ private:
 
     VirtualDevice   _vdev;
     Bitmap          _aIntroBmp;
-    Color           _cProgressColor;
+    Color           _cProgressFrameColor;
+    Color           _cProgressBarColor;
     OUString        _sExecutePath;
 
     sal_Int32 _iMax;
@@ -139,8 +140,8 @@ private:
     sal_Bool _bPaintProgress;
     sal_Bool _bVisible;
     long _height, _width, _tlx, _tly, _barwidth;
-    const long _xoffset, _yoffset, _barspace;
-    long _barheight;
+    long _barheight, _barspace;
+    const long _xoffset, _yoffset;
 
 public:
     static const char* interfaces[];