diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 13:41:49 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 13:41:49 +0000 |
| commit | 847732eb2000638bd216ff83b3e3160cbf52ff9e (patch) | |
| tree | 234a275535ab473298832be5289583a1fdc2f9f7 /vcl/source/control/field.cxx | |
| parent | 9b7d8ab79bd47e8c3e8b6375a1c6da6d126ad650 (diff) | |
INTEGRATION: CWS vclshowstop12_SRC680 (1.22.152.1.8); FILE MERGED
2008/01/23 10:46:59 pl 1.22.152.1.8.1: #i85502# repair old ControlMod handling
Diffstat (limited to 'vcl/source/control/field.cxx')
| -rw-r--r-- | vcl/source/control/field.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index ad09d4821e9a..fb40cd815432 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -4,9 +4,9 @@ * * $RCSfile: field.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: rt $ $Date: 2008-01-29 16:16:54 $ + * last change: $Author: ihi $ $Date: 2008-02-04 14:41:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -832,7 +832,7 @@ NumericField::~NumericField() long NumericField::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) ) + if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplNumericProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return 1; @@ -951,7 +951,7 @@ NumericBox::~NumericBox() long NumericBox::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) ) + if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplNumericProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return 1; @@ -1791,7 +1791,7 @@ sal_Int64 MetricField::GetLast( FieldUnit eOutUnit ) const long MetricField::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) ) + if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplMetricProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return 1; @@ -1917,7 +1917,7 @@ MetricBox::~MetricBox() long MetricBox::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) ) + if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplMetricProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return 1; @@ -2258,7 +2258,7 @@ CurrencyField::~CurrencyField() long CurrencyField::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) ) + if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return 1; @@ -2377,7 +2377,7 @@ CurrencyBox::~CurrencyBox() long CurrencyBox::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) ) + if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return 1; |