diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-13 23:26:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-13 23:26:48 +0200 |
| commit | f5051821bc5da0fa7b3de78d21aee305fce3d46b (patch) | |
| tree | 7831807eec592a6471aac59c5f567ea82dd6a23e /desktop/source/app | |
| parent | f7ea60218ae96cda55dc39073fac807df64f18de (diff) | |
Clean up function declarations and some unused functions
Change-Id: Ie35d71a03d2f89cd72836db21fac8746a9e85b09
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 6067c348118d..5b0e2702cdc5 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -25,6 +25,7 @@ #include "sfx2/app.hxx" #include <svl/fstathelper.hxx> +#include "app.hxx" #include "dispatchwatcher.hxx" #include <rtl/ustring.hxx> #include <comphelper/processfactory.hxx> @@ -67,9 +68,6 @@ using namespace ::com::sun::star::task; namespace desktop { -OUString GetURL_Impl( - const OUString& rName, boost::optional< OUString > const & cwdUrl ); - struct DispatchHolder { DispatchHolder( const URL& rURL, Reference< XDispatch >& rDispatch ) : @@ -163,7 +161,7 @@ DispatchWatcher::~DispatchWatcher() sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList, bool bNoTerminate ) { - Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); + Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() ); DispatchList::const_iterator p; std::vector< DispatchHolder > aDispatches; @@ -628,7 +626,7 @@ void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) th if ( !nCount && !OfficeIPCThread::AreRequestsPending() ) { // We have to check if we have an open task otherwise we have to shutdown the office. - Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); + Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() ); Reference< XElementAccess > xList( xDesktop->getFrames(), UNO_QUERY ); if ( !xList->hasElements() ) |