summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-10 14:35:20 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-10 14:53:20 +0100
commit0827a83a776e8be6329d1aa3caa72bf19431ad08 (patch)
treedb8b29cee898649d9a2a60c7954f79e1fa85f3e2 /desktop
parent0dcd3c9572f36aa1b19a8898a2378810e6251647 (diff)
Remove unnecessary class DispatchWatcherHashMap
Change-Id: Ie73f964651aac4571ce0ddd56b5b821669188495
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/dispatchwatcher.cxx2
-rw-r--r--desktop/source/app/dispatchwatcher.hxx8
2 files changed, 3 insertions, 7 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 23ec0b8aeaaf..9cdbf667e6c5 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -339,7 +339,7 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// Remember request so we can find it in statusChanged!
- m_aRequestContainer.insert( DispatchWatcherHashMap::value_type( aURL.Complete, (sal_Int32)1 ) );
+ m_aRequestContainer.emplace(aURL.Complete, 1);
m_nRequestCount++;
}
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 02cb7f35915a..aa4437801b90 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -38,11 +38,6 @@ namespace desktop
there is arose a problem. If there is none the office will be shutdown to prevent a
running office without UI.
*/
-
-class DispatchWatcherHashMap : public std::unordered_map< OUString, sal_Int32, OUStringHash, std::equal_to< OUString > >
-{
-};
-
class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResultListener >
{
public:
@@ -95,7 +90,8 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
static ::osl::Mutex& GetMutex();
- DispatchWatcherHashMap m_aRequestContainer;
+ std::unordered_map<OUString, sal_Int32, OUStringHash>
+ m_aRequestContainer;
sal_Int16 m_nRequestCount;
};