summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-11 15:05:55 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-11 16:41:58 +0100
commit1290a4082c298eecd597a7f268b6a19e1e64e9b8 (patch)
treec9c1c2d30de019121e52dc1a6e56f4c462d6a7c4 /desktop
parent2cc88911db9cf81e09270a49c0ee7a13600aa3ab (diff)
Create DispatchRequest via list-initialization
Change-Id: Ic1fc17b028281e64290c6c1d25bbd94fbf27251d
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/dispatchwatcher.hxx3
-rw-r--r--desktop/source/app/officeipcthread.cxx6
2 files changed, 2 insertions, 7 deletions
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 087d338a1507..f78db4f1a141 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -58,9 +58,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
struct DispatchRequest
{
- DispatchRequest( RequestType aType, const OUString& aFile, boost::optional< OUString > const & cwdUrl, const OUString& aPrinter, const OUString& aFact ) :
- aRequestType( aType ), aURL( aFile ), aCwdUrl( cwdUrl ), aPrinterName( aPrinter ), aPreselectedFactory( aFact ) {}
-
RequestType aRequestType;
OUString aURL;
boost::optional< OUString > aCwdUrl;
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 9260840fb3fc..ccc72ec06f1e 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -996,8 +996,7 @@ static void AddToDispatchList(
for (std::vector< OUString >::const_iterator i(aRequestList.begin());
i != aRequestList.end(); ++i)
{
- rDispatchList.push_back(
- DispatchWatcher::DispatchRequest( nType, *i, cwdUrl, aParam, aFactory ));
+ rDispatchList.push_back({nType, *i, cwdUrl, aParam, aFactory});
}
}
@@ -1046,8 +1045,7 @@ static void AddConversionsToDispatchList(
for (std::vector< OUString >::const_iterator i(rRequestList.begin());
i != rRequestList.end(); ++i)
{
- rDispatchList.push_back(
- DispatchWatcher::DispatchRequest( nType, *i, cwdUrl, aParam, rFactory ));
+ rDispatchList.push_back({nType, *i, cwdUrl, aParam, rFactory});
}
}