Kaydet (Commit) 5857555e authored tarafından Bijan Tabatabai's avatar Bijan Tabatabai Kaydeden (comit) Eike Rathke

tdf#114441 Convert sal_uLong to other types in ./sc/source/ui/app

Change-Id: I9648d54f75d7ed5cb68ec7d678bc61c46df18acf
Signed-off-by: 's avatarBijan Tabatabai <bijan311@yahoo.com>
Reviewed-on: https://gerrit.libreoffice.org/59602
Tested-by: Jenkins
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
üst b99c6978
...@@ -813,8 +813,8 @@ void ScInputHandler::GetFormulaData() ...@@ -813,8 +813,8 @@ void ScInputHandler::GetFormulaData()
const OUString aParenthesesReplacement( cParenthesesReplacement); const OUString aParenthesesReplacement( cParenthesesReplacement);
const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
sal_uLong nListCount = pFuncList->GetCount(); sal_uInt32 nListCount = pFuncList->GetCount();
for(sal_uLong i=0;i<nListCount;i++) for(sal_uInt32 i=0;i<nListCount;i++)
{ {
const ScFuncDesc* pDesc = pFuncList->GetFunction( i ); const ScFuncDesc* pDesc = pFuncList->GetFunction( i );
if ( pDesc->mxFuncName ) if ( pDesc->mxFuncName )
...@@ -1428,7 +1428,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const ...@@ -1428,7 +1428,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const
if ( pCalc->IsValue() ) if ( pCalc->IsValue() )
{ {
double n = pCalc->GetValue(); double n = pCalc->GetValue();
sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0, sal_uInt32 nFormat = aFormatter.GetStandardFormat( n, 0,
pCalc->GetFormatType(), ScGlobal::eLnge ); pCalc->GetFormatType(), ScGlobal::eLnge );
aFormatter.GetInputLineString( n, nFormat, aValue ); aFormatter.GetInputLineString( n, nFormat, aValue );
//! display OutputString but insert InputLineString //! display OutputString but insert InputLineString
...@@ -1436,7 +1436,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const ...@@ -1436,7 +1436,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const
else else
{ {
OUString aStr = pCalc->GetString().getString(); OUString aStr = pCalc->GetString().getString();
sal_uLong nFormat = aFormatter.GetStandardFormat( sal_uInt32 nFormat = aFormatter.GetStandardFormat(
pCalc->GetFormatType(), ScGlobal::eLnge); pCalc->GetFormatType(), ScGlobal::eLnge);
{ {
Color* pColor; Color* pColor;
...@@ -2072,7 +2072,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn ...@@ -2072,7 +2072,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
if ( SfxItemState::SET == rAttrSet.GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) ) 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 == bCellHasPercentFormat = ( SvNumFormatType::PERCENT ==
rDoc.GetFormatTable()->GetType( nFormat ) ); rDoc.GetFormatTable()->GetType( nFormat ) );
} }
......
...@@ -1931,11 +1931,11 @@ void ScPosWnd::FillFunctions() ...@@ -1931,11 +1931,11 @@ void ScPosWnd::FillFunctions()
if (pMRUList) if (pMRUList)
{ {
const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
sal_uLong nListCount = pFuncList->GetCount(); sal_uInt32 nListCount = pFuncList->GetCount();
for (sal_uInt16 i=0; i<nMRUCount; i++) for (sal_uInt16 i=0; i<nMRUCount; i++)
{ {
sal_uInt16 nId = pMRUList[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 ); const ScFuncDesc* pDesc = pFuncList->GetFunction( j );
if ( pDesc->nFIndex == nId && pDesc->mxFuncName ) if ( pDesc->nFIndex == nId && pDesc->mxFuncName )
......
...@@ -1784,7 +1784,7 @@ void ScModule::EndReference() ...@@ -1784,7 +1784,7 @@ void ScModule::EndReference()
*/ */
void ScModule::AnythingChanged() void ScModule::AnythingChanged()
{ {
sal_uLong nOldTime = m_aIdleTimer.GetTimeout(); sal_uInt64 nOldTime = m_aIdleTimer.GetTimeout();
if ( nOldTime != SC_IDLE_MIN ) if ( nOldTime != SC_IDLE_MIN )
m_aIdleTimer.SetTimeout( SC_IDLE_MIN ); m_aIdleTimer.SetTimeout( SC_IDLE_MIN );
...@@ -1849,8 +1849,8 @@ IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void) ...@@ -1849,8 +1849,8 @@ IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void)
} }
} }
sal_uLong nOldTime = m_aIdleTimer.GetTimeout(); sal_uInt64 nOldTime = m_aIdleTimer.GetTimeout();
sal_uLong nNewTime = nOldTime; sal_uInt64 nNewTime = nOldTime;
if ( bMore ) if ( bMore )
{ {
nNewTime = SC_IDLE_MIN; nNewTime = SC_IDLE_MIN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment