summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oox/source/token/namespacemap.cxx16
1 files changed, 2 insertions, 14 deletions
diff --git a/oox/source/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx
index f320b993e310..7fd99a5dfb43 100644
--- a/oox/source/token/namespacemap.cxx
+++ b/oox/source/token/namespacemap.cxx
@@ -23,25 +23,13 @@ namespace oox {
NamespaceMap::NamespaceMap()
{
- static const struct NamespaceUrl { sal_Int32 mnId; const sal_Char* mpcUrl; } spNamespaceUrls[] =
- {
-// include auto-generated C array with namespace URLs as C strings
+ maTransitionalNamespaceMap = std::map<sal_Int32, OUString>{
#include "namespacenames.inc"
- { -1, "" }
};
- static const struct NamespaceStrictUrl { sal_Int32 mnId; const sal_Char* mpcUrl; } spNamespaceStrictUrls[] =
- {
-// include auto-generated C array with namespace URLs as C strings
+ maStrictNamespaceMap = std::map<sal_Int32, OUString>{
#include "namespaces-strictnames.inc"
- { -1, "" }
};
-
- for( const NamespaceUrl* pNamespaceUrl = spNamespaceUrls; pNamespaceUrl->mnId != -1; ++pNamespaceUrl )
- maTransitionalNamespaceMap[ pNamespaceUrl->mnId ] = OUString::createFromAscii( pNamespaceUrl->mpcUrl );
-
- for( const NamespaceStrictUrl* pNamespaceUrl = spNamespaceStrictUrls; pNamespaceUrl->mnId != -1; ++pNamespaceUrl )
- maStrictNamespaceMap[ pNamespaceUrl->mnId ] = OUString::createFromAscii( pNamespaceUrl->mpcUrl );
}
}