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

Resolve trivial DispatchList typedef

Browse Source 
Change-Id: I5a304701aed843f6cdbffcdcf6e04255453f0f48
This commit is contained in:
Stephan Bergmann
2016-03-11 15:01:23 +01:00
parent 9095c5495b
commit 2cc88911db
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/app/dispatchwatcher.cxx
View File

@@ -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() ); Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );

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

@@ -68,8 +68,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
OUString aPreselectedFactory; OUString aPreselectedFactory;
}; };
typedef std::vector< DispatchRequest > DispatchList;
DispatchWatcher(); DispatchWatcher();
virtual ~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; virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
// execute new dispatch request // execute new dispatch request
bool executeDispatchRequests( const DispatchList& aDispatches, bool bNoTerminate = false ); bool executeDispatchRequests( const std::vector<DispatchRequest>& aDispatches, bool bNoTerminate = false );
private: private:
osl::Mutex m_mutex; osl::Mutex m_mutex;

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

@@ -986,7 +986,7 @@ void OfficeIPCThread::execute()
} }
static void AddToDispatchList( static void AddToDispatchList(
DispatchWatcher::DispatchList& rDispatchList, std::vector<DispatchWatcher::DispatchRequest>& rDispatchList,
boost::optional< OUString > const & cwdUrl, boost::optional< OUString > const & cwdUrl,
std::vector< OUString > const & aRequestList, std::vector< OUString > const & aRequestList,
DispatchWatcher::RequestType nType, DispatchWatcher::RequestType nType,
@@ -1002,7 +1002,7 @@ static void AddToDispatchList(
} }
static void AddConversionsToDispatchList( static void AddConversionsToDispatchList(
DispatchWatcher::DispatchList& rDispatchList, std::vector<DispatchWatcher::DispatchRequest>& rDispatchList,
boost::optional< OUString > const & cwdUrl, boost::optional< OUString > const & cwdUrl,
std::vector< OUString > const & rRequestList, std::vector< OUString > const & rRequestList,
const OUString& rParam, const OUString& rParam,
@@ -1057,7 +1057,7 @@ bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest
// protect the dispatch list // protect the dispatch list
osl::ClearableMutexGuard aGuard( GetMutex() ); osl::ClearableMutexGuard aGuard( GetMutex() );
static DispatchWatcher::DispatchList aDispatchList; static std::vector<DispatchWatcher::DispatchRequest> aDispatchList;
// Create dispatch list for dispatch watcher // Create dispatch list for dispatch watcher
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, "", aRequest.aModule ); AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, "", aRequest.aModule );
@@ -1083,7 +1083,7 @@ bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest
} }
// copy for execute // copy for execute
DispatchWatcher::DispatchList aTempList( aDispatchList ); std::vector<DispatchWatcher::DispatchRequest> aTempList( aDispatchList );
aDispatchList.clear(); aDispatchList.clear();
aGuard.clear(); aGuard.clear();