diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-28 16:08:26 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-08-02 11:35:57 +0000 |
| commit | ed904af8665f6f7590fedd4ad608018f78c686c1 (patch) | |
| tree | 2590bb19a2621feed3b2b490a91342a382621d0a /svx | |
| parent | 784cfa382be438240dfc936b7551c5012aada9ae (diff) | |
fdo#67235 adapt form control code to time nanosecond API change
Conflicts:
offapi/type_reference/offapi.rdb
Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805
Reviewed-on: https://gerrit.libreoffice.org/5149
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 8 | ||||
| -rw-r--r-- | svx/source/form/fmobjfac.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index c81d1e02bf01..79a5ae8ec45b 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2369,8 +2369,8 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet > if ( m_pWindow && _rxModel.is() ) { sal_Int16 nFormat = getINT16( _rxModel->getPropertyValue( FM_PROP_TIMEFORMAT ) ); - sal_Int32 nMin = getINT32( _rxModel->getPropertyValue( FM_PROP_TIMEMIN ) ); - sal_Int32 nMax = getINT32( _rxModel->getPropertyValue( FM_PROP_TIMEMAX ) ); + sal_Int64 nMin = getINT64( _rxModel->getPropertyValue( FM_PROP_TIMEMIN ) ); + sal_Int64 nMax = getINT64( _rxModel->getPropertyValue( FM_PROP_TIMEMAX ) ); sal_Bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) ); static_cast< TimeField* >( m_pWindow )->SetExtFormat( (ExtTimeFieldFormat)nFormat ); @@ -2431,7 +2431,7 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbTimeField::updateFromModel: invalid call!" ); - sal_Int32 nTime = 0; + sal_Int64 nTime = 0; if ( _rxModel->getPropertyValue( FM_PROP_DATE ) >>= nTime ) static_cast< TimeField* >( m_pWindow )->SetTime( ::Time( nTime ) ); else @@ -2444,7 +2444,7 @@ sal_Bool DbTimeField::commitControl() OUString aText(m_pWindow->GetText()); Any aVal; if (!aText.isEmpty()) - aVal <<= (sal_Int32)static_cast<TimeField*>(m_pWindow)->GetTime().GetTime(); + aVal <<= (sal_Int64)static_cast<TimeField*>(m_pWindow)->GetTime().GetTime(); else aVal.clear(); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 1f9a1088bea8..15c1f60c7c32 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -186,7 +186,7 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory) case OBJ_FM_TIMEFIELD: sServiceSpecifier = FM_COMPONENT_TIMEFIELD; - aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( (sal_Int32)( Time( 23, 59, 59, 99 ).GetTime() ) ) ) ); + aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( (sal_Int64)( Time( 23, 59, 59, 999999999 ).GetTime() ) ) ) ); break; case OBJ_FM_NUMERICFIELD: |