Skip to content

C
core
Kaydet (Commit) 064c6288 authored tarafından Alexandre Vicenzi's avatar Alexandre Vicenzi Kaydeden (comit) Marcos Souza
Dosyalara gözat
Seçenekler

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
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 135 deletions
UnoControls/source/controls/progressmonitor.cxx
Dosyayı görüntüle @ 064c6288
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/typeprovider.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <tools/solar.h>
#include <algorithm> #include <algorithm>
#include "progressbar.hxx" #include "progressbar.hxx"
...@@ -44,10 +43,6 @@ using ::std::find; ...@@ -44,10 +43,6 @@ using ::std::find;
namespace unocontrols{ namespace unocontrols{
//____________________________________________________________________________________________________________
// construct/destruct
//____________________________________________________________________________________________________________
ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >& rxContext ) ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >& rxContext )
: BaseContainerControl ( rxContext ) : BaseContainerControl ( rxContext )
{ {
...@@ -107,10 +102,7 @@ ProgressMonitor::~ProgressMonitor() ...@@ -107,10 +102,7 @@ ProgressMonitor::~ProgressMonitor()
impl_cleanMemory () ; impl_cleanMemory () ;
} }
//____________________________________________________________________________________________________________
// XInterface // XInterface
//____________________________________________________________________________________________________________
Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException ) Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException )
{ {
// Attention: // Attention:
...@@ -132,10 +124,7 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( Runtime ...@@ -132,10 +124,7 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( Runtime
return aReturn ; return aReturn ;
} }
//____________________________________________________________________________________________________________
// XInterface // XInterface
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::acquire() throw() void SAL_CALL ProgressMonitor::acquire() throw()
{ {
// Attention: // Attention:
...@@ -145,10 +134,7 @@ void SAL_CALL ProgressMonitor::acquire() throw() ...@@ -145,10 +134,7 @@ void SAL_CALL ProgressMonitor::acquire() throw()
BaseControl::acquire(); BaseControl::acquire();
} }
//____________________________________________________________________________________________________________
// XInterface // XInterface
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::release() throw() void SAL_CALL ProgressMonitor::release() throw()
{ {
// Attention: // Attention:
...@@ -158,10 +144,7 @@ void SAL_CALL ProgressMonitor::release() throw() ...@@ -158,10 +144,7 @@ void SAL_CALL ProgressMonitor::release() throw()
BaseControl::release(); BaseControl::release();
} }
//____________________________________________________________________________________________________________
// XTypeProvider // XTypeProvider
//____________________________________________________________________________________________________________
Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException ) Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
{ {
// Optimize this method ! // Optimize this method !
...@@ -191,10 +174,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException ) ...@@ -191,10 +174,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
return pTypeCollection->getTypes(); return pTypeCollection->getTypes();
} }
//____________________________________________________________________________________________________________
// XAggregation // XAggregation
//____________________________________________________________________________________________________________
Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException ) Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException )
{ {
// Ask for my own supported interfaces ... // Ask for my own supported interfaces ...
...@@ -216,10 +196,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti ...@@ -216,10 +196,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti
return aReturn ; return aReturn ;
} }
//____________________________________________________________________________________________________________
// XProgressMonitor // XProgressMonitor
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::addText( void SAL_CALL ProgressMonitor::addText(
const OUString& rTopic, const OUString& rTopic,
const OUString& rText, const OUString& rText,
...@@ -265,10 +242,7 @@ void SAL_CALL ProgressMonitor::addText( ...@@ -265,10 +242,7 @@ void SAL_CALL ProgressMonitor::addText(
impl_recalcLayout () ; impl_recalcLayout () ;
} }
//____________________________________________________________________________________________________________
// XProgressMonitor // XProgressMonitor
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException )
{ {
// Safe impossible cases // Safe impossible cases
...@@ -307,10 +281,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe ...@@ -307,10 +281,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
} }
} }
//____________________________________________________________________________________________________________
// XProgressMonitor // XProgressMonitor
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::updateText ( void SAL_CALL ProgressMonitor::updateText (
const OUString& rTopic, const OUString& rTopic,
const OUString& rText, const OUString& rText,
...@@ -338,10 +309,7 @@ void SAL_CALL ProgressMonitor::updateText ( ...@@ -338,10 +309,7 @@ void SAL_CALL ProgressMonitor::updateText (
} }
} }
//____________________________________________________________________________________________________________
// XProgressBar // XProgressBar
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -350,10 +318,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru ...@@ -350,10 +318,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru
m_xProgressBar->setForegroundColor ( nColor ) ; m_xProgressBar->setForegroundColor ( nColor ) ;
} }
//____________________________________________________________________________________________________________
// XProgressBar // XProgressBar
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -362,10 +327,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru ...@@ -362,10 +327,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru
m_xProgressBar->setBackgroundColor ( nColor ) ; m_xProgressBar->setBackgroundColor ( nColor ) ;
} }
//____________________________________________________________________________________________________________
// XProgressBar // XProgressBar
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -374,10 +336,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep ...@@ -374,10 +336,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep
m_xProgressBar->setValue ( nValue ) ; m_xProgressBar->setValue ( nValue ) ;
} }
//____________________________________________________________________________________________________________
// XProgressBar // XProgressBar
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -386,10 +345,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw ...@@ -386,10 +345,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw
m_xProgressBar->setRange ( nMin, nMax ) ; m_xProgressBar->setRange ( nMin, nMax ) ;
} }
//____________________________________________________________________________________________________________
// XProgressBar // XProgressBar
//____________________________________________________________________________________________________________
sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException ) sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -398,10 +354,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException ) ...@@ -398,10 +354,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
return m_xProgressBar->getValue () ; return m_xProgressBar->getValue () ;
} }
//____________________________________________________________________________________________________________
// XButton // XButton
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -413,10 +366,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA ...@@ -413,10 +366,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA
} }
} }
//____________________________________________________________________________________________________________
// XButton // XButton
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -428,10 +378,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< ...@@ -428,10 +378,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference<
} }
} }
//____________________________________________________________________________________________________________
// XButton // XButton
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -443,10 +390,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim ...@@ -443,10 +390,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim
} }
} }
//____________________________________________________________________________________________________________
// XButton // XButton
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -458,19 +402,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr ...@@ -458,19 +402,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr
} }
} }
//____________________________________________________________________________________________________________
// XLayoutConstrains // XLayoutConstrains
//____________________________________________________________________________________________________________
Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException ) Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
{ {
return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT) ; return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT) ;
} }
//____________________________________________________________________________________________________________
// XLayoutConstrains // XLayoutConstrains
//____________________________________________________________________________________________________________
Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException ) Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -514,19 +452,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException ) ...@@ -514,19 +452,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
return Size ( nWidth, nHeight ) ; return Size ( nWidth, nHeight ) ;
} }
//____________________________________________________________________________________________________________
// XLayoutConstrains // XLayoutConstrains
//____________________________________________________________________________________________________________
Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException ) Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
{ {
return getPreferredSize () ; return getPreferredSize () ;
} }
//____________________________________________________________________________________________________________
// XControl // XControl
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException ) void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException )
{ {
if (!getPeer().is()) if (!getPeer().is())
...@@ -541,20 +473,14 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit ...@@ -541,20 +473,14 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit
} }
} }
//____________________________________________________________________________________________________________
// XControl // XControl
//____________________________________________________________________________________________________________
sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException ) sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
{ {
// We have no model. // We have no model.
return sal_False ; return sal_False ;
} }
//____________________________________________________________________________________________________________
// XControl // XControl
//____________________________________________________________________________________________________________
css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException ) css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException )
{ {
// We have no model. // We have no model.
...@@ -562,10 +488,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw ...@@ -562,10 +488,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw
return css::uno::Reference< XControlModel > () ; return css::uno::Reference< XControlModel > () ;
} }
//____________________________________________________________________________________________________________
// XComponent // XComponent
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException ) void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
{ {
// Ready for multithreading // Ready for multithreading
...@@ -597,10 +520,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException ) ...@@ -597,10 +520,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
BaseContainerControl::dispose () ; BaseContainerControl::dispose () ;
} }
//____________________________________________________________________________________________________________
// XWindow // XWindow
//____________________________________________________________________________________________________________
void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException ) 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 () ; Rectangle aBasePosSize = getPosSize () ;
...@@ -622,28 +542,19 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3 ...@@ -622,28 +542,19 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
} }
} }
//____________________________________________________________________________________________________________
// impl but public method to register service // impl but public method to register service
//____________________________________________________________________________________________________________
const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames() const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames()
{ {
return css::uno::Sequence<OUString>(); return css::uno::Sequence<OUString>();
} }
//____________________________________________________________________________________________________________
// impl but public method to register service // impl but public method to register service
//____________________________________________________________________________________________________________
const OUString ProgressMonitor::impl_getStaticImplementationName() const OUString ProgressMonitor::impl_getStaticImplementationName()
{ {
return OUString("stardiv.UnoControls.ProgressMonitor"); return OUString("stardiv.UnoControls.ProgressMonitor");
} }
//____________________________________________________________________________________________________________
// protected method // protected method
//____________________________________________________________________________________________________________
void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::Reference< XGraphics > & rGraphics ) void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::Reference< XGraphics > & rGraphics )
{ {
if (rGraphics.is()) if (rGraphics.is())
...@@ -669,10 +580,7 @@ void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R ...@@ -669,10 +580,7 @@ void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R
} }
} }
//____________________________________________________________________________________________________________
// private method // private method
//____________________________________________________________________________________________________________
void ProgressMonitor::impl_recalcLayout () void ProgressMonitor::impl_recalcLayout ()
{ {
sal_Int32 nX_Button ; sal_Int32 nX_Button ;
...@@ -821,10 +729,7 @@ void ProgressMonitor::impl_recalcLayout () ...@@ -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 ) ; xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
} }
//____________________________________________________________________________________________________________
// private method // private method
//____________________________________________________________________________________________________________
void ProgressMonitor::impl_rebuildFixedText () void ProgressMonitor::impl_rebuildFixedText ()
{ {
// Ready for multithreading // Ready for multithreading
...@@ -907,10 +812,7 @@ void ProgressMonitor::impl_rebuildFixedText () ...@@ -907,10 +812,7 @@ void ProgressMonitor::impl_rebuildFixedText ()
} }
} }
//____________________________________________________________________________________________________________
// private method // private method
//____________________________________________________________________________________________________________
void ProgressMonitor::impl_cleanMemory () void ProgressMonitor::impl_cleanMemory ()
{ {
// Ready for multithreading // Ready for multithreading
...@@ -933,10 +835,7 @@ void ProgressMonitor::impl_cleanMemory () ...@@ -933,10 +835,7 @@ void ProgressMonitor::impl_cleanMemory ()
maTextlist_Bottom.clear(); maTextlist_Bottom.clear();
} }
//____________________________________________________________________________________________________________
// private method // private method
//____________________________________________________________________________________________________________
IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress ) IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress )
{ {
// Get right textlist for following operations. // Get right textlist for following operations.
...@@ -976,10 +875,7 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s ...@@ -976,10 +875,7 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s
return NULL ; return NULL ;
} }
//____________________________________________________________________________________________________________
// debug methods // debug methods
//____________________________________________________________________________________________________________
#ifdef DBG_UTIL #ifdef DBG_UTIL
// addText, updateText // addText, updateText
......
basctl/source/basicide/bastype2.hxx
Dosyayı görüntüle @ 064c6288
...@@ -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
{ {
......
desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
Dosyayı görüntüle @ 064c6288
...@@ -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"
......
desktop/source/deployment/gui/dp_gui_updatedata.hxx
Dosyayı görüntüle @ 064c6288
...@@ -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"
......
desktop/source/deployment/gui/dp_gui_updatedialog.hxx
Dosyayı görüntüle @ 064c6288
...@@ -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>
......
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
Dosyayı görüntüle @ 064c6288
...@@ -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)
{ {
......
include/drawinglayer/primitive2d/textlayoutdevice.hxx
Dosyayı görüntüle @ 064c6288
...@@ -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: */
vcl/inc/unx/salinst.h
Dosyayı görüntüle @ 064c6288
...@@ -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>
......
vcl/source/window/splitwin.cxx
Dosyayı görüntüle @ 064c6288
...@@ -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