summaryrefslogtreecommitdiff
path: root/padmin
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-03-17 09:45:34 +0000
committerOliver Bolte <obo@openoffice.org>2004-03-17 09:45:34 +0000
commitc476ee11936c67fde1d36b1182dc7e9dfba0af83 (patch)
treef9cc1268bd82d29433c84802f7a4e8a3bcdb2c4b /padmin
parent1804a0748592b15625be1f2f0a213cb0b33c53cb (diff)
INTEGRATION: CWS cups01 (1.2.34); FILE MERGED
2003/08/15 13:21:15 pl 1.2.34.1: removed a bunch of warnings
Diffstat (limited to 'padmin')
-rw-r--r--padmin/source/progress.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 431656dd531b..2a52ffcd1d89 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: progress.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2003-04-11 17:36:46 $
+ * last change: $Author: obo $ $Date: 2004-03-17 10:45:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,13 +94,13 @@ ProgressDialog::ProgressDialog( Window* pParent,
BOOL bCancelable,
int nMin, int nMax ) :
ModelessDialog( pParent, PaResId( RID_PROGRESS_DLG ) ),
- maCancelButton( this, PaResId( RID_PROGRESS_BTN_CANCEL ) ),
maOperation( this, PaResId( RID_PROGRESS_OPERATION_TXT ) ),
maFilename( this, PaResId( RID_PROGRESS_FILENAME_TXT ) ),
maProgressTxt( this, PaResId( RID_PROGRESS_PROGRESS_TXT ) ),
+ maCancelButton( this, PaResId( RID_PROGRESS_BTN_CANCEL ) ),
maProgressBar( this, PaResId( RID_PROGRESS_STATUSBAR ) ),
- mnMin( nMin ),
mnMax( nMax ),
+ mnMin( nMin ),
mbCanceled( FALSE )
{
maFilename.SetStyle( maFilename.GetStyle() | WB_PATHELLIPSIS );