diff options
author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-02-11 22:19:45 -0200 |
---|---|---|
committer | Marcos Souza <marcos.souza.org@gmail.com> | 2014-02-12 07:23:09 +0000 |
commit | 064c628842161c88814ed175bf44c4eda5061f37 (patch) | |
tree | b39e6dfc185688c9556ca2d2d4b54e9cab2ef332 /desktop | |
parent | 237d2c923b77479dbdf07db7bd926c45b01b8fc8 (diff) |
fdo#63154 Remove unused solar.h ref in vcl, basctl, desktop..
Change-Id: Ic0187495d8f7f64ddf9d3c202ec41201c9ac3a8c
Reviewed-on: https://gerrit.libreoffice.org/8001
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'desktop')
4 files changed, 1 insertions, 18 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 33a71c6b2275..531940c5b9e3 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -25,7 +25,6 @@ #include "rtl/ustring.hxx" #include "tools/resid.hxx" -#include "tools/solar.h" #include "vcl/dialog.hxx" #include "dp_gui.hrc" diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index 338873cd38ea..42bda36d275a 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX #include "sal/config.h" -#include "tools/solar.h" #include "rtl/ustring.hxx" #include "com/sun/star/uno/Reference.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 8d7cdf003555..b5dfa20eb777 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -31,7 +31,6 @@ #include "svtools/svlbitm.hxx" #include "svx/checklbx.hxx" #include "tools/link.hxx" -#include "tools/solar.h" #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 05aa792acfca..e76153b650bf 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -25,7 +25,6 @@ #include "osl/conditn.hxx" #include "cppuhelper/exc_hlp.hxx" #include "tools/resid.hxx" -#include "tools/solar.h" #include "vcl/dialog.hxx" #include "vcl/msgbox.hxx" #include "vcl/svapp.hxx" @@ -87,8 +86,6 @@ public: void stop(); - - private: virtual ~Thread(); @@ -202,7 +199,6 @@ void UpdateInstallDialog::Thread::execute() m_updateCmdEnv->m_installThread.clear(); } - UpdateInstallDialog::UpdateInstallDialog( Window * parent, std::vector<dp_gui::UpdateData> & aVecUpdateData, @@ -258,7 +254,6 @@ short UpdateInstallDialog::Execute() return ModalDialog::Execute(); } - // make sure the solar mutex is locked before calling void UpdateInstallDialog::updateDone() { @@ -321,8 +316,6 @@ IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler) return 0; } -//------------------------------------------------------------------------------------------------ - void UpdateInstallDialog::Thread::downloadExtensions() { try @@ -434,6 +427,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() m_dialog.setError(e.Message); } } + void UpdateInstallDialog::Thread::installExtensions() { //Update the fix text in the dialog to "Installing extensions..." @@ -571,7 +565,6 @@ void UpdateInstallDialog::Thread::removeTempDownloads() } } - void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) { { @@ -619,9 +612,6 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update } } - -// ------------------------------------------------------------------------------------------------------- - UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, ::rtl::Reference<UpdateInstallDialog::Thread>const & thread) : m_installThread(thread), @@ -633,16 +623,13 @@ UpdateCommandEnv::~UpdateCommandEnv() { } - // XCommandEnvironment -//______________________________________________________________________________ cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler() throw (cssu::RuntimeException) { return this; } -//______________________________________________________________________________ cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler() throw (cssu::RuntimeException) { @@ -705,7 +692,6 @@ throw (cssu::RuntimeException) { } - void UpdateCommandEnv::update( cssu::Any const & /*Status */) throw (cssu::RuntimeException) { |