diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-08-04 01:14:22 +0200 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-08-04 06:51:31 +0000 |
commit | 8ee69b0ba13f74d1515fac71df92947eb6328ab1 (patch) | |
tree | 5d5e95bb877e5e961cd02eee47011548af94bca1 /extensions | |
parent | fixup SAL_INFO macros to actually print the strings (diff) | |
download | core-8ee69b0ba13f74d1515fac71df92947eb6328ab1.tar.gz core-8ee69b0ba13f74d1515fac71df92947eb6328ab1.zip |
fdo#67235 adapt form control code to time nanosecond API change, step 3
Change-Id: I4899c89ee5b2a54c9c05b531ab284365f1558e3d
Reviewed-on: https://gerrit.libreoffice.org/5270
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
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 9ab0cbae4b70..fd3f6ce99e5e 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; } |