include/xmloff/namespacemap.hxx | 13 +++++++-
xmloff/source/core/namespacemap.cxx | 54 ++++++++++++++++++------------------
2 files changed, 38 insertions(+), 29 deletions(-)
New commits:
commit a86818c15a6b4773ddd012db37d55b5204163c24
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 24 13:12:24 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 24 16:37:43 2022 +0200
reduce space needed for NameSpaceMap
no need to store the key twice. Also rename related fields and typedefs
to make the code easier to read.
Change-Id: Ib76dea7fd683d024e8c9d8091d85cfec14829359
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134871
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/xmloff/namespacemap.hxx b/include/xmloff/namespacemap.hxx
index 81edfc52e25d..51e741fb85d8 100644
--- a/include/xmloff/namespacemap.hxx
+++ b/include/xmloff/namespacemap.hxx
@@ -54,6 +54,15 @@ public:
}
};
+class KeyToNameSpaceMapEntry final
+{
+public:
+ // sName refers to the full namespace name
+ OUString sName;
+ // sPrefix is the prefix used to declare a given item to be from a given
namespace
+ OUString sPrefix;
+};
+
typedef ::std::pair < sal_uInt16, OUString > QNamePair;
struct QNamePairHash
@@ -69,7 +78,7 @@ struct QNamePairHash
typedef std::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache;
typedef std::unordered_map < OUString, NameSpaceEntry > NameSpaceHash;
-typedef std::unordered_map < sal_uInt16, NameSpaceEntry > NameSpaceMap;
+typedef std::unordered_map < sal_uInt16, KeyToNameSpaceMapEntry >
KeyToNameSpaceMap;
class XMLOFF_DLLPUBLIC SvXMLNamespaceMap
{
@@ -77,7 +86,7 @@ class XMLOFF_DLLPUBLIC SvXMLNamespaceMap
NameSpaceHash aNameHash;
mutable NameSpaceHash aNameCache;
- NameSpaceMap aNameMap;
+ KeyToNameSpaceMap maKeyToNamespaceMap;
mutable QNameCache aQNameCache;
SAL_DLLPRIVATE sal_uInt16 Add_( const OUString& rPrefix, const OUString
&rName, sal_uInt16 nKey );
diff --git a/xmloff/source/core/namespacemap.cxx
b/xmloff/source/core/namespacemap.cxx
index 4ef226e2a2f6..c6fbb1d5d845 100644
--- a/xmloff/source/core/namespacemap.cxx
+++ b/xmloff/source/core/namespacemap.cxx
@@ -54,20 +54,20 @@ SvXMLNamespaceMap::SvXMLNamespaceMap()
{
// approx worst-case size
aNameHash.reserve(20);
- aNameMap.reserve(20);
+ maKeyToNamespaceMap.reserve(20);
}
SvXMLNamespaceMap::SvXMLNamespaceMap( const SvXMLNamespaceMap& rMap )
: sXMLNS( GetXMLToken ( XML_XMLNS ) )
{
aNameHash = rMap.aNameHash;
- aNameMap = rMap.aNameMap;
+ maKeyToNamespaceMap = rMap.maKeyToNamespaceMap;
}
SvXMLNamespaceMap& SvXMLNamespaceMap::operator=( const SvXMLNamespaceMap& rMap
)
{
aNameHash = rMap.aNameHash;
- aNameMap = rMap.aNameMap;
+ maKeyToNamespaceMap = rMap.maKeyToNamespaceMap;
return *this;
}
@@ -79,7 +79,7 @@ void SvXMLNamespaceMap::Clear()
{
aNameHash.clear();
aNameCache.clear();
- aNameMap.clear();
+ maKeyToNamespaceMap.clear();
aQNameCache.clear();
}
@@ -97,15 +97,15 @@ sal_uInt16 SvXMLNamespaceMap::Add_( const OUString&
rPrefix, const OUString &rNa
nKey = XML_NAMESPACE_UNKNOWN_FLAG;
do
{
- NameSpaceMap::const_iterator aIter = aNameMap.find ( nKey );
- if( aIter == aNameMap.end() )
+ auto aIter = maKeyToNamespaceMap.find ( nKey );
+ if( aIter == maKeyToNamespaceMap.end() )
break;
nKey++;
}
while ( true );
}
aNameHash.insert_or_assign( rPrefix, NameSpaceEntry{ rName, rPrefix, nKey}
);
- aNameMap.insert_or_assign( nKey, NameSpaceEntry{ rName, rPrefix, nKey} );
+ maKeyToNamespaceMap.insert_or_assign( nKey, KeyToNameSpaceMapEntry{ rName,
rPrefix} );
return nKey;
}
@@ -170,20 +170,20 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByName( const
OUString& rName ) const
const OUString& SvXMLNamespaceMap::GetPrefixByKey( sal_uInt16 nKey ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find (nKey);
- return (aIter != aNameMap.end()) ? (*aIter).second.sPrefix : sEmpty;
+ auto aIter = maKeyToNamespaceMap.find (nKey);
+ return (aIter != maKeyToNamespaceMap.end()) ? (*aIter).second.sPrefix :
sEmpty;
}
const OUString& SvXMLNamespaceMap::GetNameByKey( sal_uInt16 nKey ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find (nKey);
- return (aIter != aNameMap.end()) ? (*aIter).second.sName : sEmpty;
+ auto aIter = maKeyToNamespaceMap.find (nKey);
+ return (aIter != maKeyToNamespaceMap.end()) ? (*aIter).second.sName :
sEmpty;
}
OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find ( nKey );
- if (aIter == aNameMap.end())
+ auto aIter = maKeyToNamespaceMap.find ( nKey );
+ if (aIter == maKeyToNamespaceMap.end())
return OUString();
const OUString & prefix( (*aIter).second.sPrefix );
@@ -237,8 +237,8 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
return (*aQCacheIter).second;
else
{
- NameSpaceMap::const_iterator aIter = aNameMap.find ( nKey );
- if ( aIter != aNameMap.end() )
+ auto aIter = maKeyToNamespaceMap.find ( nKey );
+ if ( aIter != maKeyToNamespaceMap.end() )
{
// ...if it's in our map, make the prefix
const OUString & prefix( (*aIter).second.sPrefix );
@@ -304,8 +304,8 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByQName(const OUString&
rQName,
nKey = rEntry.nKey;
if ( pNamespace )
{
- NameSpaceMap::const_iterator aMapIter = aNameMap.find (nKey);
- *pNamespace = aMapIter != aNameMap.end() ?
(*aMapIter).second.sName : OUString();
+ auto aMapIter = maKeyToNamespaceMap.find (nKey);
+ *pNamespace = aMapIter != maKeyToNamespaceMap.end() ?
(*aMapIter).second.sName : OUString();
}
}
else
@@ -365,13 +365,13 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByQName(const
OUString& rQName,
sal_uInt16 SvXMLNamespaceMap::GetFirstKey() const
{
- return aNameMap.empty() ? USHRT_MAX : (*aNameMap.begin()).second.nKey;
+ return maKeyToNamespaceMap.empty() ? USHRT_MAX :
(*maKeyToNamespaceMap.begin()).first;
}
sal_uInt16 SvXMLNamespaceMap::GetNextKey( sal_uInt16 nLastKey ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find ( nLastKey );
- return (++aIter == aNameMap.end()) ? USHRT_MAX : (*aIter).second.nKey;
+ auto aIter = maKeyToNamespaceMap.find ( nLastKey );
+ return (++aIter == maKeyToNamespaceMap.end()) ? USHRT_MAX : (*aIter).first;
}
@@ -383,13 +383,13 @@ sal_uInt16 SvXMLNamespaceMap::GetIndexByKey( sal_uInt16
nKey )
}
sal_uInt16 SvXMLNamespaceMap::GetFirstIndex() const
{
- return aNameMap.empty() ? USHRT_MAX : (*aNameMap.begin()).second.nKey;
+ return maKeyToNamespaceMap.empty() ? USHRT_MAX :
(*maKeyToNamespaceMap.begin()).first;
}
sal_uInt16 SvXMLNamespaceMap::GetNextIndex( sal_uInt16 nOldIdx ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find ( nOldIdx );
- return (++aIter == aNameMap.end()) ? USHRT_MAX : (*aIter).second.nKey;
+ auto aIter = maKeyToNamespaceMap.find ( nOldIdx );
+ return (++aIter == maKeyToNamespaceMap.end()) ? USHRT_MAX : (*aIter).first;
}
void SvXMLNamespaceMap::AddAtIndex( const OUString& rPrefix,
@@ -412,14 +412,14 @@ OUString SvXMLNamespaceMap::GetAttrNameByIndex(
sal_uInt16 nIdx ) const
const OUString& SvXMLNamespaceMap::GetPrefixByIndex( sal_uInt16 nIdx ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find (nIdx);
- return (aIter != aNameMap.end()) ? (*aIter).second.sPrefix : sEmpty;
+ auto aIter = maKeyToNamespaceMap.find (nIdx);
+ return (aIter != maKeyToNamespaceMap.end()) ? (*aIter).second.sPrefix :
sEmpty;
}
const OUString& SvXMLNamespaceMap::GetNameByIndex( sal_uInt16 nIdx ) const
{
- NameSpaceMap::const_iterator aIter = aNameMap.find (nIdx);
- return (aIter != aNameMap.end()) ? (*aIter).second.sName : sEmpty;
+ auto aIter = maKeyToNamespaceMap.find (nIdx);
+ return (aIter != maKeyToNamespaceMap.end()) ? (*aIter).second.sName :
sEmpty;
}
sal_uInt16 SvXMLNamespaceMap::GetIndexByPrefix( const OUString& rPrefix ) const
