Kaydet (Commit) 152d8d06 authored tarafından Herbert Dürr's avatar Herbert Dürr

#i123770# obsolete and remove the emulation of hash_map's data_type typedef

and fix its former usages by utilizing the standard compliant mapped_type
typedef instead
üst c739861c
...@@ -186,7 +186,7 @@ void MasterPageObserver::Implementation::RegisterDocument ( ...@@ -186,7 +186,7 @@ void MasterPageObserver::Implementation::RegisterDocument (
SdDrawDocument& rDocument) SdDrawDocument& rDocument)
{ {
// Gather the names of all the master pages in the given document. // Gather the names of all the master pages in the given document.
MasterPageContainer::data_type aMasterPageSet; MasterPageContainer::mapped_type aMasterPageSet;
sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD); sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++) for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
{ {
......
...@@ -62,7 +62,6 @@ class hash_map ...@@ -62,7 +62,6 @@ class hash_map
{ {
public: public:
typedef unordered_map<__K,__T,__H,__E,__A> _super; typedef unordered_map<__K,__T,__H,__E,__A> _super;
typedef __T data_type;
hash_map( void) {} hash_map( void) {}
hash_map( size_t n) : _super( n) {} hash_map( size_t n) : _super( n) {}
...@@ -83,7 +82,6 @@ class hash_multimap ...@@ -83,7 +82,6 @@ class hash_multimap
{ {
public: public:
typedef unordered_multimap<__K,__T,__H,__E,__A> _super; typedef unordered_multimap<__K,__T,__H,__E,__A> _super;
typedef __T data_type;
hash_multimap( void) {} hash_multimap( void) {}
hash_multimap( size_t n) : _super( n) {} hash_multimap( size_t n) : _super( n) {}
......
...@@ -63,7 +63,7 @@ XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform ...@@ -63,7 +63,7 @@ XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform
if( pInit ) if( pInit )
{ {
XMLTransformerOASISEventMap_Impl::key_type aKey; XMLTransformerOASISEventMap_Impl::key_type aKey;
XMLTransformerOASISEventMap_Impl::data_type aData; XMLTransformerOASISEventMap_Impl::mapped_type aData;
while( pInit->m_pOASISName ) while( pInit->m_pOASISName )
{ {
aKey.m_nPrefix = pInit->m_nOASISPrefix; aKey.m_nPrefix = pInit->m_nOASISPrefix;
......
...@@ -62,7 +62,7 @@ public: ...@@ -62,7 +62,7 @@ public:
void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit ) void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
{ {
XMLTransformerOOoEventMap_Impl::key_type aKey; XMLTransformerOOoEventMap_Impl::key_type aKey;
XMLTransformerOOoEventMap_Impl::data_type aData; XMLTransformerOOoEventMap_Impl::mapped_type aData;
while( pInit->m_pOOoName ) while( pInit->m_pOOoName )
{ {
aKey = OUString::createFromAscii(pInit->m_pOOoName); aKey = OUString::createFromAscii(pInit->m_pOOoName);
......
...@@ -37,7 +37,7 @@ XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit ) ...@@ -37,7 +37,7 @@ XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit )
if( pInit ) if( pInit )
{ {
XMLTransformerActions::key_type aKey; XMLTransformerActions::key_type aKey;
XMLTransformerActions::data_type aData; XMLTransformerActions::mapped_type aData;
while( pInit->m_nActionType != XML_TACTION_EOT ) while( pInit->m_nActionType != XML_TACTION_EOT )
{ {
aKey.m_nPrefix = pInit->m_nPrefix; aKey.m_nPrefix = pInit->m_nPrefix;
...@@ -66,7 +66,7 @@ void XMLTransformerActions::Add( XMLTransformerActionInit *pInit ) ...@@ -66,7 +66,7 @@ void XMLTransformerActions::Add( XMLTransformerActionInit *pInit )
if( pInit ) if( pInit )
{ {
XMLTransformerActions::key_type aKey; XMLTransformerActions::key_type aKey;
XMLTransformerActions::data_type aData; XMLTransformerActions::mapped_type aData;
while( pInit->m_nActionType != XML_TACTION_EOT ) while( pInit->m_nActionType != XML_TACTION_EOT )
{ {
aKey.m_nPrefix = pInit->m_nPrefix; aKey.m_nPrefix = pInit->m_nPrefix;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment