diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-23 17:30:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-24 07:59:16 +0100 |
| commit | a1c0e999b271ac4c6ecb163a1cd2a310b87e9dec (patch) | |
| tree | 4ef50e0aec9dd0dc6db0d9927cebe71a512bf5c8 /sc/source/ui/view | |
| parent | 35f5274ece0fcbb70753a71619b526ed0d4cbd6b (diff) | |
consistently use sal_uInt32 for number formats in sc
instead of a mix of short/sal_uLong/sal_uInt32
Change-Id: Ie5bd26e1a6f716c0c4e174a6d560827084b3f421
Reviewed-on: https://gerrit.libreoffice.org/45159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/spelleng.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 79e3441cc492..41d74671b5f4 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -789,7 +789,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } rReq.AppendItem( SfxStringItem( FN_PARAM_2, aPara ) ); - sal_uLong nFormatKey = pFormatter->GetStandardFormat(css::util::NumberFormat::NUMBER, + sal_uInt32 nFormatKey = pFormatter->GetStandardFormat(css::util::NumberFormat::NUMBER, ScGlobal::eLnge ); pFormatter->GetOutputString( fIncVal, nFormatKey, aPara, &pColor ); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 11fb12fe3f5c..36c13b3a2175 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -841,7 +841,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { eMode = pOldData->GetDataMode(); eOper = pOldData->GetOperation(); - sal_uLong nNumFmt = 0; + sal_uInt32 nNumFmt = 0; if ( eMode == SC_VALID_DATE || eMode == SC_VALID_TIME ) { short nType = ( eMode == SC_VALID_DATE ) ? css::util::NumberFormat::DATE diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index e05b619c4ec2..20f8b606e517 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2359,7 +2359,7 @@ bool ScOutputData::DrawEditParam::readCellContent( } else { - sal_uLong nFormat = mpPattern->GetNumberFormat( + sal_uInt32 nFormat = mpPattern->GetNumberFormat( pDoc->GetFormatTable(), mpCondSet ); OUString aString; Color* pColor; @@ -4799,7 +4799,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) } else { - sal_uLong nFormat = pPattern->GetNumberFormat( + sal_uInt32 nFormat = pPattern->GetNumberFormat( mpDoc->GetFormatTable(), pCondSet ); OUString aString; Color* pColor; diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 7fad99809081..15fedc1f9733 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -255,7 +255,7 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) case CELLTYPE_STRING: { SvNumberFormatter* pFormatter = mrDoc.GetFormatTable(); - sal_uLong nNumFmt = mrDoc.GetNumberFormat(aPos); + sal_uInt32 nNumFmt = mrDoc.GetNumberFormat(aPos); OUString aText; Color* pColor; ScCellFormat::GetString(aCell, nNumFmt, aText, &pColor, *pFormatter, &mrDoc); |