From 064c628842161c88814ed175bf44c4eda5061f37 Mon Sep 17 00:00:00 2001 From: Alexandre Vicenzi Date: Tue, 11 Feb 2014 22:19:45 -0200 Subject: [PATCH] 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 Reviewed-by: Marcos Souza --- .../source/controls/progressmonitor.cxx | 104 ------------------ basctl/source/basicide/bastype2.hxx | 5 +- .../gui/dp_gui_dependencydialog.cxx | 1 - .../deployment/gui/dp_gui_updatedata.hxx | 1 - .../deployment/gui/dp_gui_updatedialog.hxx | 1 - .../gui/dp_gui_updateinstalldialog.cxx | 16 +-- .../primitive2d/textlayoutdevice.hxx | 6 - vcl/inc/unx/salinst.h | 1 - vcl/source/window/splitwin.cxx | 3 - 9 files changed, 3 insertions(+), 135 deletions(-) diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index ab4dd8a244a3..c288632855fc 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "progressbar.hxx" @@ -44,10 +43,6 @@ using ::std::find; namespace unocontrols{ -//____________________________________________________________________________________________________________ -// construct/destruct -//____________________________________________________________________________________________________________ - ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >& rxContext ) : BaseContainerControl ( rxContext ) { @@ -107,10 +102,7 @@ ProgressMonitor::~ProgressMonitor() impl_cleanMemory () ; } -//____________________________________________________________________________________________________________ // XInterface -//____________________________________________________________________________________________________________ - Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException ) { // Attention: @@ -132,10 +124,7 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( Runtime return aReturn ; } -//____________________________________________________________________________________________________________ // XInterface -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::acquire() throw() { // Attention: @@ -145,10 +134,7 @@ void SAL_CALL ProgressMonitor::acquire() throw() BaseControl::acquire(); } -//____________________________________________________________________________________________________________ // XInterface -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::release() throw() { // Attention: @@ -158,10 +144,7 @@ void SAL_CALL ProgressMonitor::release() throw() BaseControl::release(); } -//____________________________________________________________________________________________________________ // XTypeProvider -//____________________________________________________________________________________________________________ - Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException ) { // Optimize this method ! @@ -191,10 +174,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException ) return pTypeCollection->getTypes(); } -//____________________________________________________________________________________________________________ // XAggregation -//____________________________________________________________________________________________________________ - Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException ) { // Ask for my own supported interfaces ... @@ -216,10 +196,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti return aReturn ; } -//____________________________________________________________________________________________________________ // XProgressMonitor -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, @@ -265,10 +242,7 @@ void SAL_CALL ProgressMonitor::addText( impl_recalcLayout () ; } -//____________________________________________________________________________________________________________ // XProgressMonitor -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException ) { // Safe impossible cases @@ -307,10 +281,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe } } -//____________________________________________________________________________________________________________ // XProgressMonitor -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, @@ -338,10 +309,7 @@ void SAL_CALL ProgressMonitor::updateText ( } } -//____________________________________________________________________________________________________________ // XProgressBar -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException ) { // Ready for multithreading @@ -350,10 +318,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru m_xProgressBar->setForegroundColor ( nColor ) ; } -//____________________________________________________________________________________________________________ // XProgressBar -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException ) { // Ready for multithreading @@ -362,10 +327,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru m_xProgressBar->setBackgroundColor ( nColor ) ; } -//____________________________________________________________________________________________________________ // XProgressBar -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException ) { // Ready for multithreading @@ -374,10 +336,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep m_xProgressBar->setValue ( nValue ) ; } -//____________________________________________________________________________________________________________ // XProgressBar -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException ) { // Ready for multithreading @@ -386,10 +345,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw m_xProgressBar->setRange ( nMin, nMax ) ; } -//____________________________________________________________________________________________________________ // XProgressBar -//____________________________________________________________________________________________________________ - sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException ) { // Ready for multithreading @@ -398,10 +354,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException ) return m_xProgressBar->getValue () ; } -//____________________________________________________________________________________________________________ // XButton -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException ) { // Ready for multithreading @@ -413,10 +366,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA } } -//____________________________________________________________________________________________________________ // XButton -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException ) { // Ready for multithreading @@ -428,10 +378,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< } } -//____________________________________________________________________________________________________________ // XButton -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException ) { // Ready for multithreading @@ -443,10 +390,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim } } -//____________________________________________________________________________________________________________ // XButton -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException ) { // Ready for multithreading @@ -458,19 +402,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr } } -//____________________________________________________________________________________________________________ // XLayoutConstrains -//____________________________________________________________________________________________________________ - Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException ) { return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT) ; } -//____________________________________________________________________________________________________________ // XLayoutConstrains -//____________________________________________________________________________________________________________ - Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException ) { // Ready for multithreading @@ -514,19 +452,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException ) return Size ( nWidth, nHeight ) ; } -//____________________________________________________________________________________________________________ // XLayoutConstrains -//____________________________________________________________________________________________________________ - Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException ) { return getPreferredSize () ; } -//____________________________________________________________________________________________________________ // XControl -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException ) { if (!getPeer().is()) @@ -541,20 +473,14 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit } } -//____________________________________________________________________________________________________________ // XControl -//____________________________________________________________________________________________________________ - sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException ) { // We have no model. return sal_False ; } -//____________________________________________________________________________________________________________ // XControl -//____________________________________________________________________________________________________________ - css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException ) { // We have no model. @@ -562,10 +488,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw return css::uno::Reference< XControlModel > () ; } -//____________________________________________________________________________________________________________ // XComponent -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException ) { // Ready for multithreading @@ -597,10 +520,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException ) BaseContainerControl::dispose () ; } -//____________________________________________________________________________________________________________ // XWindow -//____________________________________________________________________________________________________________ - void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException ) { Rectangle aBasePosSize = getPosSize () ; @@ -622,28 +542,19 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3 } } -//____________________________________________________________________________________________________________ // impl but public method to register service -//____________________________________________________________________________________________________________ - const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames() { return css::uno::Sequence(); } -//____________________________________________________________________________________________________________ // impl but public method to register service -//____________________________________________________________________________________________________________ - const OUString ProgressMonitor::impl_getStaticImplementationName() { return OUString("stardiv.UnoControls.ProgressMonitor"); } -//____________________________________________________________________________________________________________ // protected method -//____________________________________________________________________________________________________________ - void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::Reference< XGraphics > & rGraphics ) { if (rGraphics.is()) @@ -669,10 +580,7 @@ void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R } } -//____________________________________________________________________________________________________________ // private method -//____________________________________________________________________________________________________________ - void ProgressMonitor::impl_recalcLayout () { sal_Int32 nX_Button ; @@ -821,10 +729,7 @@ void ProgressMonitor::impl_recalcLayout () xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ; } -//____________________________________________________________________________________________________________ // private method -//____________________________________________________________________________________________________________ - void ProgressMonitor::impl_rebuildFixedText () { // Ready for multithreading @@ -907,10 +812,7 @@ void ProgressMonitor::impl_rebuildFixedText () } } -//____________________________________________________________________________________________________________ // private method -//____________________________________________________________________________________________________________ - void ProgressMonitor::impl_cleanMemory () { // Ready for multithreading @@ -933,10 +835,7 @@ void ProgressMonitor::impl_cleanMemory () maTextlist_Bottom.clear(); } -//____________________________________________________________________________________________________________ // private method -//____________________________________________________________________________________________________________ - IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress ) { // Get right textlist for following operations. @@ -976,10 +875,7 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s return NULL ; } -//____________________________________________________________________________________________________________ // debug methods -//____________________________________________________________________________________________________________ - #ifdef DBG_UTIL // addText, updateText diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index 482899604d61..e20cbd5ed5f4 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -22,7 +22,6 @@ #include "doceventnotifier.hxx" #include -#include #include #include @@ -161,7 +160,7 @@ public: }; -/************************************************************ +/* Classification of types and pointers in the Entries: OBJ_TYPE_DOCUMENT DocumentEntry @@ -170,7 +169,7 @@ public: OBJ_TYPE_DIALOG Entry OBJ_TYPE_METHOD Entry -**************************************************************/ +*/ class TreeListBox : public SvTreeListBox, public DocumentEventListener { 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 #include #include 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 & 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::Referenceconst & thread) : m_installThread(thread), @@ -633,16 +623,13 @@ UpdateCommandEnv::~UpdateCommandEnv() { } - // XCommandEnvironment -//______________________________________________________________________________ cssu::Reference UpdateCommandEnv::getInteractionHandler() throw (cssu::RuntimeException) { return this; } -//______________________________________________________________________________ cssu::Reference UpdateCommandEnv::getProgressHandler() throw (cssu::RuntimeException) { @@ -705,7 +692,6 @@ throw (cssu::RuntimeException) { } - void UpdateCommandEnv::update( cssu::Any const & /*Status */) throw (cssu::RuntimeException) { diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index 22111878e8b6..4bb4bc2f1ea6 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -22,14 +22,12 @@ #include -#include #include #include #include #include #include -////////////////////////////////////////////////////////////////////////////// // predefines class VirtualDevice; class Font; @@ -43,7 +41,6 @@ namespace drawinglayer { namespace attribute { class FontAttribute; }} -////////////////////////////////////////////////////////////////////////////// // access to one global impTimedRefDev incarnation in namespace drawinglayer::primitive namespace drawinglayer @@ -116,7 +113,6 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// // helper methods for vcl font handling namespace drawinglayer @@ -150,8 +146,6 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -////////////////////////////////////////////////////////////////////////////// - #endif //_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index d1645002ea0f..9c4fd3f7abe7 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_INC_UNX_SALINST_H #define INCLUDED_VCL_INC_UNX_SALINST_H -#include #include #include #include diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index bac93560d8be..e4ca66dfb945 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -97,7 +96,6 @@ namespace { } } - #define SPLITWIN_SPLITSIZE 3 #define SPLITWIN_SPLITSIZEEX 4 #define SPLITWIN_SPLITSIZEEXLN 6 @@ -2168,7 +2166,6 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt ) } } - void SplitWindow::StartSplit() { maStartSplitHdl.Call( this );