diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-28 16:08:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-04 11:02:56 +0200 |
| commit | 43ea97e1f9cecd6c7cba8db35ce1307c858c6857 (patch) | |
| tree | 5d4f81ad7e3a9e9e3af563ffe2df1661cb643bee /extensions | |
| parent | 9d07f380bb0d5053571a9f3866b0415fe8339c5b (diff) | |
fdo#67235 adapt form control code to time nanosecond API change
squash of steps 1, 2 and 3 in master
Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index efd3899de6d8..d0bf73ecdadc 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -579,7 +579,7 @@ namespace pcr { util::Date aDate; OSL_VERIFY( _rControlValue >>= aDate ); - aPropertyValue <<= (sal_Int32)DBTypeConversion::toINT32( aDate ); + aPropertyValue <<= aDate; } break; @@ -590,7 +590,7 @@ namespace pcr { util::Time aTime; OSL_VERIFY( _rControlValue >>= aTime ); - aPropertyValue <<= DBTypeConversion::toINT64( aTime ); + aPropertyValue <<= aTime; } break; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 13ae9779365a..156b8bfe9ba4 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -98,10 +98,7 @@ namespace pcr Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) { - ::Time aTime( getTypedControlWindow()->GetTime() ); - util::Time const aUNOTime( aTime.GetNanoSec(), aTime.GetSec(), - aTime.GetMin(), aTime.GetHour(), false ); - aPropValue <<= aUNOTime; + aPropValue <<= getTypedControlWindow()->GetTime().GetUNOTime(); } return aPropValue; } |