diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-12-03 21:46:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-12-19 22:08:26 +0100 |
| commit | 00bc5a097313fbd003675267be961ad3a152ba42 (patch) | |
| tree | de9b9e6981d3c2f262b9391335a067d4898185b6 /sc/source/core/tool/scmatrix.cxx | |
| parent | b74da08e556b7b001943f0288a61da53791d4dcf (diff) | |
wrap scoped enum around css::util::NumberFormat
Change-Id: Icab5ded8bccdb95f79b3fa35ea164f47919c68fa
Reviewed-on: https://gerrit.libreoffice.org/46339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/core/tool/scmatrix.cxx')
| -rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 95b5ad4d4ec3..c0078b5f8839 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -74,7 +74,7 @@ double convertStringToValue( ScInterpreter* pErrorInterpreter, const OUString& r if (pErrorInterpreter) { FormulaError nError = FormulaError::NONE; - sal_uInt32 nCurFmtType = 0; + SvNumFormatType nCurFmtType = SvNumFormatType::ALL; double fValue = pErrorInterpreter->ConvertStringToValue( rStr, nError, nCurFmtType); if (nError != FormulaError::NONE) { @@ -689,7 +689,7 @@ svl::SharedString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE return svl::SharedString::getEmptyString(); // result of empty FALSE jump path - sal_uInt32 nKey = rFormatter.GetStandardFormat( css::util::NumberFormat::LOGICAL, + sal_uInt32 nKey = rFormatter.GetStandardFormat( SvNumFormatType::LOGICAL, ScGlobal::eLnge); OUString aStr; Color* pColor = nullptr; @@ -711,7 +711,7 @@ svl::SharedString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE return svl::SharedString( ScGlobal::GetErrorString( nError)); // string not interned } - sal_uInt32 nKey = rFormatter.GetStandardFormat( css::util::NumberFormat::NUMBER, + sal_uInt32 nKey = rFormatter.GetStandardFormat( SvNumFormatType::NUMBER, ScGlobal::eLnge); OUString aStr; rFormatter.GetInputLineString( fVal, nKey, aStr); @@ -2610,7 +2610,7 @@ void ScMatrixImpl::MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef& xMat1->GetDimensions(nC1, nR1); xMat2->GetDimensions(nC2, nR2); - sal_uInt32 nKey = rFormatter.GetStandardFormat( css::util::NumberFormat::NUMBER, + sal_uInt32 nKey = rFormatter.GetStandardFormat( SvNumFormatType::NUMBER, ScGlobal::eLnge); std::vector<OUString> aString(nMaxCol * nMaxRow); |