diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 3 | ||||
| -rw-r--r-- | svx/source/items/numfmtsh.cxx | 19 |
2 files changed, 7 insertions, 15 deletions
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 82747e00acf0..72ca4f43a4bf 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -660,8 +660,7 @@ namespace svxform // but because I disabled SelectionHandling, I have to do it later sal_uIntPtr nExpectedSelectionCount = GetSelectionCount(); - if( pEntry ) - GetModel()->Remove( pEntry ); + GetModel()->Remove(pEntry); if (nExpectedSelectionCount != GetSelectionCount()) SynchronizeSelection(); diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index a870053d54fd..923a0db04f4b 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1548,25 +1548,18 @@ bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, bool const bTmpBanki if (nPos != sal_uInt16(-1)) { const NfCurrencyTable& rCurrencyTable = SvNumberFormatter::GetTheCurrencyTable(); - sal_uInt16 nCount = rCurrencyTable.size(); - if (nPos < nCount) + if (nPos < rCurrencyTable.size()) { NfWSStringsDtor aWSStringsDtor; + pFormatter->GetCurrencyFormatStrings(aWSStringsDtor, rCurrencyTable[nPos], bTmpBanking); - const NfCurrencyEntry* pTmpCurrencyEntry = &rCurrencyTable[nPos]; - - if (pTmpCurrencyEntry != nullptr) + for (const OUString& s : aWSStringsDtor) { - pFormatter->GetCurrencyFormatStrings(aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking); - - for (const OUString& s : aWSStringsDtor) + if (s == rFmtString) { - if (s == rFmtString) - { - bFlag = true; - break; - } + bFlag = true; + break; } } } |