diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:03:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:03:32 +0000 |
| commit | e679d92eda926f5149e4399c244b96e68ccd8c19 (patch) | |
| tree | a69a7d5a2f7270ffdb0e91e3cd15b968ddf0669f /extensions/source/propctrlr/linedescriptor.hxx | |
| parent | bb1b17d872a94356bc9eab1f0b4e76ad81af10e0 (diff) | |
INTEGRATION: CWS formdesign01 (1.3.16); FILE MERGED
2003/12/17 10:38:25 fs 1.3.16.3: #i22878# filter and sort order dialog from within the property browser
2003/12/04 14:09:48 fs 1.3.16.2: removed obsolete hypelink attribute during #i22878#
2003/12/03 10:06:42 fs 1.3.16.1: #i22878# measurement units for Width and RowHeight
Diffstat (limited to 'extensions/source/propctrlr/linedescriptor.hxx')
| -rw-r--r-- | extensions/source/propctrlr/linedescriptor.hxx | 44 |
1 files changed, 12 insertions, 32 deletions
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index b940b567bc40..b98916b8e1e4 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -2,9 +2,9 @@ * * $RCSfile: linedescriptor.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2003-10-06 15:50:43 $ + * last change: $Author: obo $ $Date: 2004-03-19 12:03:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,9 @@ #ifndef _EXTENSIONS_PROPCTRLR_BRWCONTROL_HXX_ #include "brwcontrol.hxx" #endif +#ifndef _VCL_FLDUNIT_HXX +#include <vcl/fldunit.hxx> +#endif //............................................................................ namespace pcr @@ -86,14 +89,14 @@ namespace pcr BrowserControlType eControlType; sal_uInt32 nHelpId; sal_uInt32 nUniqueButtonId; - sal_uInt16 nDigits; // for numeric fields - sal_Int32 nMinValue; // for numeric fields only - sal_Int32 nMaxValue; // for numeric fields only + sal_uInt16 nDigits; // for numeric fields + sal_Int32 nMinValue; // for numeric fields only + sal_Int32 nMaxValue; // for numeric fields only + FieldUnit eDisplayUnit; // for numeric fields only + FieldUnit eValueUnit; // for numeric fields only sal_Bool bUnknownValue :1; sal_Bool bHasDefaultValue:1; - sal_Bool bHasBrowseButton:1; - sal_Bool bIsHyperlink :1; sal_Bool bIsLocked :1; sal_Bool bHaveMinMax :1; @@ -102,8 +105,6 @@ namespace pcr ,nHelpId(0) ,bUnknownValue(sal_False) ,bHasDefaultValue(sal_False) - ,bHasBrowseButton(sal_False) - ,bIsHyperlink(sal_False) ,bIsLocked(sal_False) ,pDataPtr(NULL) ,pControl(NULL) @@ -112,29 +113,8 @@ namespace pcr ,nMinValue(0) ,nMaxValue(-1) ,bHaveMinMax(sal_False) - { - } - - // does not copy theValues - // TODO: (fs) why? - OLineDescriptor(const OLineDescriptor& rData) - :eControlType(rData.eControlType) - ,sValue(rData.sValue) - ,sTitle(rData.sTitle) - ,sName(rData.sName) - ,nHelpId(rData.nHelpId) - ,bUnknownValue(rData.bUnknownValue) - ,bHasDefaultValue(rData.bHasDefaultValue) - ,bHasBrowseButton(rData.bHasBrowseButton) - ,bIsHyperlink(rData.bIsHyperlink) - ,bIsLocked(rData.bIsLocked) - ,pDataPtr(rData.pDataPtr) - ,pControl(rData.pControl) - ,nDigits(rData.nDigits) - ,nUniqueButtonId(rData.nUniqueButtonId) - ,nMinValue(rData.nMinValue) - ,nMaxValue(rData.nMaxValue) - ,bHaveMinMax(rData.bHaveMinMax) + ,eDisplayUnit( FUNIT_NONE ) + ,eValueUnit( FUNIT_NONE ) { } }; |