diff options
| -rw-r--r-- | include/vcl/field.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/field.cxx | 36 | ||||
| -rw-r--r-- | vcl/source/control/field2.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/control/longcurr.cxx | 14 |
4 files changed, 0 insertions, 65 deletions
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index d5503cd32803..e6e117e8198f 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -43,7 +43,6 @@ class VCL_DLLPUBLIC FormatterBase private: VclPtr<Edit> mpField; LocaleDataWrapper* mpLocaleDataWrapper; - Link<> maErrorLink; bool mbReformat; bool mbStrictFormat; bool mbEmptyFieldValue; @@ -83,8 +82,6 @@ public: const AllSettings& GetFieldSettings() const; - const Link<>& GetErrorHdl() const { return maErrorLink; } - void SetEmptyFieldValue(); bool IsEmptyFieldValue() const; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index cb6b46b8cb7a..41a72a92d9c7 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -495,18 +495,6 @@ bool NumericFormatter::ImplNumericReformat( const OUString& rStr, sal_Int64& rVa { sal_Int64 nTempVal = ClipAgainstMinMax(rValue); - if ( GetErrorHdl().IsSet() && (rValue != nTempVal) ) - { - mnCorrectedValue = nTempVal; - if ( !GetErrorHdl().Call( this ) ) - { - mnCorrectedValue = 0; - return false; - } - else - mnCorrectedValue = 0; - } - rOutStr = CreateFieldText( nTempVal ); return true; } @@ -1396,18 +1384,6 @@ bool MetricFormatter::ImplMetricReformat( const OUString& rStr, double& rValue, else if ( nTempVal < GetMin()) nTempVal = (double)GetMin(); - if ( GetErrorHdl().IsSet() && (rValue != nTempVal) ) - { - mnCorrectedValue = (sal_Int64)nTempVal; - if ( !GetErrorHdl().Call( this ) ) - { - mnCorrectedValue = 0; - return false; - } - else - mnCorrectedValue = 0; - } - rOutStr = CreateFieldText( (sal_Int64)nTempVal ); return true; } @@ -1950,18 +1926,6 @@ bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString& rO else if ( nTempVal < GetMin()) nTempVal = GetMin(); - if ( GetErrorHdl().IsSet() && (nValue != nTempVal) ) - { - mnCorrectedValue = nTempVal; - if ( !GetErrorHdl().Call( this ) ) - { - mnCorrectedValue = 0; - return false; - } - else - mnCorrectedValue = 0; - } - rOutStr = CreateFieldText( nTempVal ); return true; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index f47d6c48db8f..b3241e113115 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1114,12 +1114,6 @@ bool DateFormatter::ImplDateReformat( const OUString& rStr, OUString& rOutStr, c else if ( aTempDate < GetMin() ) aTempDate = GetMin(); - if ( GetErrorHdl().IsSet() && (aDate != aTempDate) ) - { - if( !GetErrorHdl().Call( this ) ) - return false; - } - rOutStr = ImplGetDateAsText( aTempDate, rSettings ); return true; @@ -2159,12 +2153,6 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) else if ( aTempTime < GetMin() ) aTempTime = GetMin(); - if ( GetErrorHdl().IsSet() && (aTime != aTempTime) ) - { - if ( !GetErrorHdl().Call( this ) ) - return false; - } - bool bSecond = false; bool b100Sec = false; if ( meFormat != TimeFieldFormat::F_NONE ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index ae9178b98fe5..adc4626950a1 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -277,20 +277,6 @@ bool ImplLongCurrencyReformat( const OUString& rStr, BigInt nMin, BigInt nMax, else if ( nTempVal < nMin ) nTempVal = nMin; - if ( rFormatter.GetErrorHdl().IsSet() && (nValue != nTempVal) ) - { - rFormatter.mnCorrectedValue = nTempVal; - if ( !rFormatter.GetErrorHdl().Call( &rFormatter ) ) - { - rFormatter.mnCorrectedValue = 0; - return false; - } - else - { - rFormatter.mnCorrectedValue = 0; - } - } - rOutStr = ImplGetCurr( rLocaleDataWrapper, nTempVal, nDecDigits, rFormatter.GetCurrencySymbol(), rFormatter.IsUseThousandSep() ); return true; } |