Author: hdu Date: Tue Nov 26 13:16:13 2013 New Revision: 1545646 URL: http://svn.apache.org/r1545646 Log: #i123755# remove the stlport4-emulation of hash-container's resize() method
and call the rehash() methods of their TR1 counterparts directly Modified: openoffice/trunk/main/stlport/systemstl/hash_map openoffice/trunk/main/stlport/systemstl/hash_set openoffice/trunk/main/unotools/source/config/cmdoptions.cxx openoffice/trunk/main/vcl/source/gdi/configsettings.cxx Modified: openoffice/trunk/main/stlport/systemstl/hash_map URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_map?rev=1545646&r1=1545645&r2=1545646&view=diff ============================================================================== --- openoffice/trunk/main/stlport/systemstl/hash_map (original) +++ openoffice/trunk/main/stlport/systemstl/hash_map Tue Nov 26 13:16:13 2013 @@ -69,7 +69,6 @@ public: hash_map& operator=( const hash_map& r) { hash_map c(r); this->swap(c); return *this; } #endif - void resize( size_t n) { _super::rehash(n); } private: // setting the hasher dynamically is not supported in the emulation! hash_map( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented @@ -98,7 +97,6 @@ public: hash_multimap& operator=( const hash_multimap& r) { hash_multimap c(r); this->swap(c); return *this; } #endif - void resize( size_t n) { _super::rehash(n); } private: // setting the hasher dynamically is not supported in the emulation! hash_multimap( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented Modified: openoffice/trunk/main/stlport/systemstl/hash_set URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_set?rev=1545646&r1=1545645&r2=1545646&view=diff ============================================================================== --- openoffice/trunk/main/stlport/systemstl/hash_set (original) +++ openoffice/trunk/main/stlport/systemstl/hash_set Tue Nov 26 13:16:13 2013 @@ -58,7 +58,6 @@ class hash_set public: hash_set( void) {} hash_set( size_t n) : _super(n) {} - void resize( size_t n) { _super::rehash( n); } #ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem // in derived classes the copy assignment operator can only be declared implicitly if @@ -84,7 +83,6 @@ class hash_multiset public: hash_multiset( void) {} hash_multiset( size_t n) : _super( n) {} - void resize( size_t n) { _super::rehash( n); } #ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem // in derived classes the copy assignment operator can only be declared implicitly if Modified: openoffice/trunk/main/unotools/source/config/cmdoptions.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/source/config/cmdoptions.cxx?rev=1545646&r1=1545645&r2=1545646&view=diff ============================================================================== --- openoffice/trunk/main/unotools/source/config/cmdoptions.cxx (original) +++ openoffice/trunk/main/unotools/source/config/cmdoptions.cxx Tue Nov 26 13:16:13 2013 @@ -102,7 +102,7 @@ class SvtCmdOptions void SetContainerSize( sal_Int32 nSize ) { - m_aCommandHashMap.resize( nSize ); + m_aCommandHashMap.rehash( nSize ); } sal_Bool Lookup( const OUString& aCmd ) const Modified: openoffice/trunk/main/vcl/source/gdi/configsettings.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/configsettings.cxx?rev=1545646&r1=1545645&r2=1545646&view=diff ============================================================================== --- openoffice/trunk/main/vcl/source/gdi/configsettings.cxx (original) +++ openoffice/trunk/main/vcl/source/gdi/configsettings.cxx Tue Nov 26 13:16:13 2013 @@ -131,7 +131,7 @@ void SettingsConfigItem::getValues() m_aSettings.clear(); Sequence< OUString > aNames( GetNodeNames( OUString() ) ); - m_aSettings.resize( aNames.getLength() ); + m_aSettings.rehash( aNames.getLength() ); for( int j = 0; j < aNames.getLength(); j++ ) {