diff options
Diffstat (limited to 'vcl/unx/generic/dtrans')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index cbda1d98e6b7..9aef71b08a1d 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -201,9 +201,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) return aEncoding; } -std::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() +std::unordered_map< OUString, SelectionManager* >& SelectionManager::getInstances() { - static std::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; + static std::unordered_map< OUString, SelectionManager* > aInstances; return aInstances; } @@ -455,7 +455,7 @@ SelectionManager::~SelectionManager() { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); - std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it; + std::unordered_map< OUString, SelectionManager* >::iterator it; for( it = getInstances().begin(); it != getInstances().end(); ++it ) if( it->second == this ) { @@ -671,7 +671,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 ); SelectionManager* pInstance = nullptr; - std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); + std::unordered_map< OUString, SelectionManager* >::iterator it = getInstances().find( aDisplayName ); if( it != getInstances().end() ) pInstance = it->second; else pInstance = getInstances()[ aDisplayName ] = new SelectionManager(); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 12d57a47b378..e6910f330a33 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -151,7 +151,7 @@ namespace x11 { >, public SelectionAdaptor { - static std::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances(); + static std::unordered_map< OUString, SelectionManager* >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -345,7 +345,7 @@ namespace x11 { // caching for atoms std::unordered_map< Atom, OUString > m_aAtomToString; - std::unordered_map< OUString, Atom, OUStringHash > + std::unordered_map< OUString, Atom > m_aStringToAtom; // the registered selections |