diff options
| author | Eike Rathke <erack@redhat.com> | 2017-02-20 20:55:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-02-20 20:58:17 +0100 |
| commit | 2f6d2c0c47ebfd1b98f9610aec99566fe3a1a982 (patch) | |
| tree | d2c256625306102264624124fb67fea0ed55bab8 /svl | |
| parent | ce315ac12119f30be5789784010889e38b6f75a4 (diff) | |
use SvNumberformat::GetMaskedType()
... instead of manually masking out css::util::NumberFormat::DEFINED
Change-Id: I0761132800b2b1693df41085695f36cd3cc1236b
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 71a071825a0a..2ddd6424918f 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -928,7 +928,7 @@ SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable( else { rLnge = pFormat->GetLanguage(); - eType = pFormat->GetType()&~css::util::NumberFormat::DEFINED; + eType = pFormat->GetMaskedType(); if (eType == 0) { eType = css::util::NumberFormat::DEFINED; @@ -1081,7 +1081,7 @@ bool SvNumberFormatter::IsNumberFormat(const OUString& sString, } else { - FType = pFormat->GetType() &~css::util::NumberFormat::DEFINED; + FType = pFormat->GetMaskedType(); if (FType == 0) { FType = css::util::NumberFormat::DEFINED; @@ -1249,8 +1249,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType ) while ( it2 != aFTable.end() && (nKey = it2->first ) >= CLOffset && nKey < nStopKey ) { const SvNumberformat* pEntry = it2->second; - if ( pEntry->IsStandard() && ((pEntry->GetType() & - ~css::util::NumberFormat::DEFINED) == nType) ) + if ( pEntry->IsStandard() && (pEntry->GetMaskedType() == nType) ) { nDefaultFormat = nKey; break; // while @@ -1490,7 +1489,7 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber, LanguageType eLang = pFormat->GetLanguage(); ChangeIntl( eLang ); - short eType = pFormat->GetType() & ~css::util::NumberFormat::DEFINED; + short eType = pFormat->GetMaskedType(); if (eType == 0) { // Mixed types in subformats, use first. @@ -3039,7 +3038,7 @@ short SvNumberFormatter::GetType(sal_uInt32 nFIndex) } else { - eType = pFormat->GetType() &~css::util::NumberFormat::DEFINED; + eType = pFormat->GetMaskedType(); if (eType == 0) { eType = css::util::NumberFormat::DEFINED; |