strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change intervall -> interval

Browse source 
Change-Id: Ib211619428f16304603d9c0a9fce0b22dde2a617
This commit is contained in:
David Tardon 2017-02-23 12:37:29 +01:00
parent baf043318e
commit a3f2bf61d9
8 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
basegfx/source/polygon/b2dpolygonclipper.cxx
View file

@ -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() +

8
framework/source/services/autorecovery.cxx
View file

@ -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]

2
sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
View file

@ -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 <FALSE/>,
the TimerBasedTaskExecution destroys itself. This, of course, works

2
sdext/source/presenter/PresenterSlideSorter.cxx
View file

@ -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)

6
sdext/source/presenter/PresenterTextView.cxx
View file

@ -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;
}

22
sdext/source/presenter/PresenterTimer.cxx
View file

@ -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)
{

6
sdext/source/presenter/PresenterTimer.hxx
View file

@ -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);
};

2
vcl/source/gdi/regionband.cxx
View file

@ -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))
{