diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2022-09-06 21:07:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-07 13:04:15 +0200 |
| commit | b4a82907eb13de4feabc9f09f8fa7d45d6c9eaec (patch) | |
| tree | 88acffbd4d7a73abee8c6e000e53a09f915e3460 /sw/source/filter/xml/xmlitmpr.cxx | |
| parent | 9251f7ef5aa705a2c5b2a5612167ffed7e3b4347 (diff) | |
use o3tl::span in SvXMLItemMapEntries
which means we don't need to calculate the size of the map
at construction
Change-Id: I295defd7c4609b22a994928f6442fadadd9df66d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139543
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/xml/xmlitmpr.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlitmpr.cxx | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx index 6731f086bbe3..cb7700fd91fe 100644 --- a/sw/source/filter/xml/xmlitmpr.cxx +++ b/sw/source/filter/xml/xmlitmpr.cxx @@ -23,33 +23,20 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_TOKEN_INVALID; -SvXMLItemMapEntries::SvXMLItemMapEntries( SvXMLItemMapEntry const * pEntries ) - : mpEntries(pEntries) -{ - mnCount = 0; - while( pEntries->eLocalName != XML_TOKEN_INVALID ) - { - pEntries++; - mnCount++; - } -} - SvXMLItemMapEntries::~SvXMLItemMapEntries() { } SvXMLItemMapEntry const * SvXMLItemMapEntries::getByName( sal_Int32 nElement ) const { - SvXMLItemMapEntry const * pMap = mpEntries; - while( pMap && (pMap->eLocalName != XML_TOKEN_INVALID) ) + for (const SvXMLItemMapEntry& rEntry : mpEntries) { - if( IsTokenInNamespace(nElement, pMap->nNameSpace) && - (nElement & TOKEN_MASK) == pMap->eLocalName ) - break; - pMap++; + if( IsTokenInNamespace(nElement, rEntry.nNameSpace) && + (nElement & TOKEN_MASK) == rEntry.eLocalName ) + return &rEntry; } - return (pMap && (pMap->eLocalName != XML_TOKEN_INVALID)) ? pMap : nullptr; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |