mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create DispatchRequest via list-initialization

Browse Source 
Change-Id: Ic1fc17b028281e64290c6c1d25bbd94fbf27251d
This commit is contained in:
Stephan Bergmann
2016-03-11 15:05:55 +01:00
parent 2cc88911db
commit 1290a4082c
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/source/app/dispatchwatcher.hxx
View File

@@ -58,9 +58,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
struct DispatchRequest 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; RequestType aRequestType;
OUString aURL; OUString aURL;
boost::optional< OUString > aCwdUrl; boost::optional< OUString > aCwdUrl;

6
desktop/source/app/officeipcthread.cxx
View File

@@ -996,8 +996,7 @@ static void AddToDispatchList(
for (std::vector< OUString >::const_iterator i(aRequestList.begin()); for (std::vector< OUString >::const_iterator i(aRequestList.begin());
i != aRequestList.end(); ++i) i != aRequestList.end(); ++i)
{ {
rDispatchList.push_back( rDispatchList.push_back({nType, *i, cwdUrl, aParam, aFactory});
DispatchWatcher::DispatchRequest( nType, *i, cwdUrl, aParam, aFactory ));
} }
} }
@@ -1046,8 +1045,7 @@ static void AddConversionsToDispatchList(
for (std::vector< OUString >::const_iterator i(rRequestList.begin()); for (std::vector< OUString >::const_iterator i(rRequestList.begin());
i != rRequestList.end(); ++i) i != rRequestList.end(); ++i)
{ {
rDispatchList.push_back( rDispatchList.push_back({nType, *i, cwdUrl, aParam, rFactory});
DispatchWatcher::DispatchRequest( nType, *i, cwdUrl, aParam, rFactory ));
} }
} }