From a3f2bf61d93c3f599ed24039632055c4dbdf80e5 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 23 Feb 2017 12:37:29 +0100 Subject: [PATCH] change intervall -> interval Change-Id: Ib211619428f16304603d9c0a9fce0b22dde2a617 --- basegfx/source/polygon/b2dpolygonclipper.cxx | 4 ++-- framework/source/services/autorecovery.cxx | 8 +++---- .../ui/inc/tools/TimerBasedTaskExecution.hxx | 2 +- .../source/presenter/PresenterSlideSorter.cxx | 2 +- sdext/source/presenter/PresenterTextView.cxx | 6 ++--- sdext/source/presenter/PresenterTimer.cxx | 22 +++++++++---------- sdext/source/presenter/PresenterTimer.hxx | 6 ++--- vcl/source/gdi/regionband.cxx | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 2ec349e5b0e6..64190052d855 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -581,7 +581,7 @@ namespace basegfx else if((clip&0x0f) && (clip&0xf0)==0) { // curr is inside, next is outside // direction vector from 'current' to 'next', *not* normalized - // to bring 't' into the [0<=x<=1] intervall. + // to bring 't' into the [0<=x<=1] interval. ::basegfx::B2DPoint dir((*next)-(*curr)); double denominator = ( pPlane->nx*dir.getX() + @@ -600,7 +600,7 @@ namespace basegfx else if((clip&0x0f)==0 && (clip&0xf0)) { // curr is outside, next is inside // direction vector from 'current' to 'next', *not* normalized - // to bring 't' into the [0<=x<=1] intervall. + // to bring 't' into the [0<=x<=1] interval. ::basegfx::B2DPoint dir((*next)-(*curr)); double denominator = ( pPlane->nx*dir.getX() + diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 1a964e5fd0e2..c01142a14b6c 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -227,7 +227,7 @@ public: E_DONT_START_TIMER, /** timer (was/must be) started with normal AutoSaveTimeIntervall */ E_NORMAL_AUTOSAVE_INTERVALL, - /** timer must be started with special short time intervall, + /** timer must be started with special short time interval, to poll for an user idle period */ E_POLL_FOR_USER_IDLE, /** timer must be started with a very(!) short time interval, @@ -370,7 +370,7 @@ private: bool m_bListenForDocEvents; bool m_bListenForConfigChanges; - /** @short specify the time intervall between two save actions. + /** @short specify the time interval between two save actions. @descr tools::Time is measured in [min]. */ sal_Int32 m_nAutoSaveTimeIntervall; @@ -543,7 +543,7 @@ private: @descr After that we know the initial state - means: - if AutoSave was enabled by the user - - which time intervall has to be used + - which time interval has to be used - which recovery entries may already exists @throw [com.sun.star.uno.RuntimeException] @@ -556,7 +556,7 @@ private: /** @short read the underlying configuration... @descr ... but only keys related to the AutoSave mechanism. - Means: State and Timer intervall. + Means: State and Timer interval. E.g. the recovery list is not addressed here. @throw [com.sun.star.uno.RuntimeException] diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 75bf1cebaf49..95dedec19a15 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -30,7 +30,7 @@ class AsynchronousTask; /** Execute an AsynchronousTask timer based, i.e. every nMillisecondsBetweenSteps milliseconds as much steps are executed as fit - into a nMaxTimePerStep millisecond intervall. + into a nMaxTimePerStep millisecond interval. When a task is executed completely, i.e. HasNextStep() returns , the TimerBasedTaskExecution destroys itself. This, of course, works diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 86ace6436269..7953b2b560cc 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -1140,7 +1140,7 @@ void PresenterSlideSorter::Layout::Update ( // Determine column count, preview width, and horizontal gap (borders // are half the gap). Try to use the preferred values. Try more to - // stay in the valid intervalls. This last constraint may be not + // stay in the valid intervals. This last constraint may be not // fulfilled in some cases. const double nElementWidth = nWidth / gnPreferredColumnCount; if (nElementWidth < gnMinimalPreviewWidth + gnMinimalHorizontalPreviewGap) diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 8e3800b46479..f876ea729194 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; -const static sal_Int64 CaretBlinkIntervall = 500 * 1000 * 1000; +const static sal_Int64 CaretBlinkInterval = 500 * 1000 * 1000; //#define SHOW_CHARACTER_BOXES @@ -1101,8 +1101,8 @@ void PresenterTextCaret::ShowCaret() { mnCaretBlinkTaskId = PresenterTimer::ScheduleRepeatedTask ( [this] (TimeValue const&) { return this->InvertCaret(); }, - CaretBlinkIntervall, - CaretBlinkIntervall); + CaretBlinkInterval, + CaretBlinkInterval); } mbIsCaretVisible = true; } diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 477dafda5c54..4c18c07a2c79 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -40,12 +40,12 @@ public: TimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, - const sal_Int64 nRepeatIntervall, + const sal_Int64 nRepeatInterval, const sal_Int32 nTaskId); PresenterTimer::Task maTask; TimeValue maDueTime; - const sal_Int64 mnRepeatIntervall; + const sal_Int64 mnRepeatInterval; const sal_Int32 mnTaskId; bool mbIsCanceled; }; @@ -74,7 +74,7 @@ public: static SharedTimerTask CreateTimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, - const sal_Int64 nRepeatIntervall); + const sal_Int64 nRepeatInterval); void ScheduleTask (const SharedTimerTask& rpTask); void CancelTask (const sal_Int32 nTaskId); @@ -117,7 +117,7 @@ private: sal_Int32 PresenterTimer::ScheduleRepeatedTask ( const Task& rTask, const sal_Int64 nDelay, - const sal_Int64 nIntervall) + const sal_Int64 nInterval) { TimeValue aCurrentTime; if (TimerScheduler::GetCurrentTime(aCurrentTime)) @@ -126,7 +126,7 @@ sal_Int32 PresenterTimer::ScheduleRepeatedTask ( TimerScheduler::ConvertToTimeValue( aDueTime, TimerScheduler::ConvertFromTimeValue (aCurrentTime) + nDelay); - SharedTimerTask pTask (TimerScheduler::CreateTimerTask(rTask, aDueTime, nIntervall)); + SharedTimerTask pTask (TimerScheduler::CreateTimerTask(rTask, aDueTime, nInterval)); TimerScheduler::Instance()->ScheduleTask(pTask); return pTask->mnTaskId; } @@ -171,9 +171,9 @@ TimerScheduler::~TimerScheduler() SharedTimerTask TimerScheduler::CreateTimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, - const sal_Int64 nRepeatIntervall) + const sal_Int64 nRepeatInterval) { - return std::make_shared(rTask, rDueTime, nRepeatIntervall, ++mnTaskId); + return std::make_shared(rTask, rDueTime, nRepeatInterval, ++mnTaskId); } void TimerScheduler::ScheduleTask (const SharedTimerTask& rpTask) @@ -278,12 +278,12 @@ void SAL_CALL TimerScheduler::run() pTask->maTask(aCurrentTime); // Re-schedule repeating tasks. - if (pTask->mnRepeatIntervall > 0) + if (pTask->mnRepeatInterval > 0) { ConvertToTimeValue( pTask->maDueTime, ConvertFromTimeValue(pTask->maDueTime) - + pTask->mnRepeatIntervall); + + pTask->mnRepeatInterval); ScheduleTask(pTask); } } @@ -339,11 +339,11 @@ namespace { TimerTask::TimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, - const sal_Int64 nRepeatIntervall, + const sal_Int64 nRepeatInterval, const sal_Int32 nTaskId) : maTask(rTask), maDueTime(rDueTime), - mnRepeatIntervall(nRepeatIntervall), + mnRepeatInterval(nRepeatInterval), mnTaskId(nTaskId), mbIsCanceled(false) { diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 903a7ed5320d..739955d31c9a 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -53,13 +53,13 @@ public: /** Schedule a task to be executed repeatedly. The task is executed the first time after nFirst nano-seconds (1000000000 corresponds to one - second). After that task is executed in intervalls that are - nIntervall ns long until CancelTask is called. + second). After that task is executed in intervals that are + nInterval ns long until CancelTask is called. */ static sal_Int32 ScheduleRepeatedTask ( const Task& rTask, const sal_Int64 nFirst, - const sal_Int64 nIntervall); + const sal_Int64 nInterval); static void CancelTask (const sal_Int32 nTaskId); }; diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 911c1dddf17d..abd6fc4c365c 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -386,7 +386,7 @@ void RegionBand::ImplAddMissingBands(const long nTop, const long nBottom) // We still have to cover two cases: // 1. The region does not yet contain any bands. - // 2. The intervall nTop->nBottom extends past the bottom most band. + // 2. The interval nTop->nBottom extends past the bottom most band. if (nCurrentTop <= nBottom && (pBand==nullptr || nBottom>pBand->mnYBottom)) {