diff options
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/dispatchwatcher.hxx | 4 | ||||
-rw-r--r-- | desktop/source/app/officeipcthread.cxx | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 63e08c75310d..1952e59458ee 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -180,7 +180,7 @@ DispatchWatcher::~DispatchWatcher() } -bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList, bool bNoTerminate ) +bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest>& aDispatchRequestsList, bool bNoTerminate ) { Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() ); diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index a71c54bfbf23..087d338a1507 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -68,8 +68,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu OUString aPreselectedFactory; }; - typedef std::vector< DispatchRequest > DispatchList; - DispatchWatcher(); virtual ~DispatchWatcher(); @@ -82,7 +80,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; // execute new dispatch request - bool executeDispatchRequests( const DispatchList& aDispatches, bool bNoTerminate = false ); + bool executeDispatchRequests( const std::vector<DispatchRequest>& aDispatches, bool bNoTerminate = false ); private: osl::Mutex m_mutex; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 7d1ebf423703..9260840fb3fc 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -986,7 +986,7 @@ void OfficeIPCThread::execute() } static void AddToDispatchList( - DispatchWatcher::DispatchList& rDispatchList, + std::vector<DispatchWatcher::DispatchRequest>& rDispatchList, boost::optional< OUString > const & cwdUrl, std::vector< OUString > const & aRequestList, DispatchWatcher::RequestType nType, @@ -1002,7 +1002,7 @@ static void AddToDispatchList( } static void AddConversionsToDispatchList( - DispatchWatcher::DispatchList& rDispatchList, + std::vector<DispatchWatcher::DispatchRequest>& rDispatchList, boost::optional< OUString > const & cwdUrl, std::vector< OUString > const & rRequestList, const OUString& rParam, @@ -1057,7 +1057,7 @@ bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest // protect the dispatch list osl::ClearableMutexGuard aGuard( GetMutex() ); - static DispatchWatcher::DispatchList aDispatchList; + static std::vector<DispatchWatcher::DispatchRequest> aDispatchList; // Create dispatch list for dispatch watcher AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, "", aRequest.aModule ); @@ -1083,7 +1083,7 @@ bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest } // copy for execute - DispatchWatcher::DispatchList aTempList( aDispatchList ); + std::vector<DispatchWatcher::DispatchRequest> aTempList( aDispatchList ); aDispatchList.clear(); aGuard.clear(); |