diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:20:12 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:20:12 +0000 |
| commit | 721dbee10cdab8acbe1f7149a1316f9ea6e84cf5 (patch) | |
| tree | 70f9a55bdc8c6c74894ec0102724db3107d10f0c /extensions | |
| parent | 4d2e5ad20d03b79df8eead767bdb800c319a6ae1 (diff) | |
INTEGRATION: CWS ooo20040329 (1.3.70); FILE MERGED
2004/04/10 01:57:10 svesik 1.3.70.2: Resolve conflict
2004/03/17 12:57:49 waratah 1.3.70.1: #i1858# alter order of definitions to remove some warnings from -Wall
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/linedescriptor.hxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index b98916b8e1e4..20a058a34872 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -2,9 +2,9 @@ * * $RCSfile: linedescriptor.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-03-19 12:03:32 $ + * last change: $Author: svesik $ $Date: 2004-04-21 14:20:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_ #define _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_ @@ -101,17 +100,17 @@ namespace pcr sal_Bool bHaveMinMax :1; OLineDescriptor() - :eControlType(BCT_UNDEFINED) - ,nHelpId(0) - ,bUnknownValue(sal_False) - ,bHasDefaultValue(sal_False) - ,bIsLocked(sal_False) - ,pDataPtr(NULL) + :pDataPtr(NULL) ,pControl(NULL) - ,nDigits(0) + ,eControlType(BCT_UNDEFINED) + ,nHelpId(0) ,nUniqueButtonId(0) + ,nDigits(0) ,nMinValue(0) ,nMaxValue(-1) + ,bUnknownValue(sal_False) + ,bHasDefaultValue(sal_False) + ,bIsLocked(sal_False) ,bHaveMinMax(sal_False) ,eDisplayUnit( FUNIT_NONE ) ,eValueUnit( FUNIT_NONE ) |