Kaydet (Commit) 064c6288 authored tarafından Alexandre Vicenzi's avatar Alexandre Vicenzi Kaydeden (comit) Marcos Souza

fdo#63154 Remove unused solar.h ref in vcl, basctl, desktop..

Change-Id: Ic0187495d8f7f64ddf9d3c202ec41201c9ac3a8c
Reviewed-on: https://gerrit.libreoffice.org/8001Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarMarcos Souza <marcos.souza.org@gmail.com>
üst 237d2c92
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "doceventnotifier.hxx" #include "doceventnotifier.hxx"
#include <o3tl/heap_ptr.hxx> #include <o3tl/heap_ptr.hxx>
#include <tools/solar.h>
#include <svtools/treelistbox.hxx> #include <svtools/treelistbox.hxx>
#include <svl/lstner.hxx> #include <svl/lstner.hxx>
...@@ -161,7 +160,7 @@ public: ...@@ -161,7 +160,7 @@ public:
}; };
/************************************************************ /*
Classification of types and pointers in the Entries: Classification of types and pointers in the Entries:
OBJ_TYPE_DOCUMENT DocumentEntry OBJ_TYPE_DOCUMENT DocumentEntry
...@@ -170,7 +169,7 @@ public: ...@@ -170,7 +169,7 @@ public:
OBJ_TYPE_DIALOG Entry OBJ_TYPE_DIALOG Entry
OBJ_TYPE_METHOD Entry OBJ_TYPE_METHOD Entry
**************************************************************/ */
class TreeListBox : public SvTreeListBox, public DocumentEventListener class TreeListBox : public SvTreeListBox, public DocumentEventListener
{ {
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
#include "tools/resid.hxx" #include "tools/resid.hxx"
#include "tools/solar.h"
#include "vcl/dialog.hxx" #include "vcl/dialog.hxx"
#include "dp_gui.hrc" #include "dp_gui.hrc"
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATEDATA_HXX
#include "sal/config.h" #include "sal/config.h"
#include "tools/solar.h"
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
#include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/Reference.hxx"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "svtools/svlbitm.hxx" #include "svtools/svlbitm.hxx"
#include "svx/checklbx.hxx" #include "svx/checklbx.hxx"
#include "tools/link.hxx" #include "tools/link.hxx"
#include "tools/solar.h"
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "osl/conditn.hxx" #include "osl/conditn.hxx"
#include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/exc_hlp.hxx"
#include "tools/resid.hxx" #include "tools/resid.hxx"
#include "tools/solar.h"
#include "vcl/dialog.hxx" #include "vcl/dialog.hxx"
#include "vcl/msgbox.hxx" #include "vcl/msgbox.hxx"
#include "vcl/svapp.hxx" #include "vcl/svapp.hxx"
...@@ -87,8 +86,6 @@ public: ...@@ -87,8 +86,6 @@ public:
void stop(); void stop();
private: private:
virtual ~Thread(); virtual ~Thread();
...@@ -202,7 +199,6 @@ void UpdateInstallDialog::Thread::execute() ...@@ -202,7 +199,6 @@ void UpdateInstallDialog::Thread::execute()
m_updateCmdEnv->m_installThread.clear(); m_updateCmdEnv->m_installThread.clear();
} }
UpdateInstallDialog::UpdateInstallDialog( UpdateInstallDialog::UpdateInstallDialog(
Window * parent, Window * parent,
std::vector<dp_gui::UpdateData> & aVecUpdateData, std::vector<dp_gui::UpdateData> & aVecUpdateData,
...@@ -258,7 +254,6 @@ short UpdateInstallDialog::Execute() ...@@ -258,7 +254,6 @@ short UpdateInstallDialog::Execute()
return ModalDialog::Execute(); return ModalDialog::Execute();
} }
// make sure the solar mutex is locked before calling // make sure the solar mutex is locked before calling
void UpdateInstallDialog::updateDone() void UpdateInstallDialog::updateDone()
{ {
...@@ -321,8 +316,6 @@ IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler) ...@@ -321,8 +316,6 @@ IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler)
return 0; return 0;
} }
//------------------------------------------------------------------------------------------------
void UpdateInstallDialog::Thread::downloadExtensions() void UpdateInstallDialog::Thread::downloadExtensions()
{ {
try try
...@@ -434,6 +427,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() ...@@ -434,6 +427,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
m_dialog.setError(e.Message); m_dialog.setError(e.Message);
} }
} }
void UpdateInstallDialog::Thread::installExtensions() void UpdateInstallDialog::Thread::installExtensions()
{ {
//Update the fix text in the dialog to "Installing extensions..." //Update the fix text in the dialog to "Installing extensions..."
...@@ -571,7 +565,6 @@ void UpdateInstallDialog::Thread::removeTempDownloads() ...@@ -571,7 +565,6 @@ void UpdateInstallDialog::Thread::removeTempDownloads()
} }
} }
void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData) void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData)
{ {
{ {
...@@ -619,9 +612,6 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update ...@@ -619,9 +612,6 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
} }
} }
// -------------------------------------------------------------------------------------------------------
UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx,
::rtl::Reference<UpdateInstallDialog::Thread>const & thread) ::rtl::Reference<UpdateInstallDialog::Thread>const & thread)
: m_installThread(thread), : m_installThread(thread),
...@@ -633,16 +623,13 @@ UpdateCommandEnv::~UpdateCommandEnv() ...@@ -633,16 +623,13 @@ UpdateCommandEnv::~UpdateCommandEnv()
{ {
} }
// XCommandEnvironment // XCommandEnvironment
//______________________________________________________________________________
cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler() cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler()
throw (cssu::RuntimeException) throw (cssu::RuntimeException)
{ {
return this; return this;
} }
//______________________________________________________________________________
cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler() cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler()
throw (cssu::RuntimeException) throw (cssu::RuntimeException)
{ {
...@@ -705,7 +692,6 @@ throw (cssu::RuntimeException) ...@@ -705,7 +692,6 @@ throw (cssu::RuntimeException)
{ {
} }
void UpdateCommandEnv::update( cssu::Any const & /*Status */) void UpdateCommandEnv::update( cssu::Any const & /*Status */)
throw (cssu::RuntimeException) throw (cssu::RuntimeException)
{ {
......
...@@ -22,14 +22,12 @@ ...@@ -22,14 +22,12 @@
#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/drawinglayerdllapi.h>
#include <tools/solar.h>
#include <tools/poly.hxx> #include <tools/poly.hxx>
#include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drange.hxx>
#include <vector> #include <vector>
#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/Locale.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx>
//////////////////////////////////////////////////////////////////////////////
// predefines // predefines
class VirtualDevice; class VirtualDevice;
class Font; class Font;
...@@ -43,7 +41,6 @@ namespace drawinglayer { namespace attribute { ...@@ -43,7 +41,6 @@ namespace drawinglayer { namespace attribute {
class FontAttribute; class FontAttribute;
}} }}
//////////////////////////////////////////////////////////////////////////////
// access to one global impTimedRefDev incarnation in namespace drawinglayer::primitive // access to one global impTimedRefDev incarnation in namespace drawinglayer::primitive
namespace drawinglayer namespace drawinglayer
...@@ -116,7 +113,6 @@ namespace drawinglayer ...@@ -116,7 +113,6 @@ namespace drawinglayer
} // end of namespace primitive2d } // end of namespace primitive2d
} // end of namespace drawinglayer } // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
// helper methods for vcl font handling // helper methods for vcl font handling
namespace drawinglayer namespace drawinglayer
...@@ -150,8 +146,6 @@ namespace drawinglayer ...@@ -150,8 +146,6 @@ namespace drawinglayer
} // end of namespace primitive2d } // end of namespace primitive2d
} // end of namespace drawinglayer } // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
#endif //_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX #endif //_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_INC_UNX_SALINST_H #ifndef INCLUDED_VCL_INC_UNX_SALINST_H
#define INCLUDED_VCL_INC_UNX_SALINST_H #define INCLUDED_VCL_INC_UNX_SALINST_H
#include <tools/solar.h>
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <vclpluginapi.h> #include <vclpluginapi.h>
#include <salinst.hxx> #include <salinst.hxx>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <tools/rcid.h> #include <tools/rcid.h>
#include <tools/solar.h>
#include <vcl/event.hxx> #include <vcl/event.hxx>
#include <vcl/wall.hxx> #include <vcl/wall.hxx>
...@@ -97,7 +96,6 @@ namespace { ...@@ -97,7 +96,6 @@ namespace {
} }
} }
#define SPLITWIN_SPLITSIZE 3 #define SPLITWIN_SPLITSIZE 3
#define SPLITWIN_SPLITSIZEEX 4 #define SPLITWIN_SPLITSIZEEX 4
#define SPLITWIN_SPLITSIZEEXLN 6 #define SPLITWIN_SPLITSIZEEXLN 6
...@@ -2168,7 +2166,6 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt ) ...@@ -2168,7 +2166,6 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
} }
} }
void SplitWindow::StartSplit() void SplitWindow::StartSplit()
{ {
maStartSplitHdl.Call( this ); maStartSplitHdl.Call( this );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment