include/vcl/field.hxx | 2 -- vcl/source/control/field2.cxx | 14 -------------- 2 files changed, 16 deletions(-)
New commits: commit 83b072657ef8fb30f369cd4fc9db36d76de4cdd6 Author: Tor Lillqvist <t...@collabora.com> Date: Mon Jul 13 13:03:31 2015 +0300 Bin two unused fields Change-Id: If06753320d34e0e677c9456ddb47bfd3636e8a66 diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index fdb09f1..d5503cd 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -307,7 +307,6 @@ private: Date maLastDate; Date maMin; Date maMax; - Date maCorrectedDate; bool mbLongFormat; bool mbShowDateCentury; sal_uInt16 mnDateFormat; @@ -400,7 +399,6 @@ private: tools::Time maLastTime; tools::Time maMin; tools::Time maMax; - tools::Time maCorrectedTime; TimeFieldFormat meFormat; sal_uInt16 mnTimeFormat; bool mbDuration; diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 6f093e6..7efb8e6 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1117,14 +1117,8 @@ bool DateFormatter::ImplDateReformat( const OUString& rStr, OUString& rOutStr, c if ( GetErrorHdl().IsSet() && (aDate != aTempDate) ) { - maCorrectedDate = aTempDate; if( !GetErrorHdl().Call( this ) ) - { - maCorrectedDate = Date( Date::SYSTEM ); return false; - } - else - maCorrectedDate = Date( Date::SYSTEM ); } rOutStr = ImplGetDateAsText( aTempDate, rSettings ); @@ -1418,7 +1412,6 @@ DateFormatter::DateFormatter() : maLastDate( 0 ), maMin( 1, 1, 1900 ), maMax( 31, 12, 2200 ), - maCorrectedDate( Date::SYSTEM ), mbEnforceValidValue( true ) { ImplInit(); @@ -2169,14 +2162,8 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) if ( GetErrorHdl().IsSet() && (aTime != aTempTime) ) { - maCorrectedTime = aTempTime; if ( !GetErrorHdl().Call( this ) ) - { - maCorrectedTime = tools::Time( tools::Time::SYSTEM ); return false; - } - else - maCorrectedTime = tools::Time( tools::Time::SYSTEM ); } bool bSecond = false; @@ -2311,7 +2298,6 @@ TimeFormatter::TimeFormatter() : maLastTime( 0, 0 ), maMin( 0, 0 ), maMax( 23, 59, 59, 999999999 ), - maCorrectedTime( tools::Time::SYSTEM ), mbEnforceValidValue( true ), maFieldTime( 0, 0 ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits