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.grandin@collabora.co.uk>

1 files changed, 11 insertions, 2 deletions

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 );