diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 10:53:50 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 10:53:50 +0000 |
| commit | ad23b1b934b4d4735ec4091dc284e8e19cd8c67c (patch) | |
| tree | 799d1a57e9cb0b87bd8782b68da3ffe732f17656 | |
| parent | 4f2d2ef98317219b5980c9cfe38b436b778746aa (diff) | |
INTEGRATION: CWS eforms4 (1.16.204); FILE MERGED
2005/01/10 17:13:29 dvo 1.16.204.2: RESYNC: (1.16-1.17); FILE MERGED
2004/12/08 16:33:06 fs 1.16.204.1: #i36359# #i36303# correct ImplAllowMalformedInput, which was wrongly implemented during i26368
| -rw-r--r-- | vcl/source/control/field2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 5090ad3fba51..e9159bd70e13 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: field2.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2005-01-03 17:39:17 $ + * last change: $Author: vg $ $Date: 2005-03-23 11:53:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1585,7 +1585,7 @@ static void ImplDateIncrementYear( Date& rDate, BOOL bUp ) // ----------------------------------------------------------------------- BOOL DateFormatter::ImplAllowMalformedInput() const { - return ( NULL != GetField() ) && ( ( GetField()->GetStyle() & 0x80000000 ) != 0 ); + return !IsEnforceValidValue(); } // ----------------------------------------------------------------------- @@ -2774,7 +2774,7 @@ BOOL TimeFormatter::ImplTimeReformat( const XubString& rStr, XubString& rOutStr // ----------------------------------------------------------------------- BOOL TimeFormatter::ImplAllowMalformedInput() const { - return ( NULL != GetField() ) && ( ( GetField()->GetStyle() & 0x80000000 ) != 0 ); + return !IsEnforceValidValue(); } // ----------------------------------------------------------------------- |