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 /svx/source/items/numfmtsh.cxx | |
| parent | ce315ac12119f30be5789784010889e38b6f75a4 (diff) | |
use SvNumberformat::GetMaskedType()
... instead of manually masking out css::util::NumberFormat::DEFINED
Change-Id: I0761132800b2b1693df41085695f36cd3cc1236b
Diffstat (limited to 'svx/source/items/numfmtsh.cxx')
| -rw-r--r-- | svx/source/items/numfmtsh.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 765ec8da8949..b0a8d9211e9d 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -692,7 +692,7 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl( std::vector<OUString>& rL if(pNumEntry==nullptr) continue; - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); aStrComment=pNumEntry->GetComment(); CategoryToPos_Impl(nMyCat,nMyType); aNewFormNInfo= pNumEntry->GetFormatstring(); @@ -727,7 +727,7 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl( std::vector<OUString>& r const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); if(pNumEntry!=nullptr) { - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); aStrComment=pNumEntry->GetComment(); CategoryToPos_Impl(nMyCat,nMyType); aNewFormNInfo= pNumEntry->GetFormatstring(); @@ -811,7 +811,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL if(pNumEntry==nullptr) continue; - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); aStrComment=pNumEntry->GetComment(); CategoryToPos_Impl(nMyCat,nMyType); aNewFormNInfo= pNumEntry->GetFormatstring(); @@ -850,7 +850,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL if(!bUserNewCurrency &&(pNumEntry->GetType() & css::util::NumberFormat::DEFINED)) { - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); aStrComment=pNumEntry->GetComment(); CategoryToPos_Impl(nMyCat,nMyType); aNewFormNInfo= pNumEntry->GetFormatstring(); @@ -935,7 +935,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>& r if( pNumEntry->GetType() & css::util::NumberFormat::DEFINED || pNumEntry->IsAdditionalBuiltin() ) { - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); aStrComment = pNumEntry->GetComment(); CategoryToPos_Impl(nMyCat,nMyType); aNewFormNInfo = pNumEntry->GetFormatstring(); @@ -1086,7 +1086,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, if( (pNumEntry->GetType() & css::util::NumberFormat::DEFINED) || (bAdditional && pNumEntry->IsAdditionalBuiltin()) ) { - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); aStrComment=pNumEntry->GetComment(); CategoryToPos_Impl(nMyCat,nMyType); aNewFormNInfo= pNumEntry->GetFormatstring(); @@ -1262,7 +1262,7 @@ short SvxNumberFormatShell::GetCategory4Entry(short nEntry) const sal_uInt16 nMyCat,nMyType; if(pNumEntry!=nullptr) { - nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; + nMyCat=pNumEntry->GetMaskedType(); CategoryToPos_Impl(nMyCat,nMyType); return (short) nMyType; |