sd/source/ui/sidebar/MasterPageObserver.cxx | 2 +- stlport/systemstl/hash_map | 2 -- xmloff/source/transform/EventOASISTContext.cxx | 2 +- xmloff/source/transform/EventOOoTContext.cxx | 2 +- xmloff/source/transform/TransformerActions.cxx | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-)
New commits: commit 152d8d068c9040cf2fbd2819bb2ec08394fdbf26 Author: Herbert Dürr <h...@apache.org> Date: Fri Mar 7 13:47:33 2014 +0000 #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 diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index 328493a..720485d 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -186,7 +186,7 @@ void MasterPageObserver::Implementation::RegisterDocument ( SdDrawDocument& rDocument) { // 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); for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++) { diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index 9ebcb44..5c2777f 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -62,7 +62,6 @@ class hash_map { public: typedef unordered_map<__K,__T,__H,__E,__A> _super; - typedef __T data_type; hash_map( void) {} hash_map( size_t n) : _super( n) {} @@ -83,7 +82,6 @@ class hash_multimap { public: typedef unordered_multimap<__K,__T,__H,__E,__A> _super; - typedef __T data_type; hash_multimap( void) {} hash_multimap( size_t n) : _super( n) {} diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index acf5fbd..2916d99 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -63,7 +63,7 @@ XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform if( pInit ) { XMLTransformerOASISEventMap_Impl::key_type aKey; - XMLTransformerOASISEventMap_Impl::data_type aData; + XMLTransformerOASISEventMap_Impl::mapped_type aData; while( pInit->m_pOASISName ) { aKey.m_nPrefix = pInit->m_nOASISPrefix; diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index de5a6e0..bda2797 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -62,7 +62,7 @@ public: void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit ) { XMLTransformerOOoEventMap_Impl::key_type aKey; - XMLTransformerOOoEventMap_Impl::data_type aData; + XMLTransformerOOoEventMap_Impl::mapped_type aData; while( pInit->m_pOOoName ) { aKey = OUString::createFromAscii(pInit->m_pOOoName); diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx index fca620a..430023a 100644 --- a/xmloff/source/transform/TransformerActions.cxx +++ b/xmloff/source/transform/TransformerActions.cxx @@ -37,7 +37,7 @@ XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit ) if( pInit ) { XMLTransformerActions::key_type aKey; - XMLTransformerActions::data_type aData; + XMLTransformerActions::mapped_type aData; while( pInit->m_nActionType != XML_TACTION_EOT ) { aKey.m_nPrefix = pInit->m_nPrefix; @@ -66,7 +66,7 @@ void XMLTransformerActions::Add( XMLTransformerActionInit *pInit ) if( pInit ) { XMLTransformerActions::key_type aKey; - XMLTransformerActions::data_type aData; + XMLTransformerActions::mapped_type aData; while( pInit->m_nActionType != XML_TACTION_EOT ) { aKey.m_nPrefix = pInit->m_nPrefix;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits