diff options
27 files changed, 36 insertions, 36 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 145c0c15b68d..01b20d5baf48 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1910,7 +1910,7 @@ class ExitTimer : public Timer SetTimeout(500); Start(); } - virtual void Timeout() SAL_OVERRIDE + virtual void Invoke() SAL_OVERRIDE { exit(42); } diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index b1e1ad0f62a8..919625967845 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -65,7 +65,7 @@ namespace public: explicit ImpTimedRefDev(scoped_timed_RefDev& rOwnerofMe); virtual ~ImpTimedRefDev(); - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; VirtualDevice& acquireVirtualDevice(); void releaseVirtualDevice(); @@ -87,7 +87,7 @@ namespace delete mpVirDev; } - void ImpTimedRefDev::Timeout() + void ImpTimedRefDev::Invoke() { // for obvious reasons, do not call anything after this mrOwnerOfMe.reset(); diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index feb2df041ca9..efa41c8565bc 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -51,7 +51,7 @@ namespace void free(VirtualDevice& rDevice); // Timer virtuals - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; }; VDevBuffer::VDevBuffer() @@ -191,7 +191,7 @@ namespace Start(); } - void VDevBuffer::Timeout() + void VDevBuffer::Invoke() { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index d08baa9ea590..289a2dac73bb 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -776,7 +776,7 @@ class AutoReloadTimer_Impl : public Timer public: AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ); - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 5a5ca9ea87e0..1feda3ae0ccc 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -116,7 +116,7 @@ namespace sdr virtual ~Scheduler(); // From baseclass Timer, the timeout call - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; // get time SAL_DLLPRIVATE sal_uInt32 GetTime() { return mnTime; } diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx index 3c6e9aa303c0..41b2a47730da 100644 --- a/include/vcl/debugevent.hxx +++ b/include/vcl/debugevent.hxx @@ -27,7 +27,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer { void InjectMouseEvent(); void InjectEvent(); void InjectKeyNavEdit(); - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; public: static DebugEventInjector *getCreate(); diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index 0c1726db4ee1..29a0028ebe57 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -56,7 +56,7 @@ public: void StopRefreshTimer(); SC_DLLPUBLIC virtual void SetRefreshDelay( sal_uLong nSeconds ); - SC_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE; + SC_DLLPUBLIC virtual void Invoke() SAL_OVERRIDE; private: void Start(); diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx index 320463f88cdf..9141e461eee1 100644 --- a/sc/source/core/tool/refreshtimer.cxx +++ b/sc/source/core/tool/refreshtimer.cxx @@ -114,7 +114,7 @@ void ScRefreshTimer::SetRefreshDelay( sal_uLong nSeconds ) Start(); } -void ScRefreshTimer::Timeout() +void ScRefreshTimer::Invoke() { if ( ppControl && *ppControl && (*ppControl)->IsRefreshAllowed() ) { diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index fd95bf65d3a5..b211a5db4117 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -289,7 +289,7 @@ public: aSegments.push_back( ISegmentProgressBarRef( new ProgressWrapper( xProgress ) ) ); return aSegments.back(); } - virtual void Timeout() SAL_OVERRIDE + virtual void Invoke() SAL_OVERRIDE { for( size_t i = 0; i < aSegments.size(); i++) static_cast< ProgressWrapper *>( aSegments[ i ].get() )->UpdateBar(); diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index ce174b529258..7de0bf84fccd 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -62,7 +62,7 @@ ImagePreparer::~ImagePreparer() Stop(); } -void ImagePreparer::Timeout() +void ImagePreparer::Invoke() { sal_uInt32 aSlides = xController->getSlideCount(); SAL_INFO( "sdremote", "ImagePreparer " << xController->isRunning() << diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index d0837fc5dcce..172a63775e3d 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -31,7 +31,7 @@ private: css::uno::Reference<css::presentation::XSlideShowController> xController; Transmitter *pTransmitter; - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; void sendPreview( sal_uInt32 aSlideNumber ); css::uno::Sequence<sal_Int8> preparePreview( sal_uInt32 aSlideNumber, diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index a68501a7b0ac..dc7b8cc8f4cc 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -52,7 +52,7 @@ void Receiver::pushCommand( const std::vector<OString> &rCommand ) Start(); } -void Receiver::Timeout() +void Receiver::Invoke() { if( maExecQueue.size() ) { diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx index a5020303f42b..e013ee178c20 100644 --- a/sd/source/ui/remotecontrol/Receiver.hxx +++ b/sd/source/ui/remotecontrol/Receiver.hxx @@ -33,7 +33,7 @@ class Receiver : Timer public: Receiver( Transmitter *aTransmitter ); virtual ~Receiver(); - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; void pushCommand( const std::vector<OString> &rCommand ); void executeCommand( const std::vector<OString> &aCommand ); diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 7b53359c6b63..ecd06b3bc5b8 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -38,7 +38,7 @@ TYPEINIT0( SvLinkSource ) class SvLinkSourceTimer : public Timer { SvLinkSource * pOwner; - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; public: SvLinkSourceTimer( SvLinkSource * pOwn ); }; @@ -48,7 +48,7 @@ SvLinkSourceTimer::SvLinkSourceTimer( SvLinkSource * pOwn ) { } -void SvLinkSourceTimer::Timeout() +void SvLinkSourceTimer::Invoke() { // Secure against being destroyed in Handler SvLinkSourceRef aAdv( pOwner ); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 4deb194d504a..aaf412f90944 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1433,7 +1433,7 @@ AutoReloadTimer_Impl::AutoReloadTimer_Impl( -void AutoReloadTimer_Impl::Timeout() +void AutoReloadTimer_Impl::Invoke() { SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pObjSh ); diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 3a822502e560..ba3f5afbea48 100644 --- a/svx/inc/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx @@ -66,7 +66,7 @@ namespace sdr virtual void PrepareProcessDisplay() SAL_OVERRIDE; // From baseclass Timer, the timeout call triggered by te LazyInvalidate mechanism - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; // Process the whole displaying virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx index 1398f4901678..dd5dbb45212d 100644 --- a/svx/source/inc/eventhandler.hxx +++ b/svx/source/inc/eventhandler.hxx @@ -101,7 +101,7 @@ namespace sdr virtual ~TimerEventHandler(); // The timer when it is triggered; from class Timer - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; // reset the timer void Restart(); diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 099af576c38b..e2afe89eeb14 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -159,7 +159,7 @@ namespace sdr Stop(); } - void Scheduler::Timeout() + void Scheduler::Invoke() { // stop timer and add time Stop(); diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 813dc8eb3d6a..939f01283b0b 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -66,7 +66,7 @@ namespace sdr ObjectContactOfPageView::~ObjectContactOfPageView() { // execute missing LazyInvalidates and stop timer - Timeout(); + Invoke(); } // LazyInvalidate request. Take action. @@ -87,13 +87,13 @@ namespace sdr if(bInvalidateDuringPaint) { // there are still non-triggered LazyInvalidate events, trigger these - Timeout(); + Invoke(); } } } // From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism - void ObjectContactOfPageView::Timeout() + void ObjectContactOfPageView::Invoke() { // stop the timer Stop(); diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index cd5e13ba22cd..dc705259919e 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -54,7 +54,7 @@ public: virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE; // From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; // get primitive visualization drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo); @@ -91,7 +91,7 @@ PagePrimitiveExtractor::PagePrimitiveExtractor( PagePrimitiveExtractor::~PagePrimitiveExtractor() { // execute missing LazyInvalidates and stop timer - Timeout(); + Invoke(); } void PagePrimitiveExtractor::setLazyInvalidate(ViewObjectContact& /*rVOC*/) @@ -102,7 +102,7 @@ void PagePrimitiveExtractor::setLazyInvalidate(ViewObjectContact& /*rVOC*/) } // From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism -void PagePrimitiveExtractor::Timeout() +void PagePrimitiveExtractor::Invoke() { // stop the timer Stop(); diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 40865d559fbd..c8c4f7a1ae99 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -133,7 +133,7 @@ namespace sdr } // The timer when it is triggered; from class Timer - void TimerEventHandler::Timeout() + void TimerEventHandler::Invoke() { ExecuteEvents(); } diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index 5a24fe075652..ed9e2a6a56d8 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -72,7 +72,7 @@ public: void Update(); - virtual void Timeout() SAL_OVERRIDE; + virtual void Invoke() SAL_OVERRIDE; void ClearGroups(); }; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 13f148656ac8..7f18c24ab564 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -338,7 +338,7 @@ void SwGlossaryList::Update() } } -void SwGlossaryList::Timeout() +void SwGlossaryList::Invoke() { // Only update automatically if a SwView has the focus. if(::GetActiveView()) diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 2b65fda59386..b12523050031 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -29,7 +29,7 @@ #include "vcl/svapp.hxx" #include "vcl/window.hxx" -#include "vcl/timer.hxx" +#include "vcl/idle.hxx" #include "vcl/svmain.hxx" #include "vcl/opengl/OpenGLContext.hxx" @@ -79,7 +79,7 @@ class AquaDelayedSettingsChanged : public Idle { } - virtual void Timeout() SAL_OVERRIDE + virtual void Invoke() SAL_OVERRIDE { SalData* pSalData = GetSalData(); if( ! pSalData->maFrames.empty() ) @@ -103,7 +103,7 @@ void AquaSalInstance::delayedSettingsChanged( bool bInvalidate ) { osl::Guard< comphelper::SolarMutex > aGuard( *mpSalYieldMutex ); AquaDelayedSettingsChanged* pIdle = new AquaDelayedSettingsChanged( bInvalidate ); - pIdle->SetPriority( MEDIUM ); + pIdle->SetPriority( SchedulerPriority::MEDIUM ); pIdle->Start(); } diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 41b749a3964f..cd2b8c5b892e 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -63,7 +63,7 @@ class AquaBlinker : public Timer static void Blink( AquaSalFrame*, const Rectangle&, int nTimeout = 80 ); - virtual void Timeout() SAL_OVERRIDE + virtual void Invoke() SAL_OVERRIDE { Stop(); if( AquaSalFrame::isAlive( mpFrame ) && mpFrame->mbShown ) diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index 4581015201a6..7720519667b1 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -257,7 +257,7 @@ void DebugEventInjector::InjectKeyNavEdit() ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYUP, &aKeyEvent ); } -void DebugEventInjector::Timeout() +void DebugEventInjector::Invoke() { InjectEvent(); mnEventsLeft--; diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 5ec4c104c8f5..28764cd56799 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -136,7 +136,7 @@ public: } // from parent Timer - virtual void Timeout() + virtual void Invoke() { ::osl::MutexGuard aGuard(m_aMutex); EntryMap::iterator aIter(maEntries.begin()); |