diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:06:51 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:06:51 +0000 |
| commit | fe29012c52cc7cceaeda56cc57dddc2ec5a9a6b3 (patch) | |
| tree | 7f5035c3e3ea48a90dfce4d0a92e4c3c47f7856c /extensions | |
| parent | 67b84ebf673493ecd1c05d79077303f26919483f (diff) | |
INTEGRATION: CWS formdesign01 (1.2.68); FILE MERGED
2004/01/09 13:42:37 fs 1.2.68.5: #i22878# moved TimeDurationInput to usercontrol.*
2004/01/07 14:36:01 fs 1.2.68.4: #100000# make compile with Linux gcc
2003/12/19 14:31:33 fs 1.2.68.3: #22878# TimeDurationInput for inputting, well, time durations
2003/12/03 10:06:43 fs 1.2.68.2: #i22878# measurement units for Width and RowHeight
2003/11/27 14:47:29 fs 1.2.68.1: #i22878# file URL display and date input
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.hxx | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 3285ac0e1f6e..894a53299159 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -2,9 +2,9 @@ * * $RCSfile: standardcontrol.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2003-03-25 16:03:59 $ + * last change: $Author: obo $ $Date: 2004-03-19 12:06:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ #ifndef _SV_COMBOBOX_HXX #include <vcl/combobox.hxx> #endif +#ifndef _CALENDAR_HXX +#include <svtools/calendar.hxx> +#endif class PushButton; class MultiLineEdit; @@ -106,7 +109,7 @@ namespace pcr //======================================================================== //= ODateControl //======================================================================== - class ODateControl : public OCommonBehaviourControl, DateField + class ODateControl : public OCommonBehaviourControl, CalendarField { protected: virtual long PreNotify( NotifyEvent& rNEvt ); @@ -158,19 +161,32 @@ namespace pcr //======================================================================== //= ONumericControl //======================================================================== - class ONumericControl : public OCommonBehaviourControl, NumericField + class ONumericControl : public OCommonBehaviourControl, MetricField { + private: + FieldUnit m_eValueUnit; + protected: virtual long PreNotify( NotifyEvent& rNEvt ); public: - ONumericControl( Window* pParent,sal_uInt16 nDigits, WinBits nWinStyle = WB_TABSTOP); + ONumericControl( Window* pParent, sal_uInt16 nDigits, WinBits nWinStyle = WB_TABSTOP ); virtual void SetProperty(const ::rtl::OUString &rString,sal_Bool bIsUnknown=sal_False); virtual ::rtl::OUString GetProperty()const; - void SetMin(sal_Int32 _nMin) { NumericField::SetMin(_nMin); } - void SetMax(sal_Int32 _nMax) { NumericField::SetMax(_nMax); } + void SetMin(sal_Int32 _nMin) { MetricField::SetMin(_nMin); } + void SetMax(sal_Int32 _nMax) { MetricField::SetMax(_nMax); } + void SetFieldUnit( FieldUnit _eUnit ) { MetricField::SetUnit( _eUnit ); } + void SetValueUnit( FieldUnit _eUnit ) { m_eValueUnit = _eUnit; } + + protected: + MetricField::SetUnit; + MetricField::SetCustomUnitText; + MetricField::GetCurUnitText; + MetricField::SetValue; + protected: + inline long GetLastValue() const { return mnLastValue; } }; //======================================================================== @@ -289,6 +305,7 @@ namespace pcr protected: virtual void modified(Window* _pSource); }; + //............................................................................ } // namespace pcr //............................................................................ |