[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stlport/systemstl unotools/source vcl/source

[Herbert Dürr]

 stlport/systemstl/hash_map            |    2 --
 stlport/systemstl/hash_set            |    2 --
 unotools/source/config/cmdoptions.cxx |    2 +-
 vcl/source/gdi/configsettings.cxx     |    2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit f809591727a01b24d6665e4dc378d6a59ea4b020
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Nov 26 13:16:13 2013 +0000

    #i123755# remove the stlport4-emulation of hash-container's resize() method
    
    and call the rehash() methods of their TR1 counterparts directly

diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 72b2700..a14bb68 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -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
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index 7cbf797..c97ee05 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -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
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 2654c05..fa20f59 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -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
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 4fba9504..b279543 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -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++ )
     {