change intervall -> interval

Change-Id: Ib211619428f16304603d9c0a9fce0b22dde2a617

4 files changed, 18 insertions, 18 deletions

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<TimerTask>(rTask, rDueTime, nRepeatIntervall, ++mnTaskId);
+    return std::make_shared<TimerTask>(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);
 };