diff options
author | Bijan Tabatabai <bijan311@yahoo.com> | 2018-08-25 23:38:46 -0500 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-08-30 10:28:00 +0200 |
commit | 5857555e129a5913352cd7e8c7e825dd6892d808 (patch) | |
tree | 83daf20d69517c27d74ab69ec480356c4bae27f2 /sc | |
parent | b99c69784e8bb7b477759f14058a707e9000e56d (diff) |
tdf#114441 Convert sal_uLong to other types in ./sc/source/ui/app
Change-Id: I9648d54f75d7ed5cb68ec7d678bc61c46df18acf
Signed-off-by: Bijan Tabatabai <bijan311@yahoo.com>
Reviewed-on: https://gerrit.libreoffice.org/59602
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index cc02c55468db..9351055540bb 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -813,8 +813,8 @@ void ScInputHandler::GetFormulaData() const OUString aParenthesesReplacement( cParenthesesReplacement); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); - sal_uLong nListCount = pFuncList->GetCount(); - for(sal_uLong i=0;i<nListCount;i++) + sal_uInt32 nListCount = pFuncList->GetCount(); + for(sal_uInt32 i=0;i<nListCount;i++) { const ScFuncDesc* pDesc = pFuncList->GetFunction( i ); if ( pDesc->mxFuncName ) @@ -1428,7 +1428,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const if ( pCalc->IsValue() ) { double n = pCalc->GetValue(); - sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0, + sal_uInt32 nFormat = aFormatter.GetStandardFormat( n, 0, pCalc->GetFormatType(), ScGlobal::eLnge ); aFormatter.GetInputLineString( n, nFormat, aValue ); //! display OutputString but insert InputLineString @@ -1436,7 +1436,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const else { OUString aStr = pCalc->GetString().getString(); - sal_uLong nFormat = aFormatter.GetStandardFormat( + sal_uInt32 nFormat = aFormatter.GetStandardFormat( pCalc->GetFormatType(), ScGlobal::eLnge); { Color* pColor; @@ -2072,7 +2072,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn if ( SfxItemState::SET == rAttrSet.GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) ) { - sal_uLong nFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue(); + sal_uInt32 nFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue(); bCellHasPercentFormat = ( SvNumFormatType::PERCENT == rDoc.GetFormatTable()->GetType( nFormat ) ); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index edab7e0023db..a1fb0b3a6625 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1931,11 +1931,11 @@ void ScPosWnd::FillFunctions() if (pMRUList) { const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); - sal_uLong nListCount = pFuncList->GetCount(); + sal_uInt32 nListCount = pFuncList->GetCount(); for (sal_uInt16 i=0; i<nMRUCount; i++) { sal_uInt16 nId = pMRUList[i]; - for (sal_uLong j=0; j<nListCount; j++) + for (sal_uInt32 j=0; j<nListCount; j++) { const ScFuncDesc* pDesc = pFuncList->GetFunction( j ); if ( pDesc->nFIndex == nId && pDesc->mxFuncName ) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 707ebb1e8f82..46789edb9567 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1784,7 +1784,7 @@ void ScModule::EndReference() */ void ScModule::AnythingChanged() { - sal_uLong nOldTime = m_aIdleTimer.GetTimeout(); + sal_uInt64 nOldTime = m_aIdleTimer.GetTimeout(); if ( nOldTime != SC_IDLE_MIN ) m_aIdleTimer.SetTimeout( SC_IDLE_MIN ); @@ -1849,8 +1849,8 @@ IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void) } } - sal_uLong nOldTime = m_aIdleTimer.GetTimeout(); - sal_uLong nNewTime = nOldTime; + sal_uInt64 nOldTime = m_aIdleTimer.GetTimeout(); + sal_uInt64 nNewTime = nOldTime; if ( bMore ) { nNewTime = SC_IDLE_MIN; |