[Libreoffice-commits] core.git: 3 commits - basegfx/source external/libabw external/libcdr external/libebook external/libetonyek external/libexttextcat external/libfreehand external/libmspub external/libpagemaker external/libvisio external/libzmf framework/source sdext/source sd/source vcl/source
David Tardon
dtardon at redhat.com
Thu Feb 23 13:53:38 UTC 2017
basegfx/source/polygon/b2dpolygonclipper.cxx | 4 +--
external/libabw/README | 2 -
external/libcdr/README | 2 -
external/libebook/README | 2 +
external/libetonyek/README | 2 +
external/libexttextcat/README | 2 -
external/libfreehand/README | 2 +
external/libmspub/README | 2 +
external/libpagemaker/README | 2 +
external/libvisio/README | 3 --
external/libzmf/README | 4 ---
framework/source/services/autorecovery.cxx | 8 +++----
sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx | 2 -
sdext/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 -
18 files changed, 41 insertions(+), 34 deletions(-)
New commits:
commit d132f85faddbbfc640d6d9cba2b8f62e2adfc207
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 23 12:58:08 2017 +0100
add upstream URL to READMEs
Change-Id: I9cde5f94c81c59ff99b8f5af9765b94b6f57184a
diff --git a/external/libabw/README b/external/libabw/README
index 96432f4..ce20990 100644
--- a/external/libabw/README
+++ b/external/libabw/README
@@ -1,3 +1,3 @@
AbiWord file word processor format import library from
-I couldn't find an upstream for this library - although I did only try a primitive Google search.
+[https://wiki.documentfoundation.org/DLP/Libraries/libabw]
diff --git a/external/libcdr/README b/external/libcdr/README
index d3ba94d..4337b72 100644
--- a/external/libcdr/README
+++ b/external/libcdr/README
@@ -1,3 +1,3 @@
Library parsing the Corel cdr documents.
-I couldn't find an upstream for this library - although I did only try a primitive Google search.
+[https://wiki.documentfoundation.org/DLP/Libraries/libcdr]
diff --git a/external/libebook/README b/external/libebook/README
index 440db7d..804de5c 100644
--- a/external/libebook/README
+++ b/external/libebook/README
@@ -1 +1,3 @@
Library for import of various non-HTML reflowable e-book formats.
+
+[https://sourceforge.net/projects/libebook/]
diff --git a/external/libetonyek/README b/external/libetonyek/README
index 1db5831..5fe6253 100644
--- a/external/libetonyek/README
+++ b/external/libetonyek/README
@@ -1 +1,3 @@
Library for import of Apple Keynote presentations.
+
+[https://wiki.documentfoundation.org/DLP/Libraries/libetonyek]
diff --git a/external/libfreehand/README b/external/libfreehand/README
index dafad78..7403eb1 100644
--- a/external/libfreehand/README
+++ b/external/libfreehand/README
@@ -1 +1,3 @@
Library for import of FreeHand drawings.
+
+[https://wiki.documentfoundation.org/DLP/Libraries/libfreehand]
diff --git a/external/libmspub/README b/external/libmspub/README
index 6d2765a..5a6625f 100644
--- a/external/libmspub/README
+++ b/external/libmspub/README
@@ -1 +1,3 @@
Library parsing the Microsoft Publisher documents.
+
+[https://wiki.documentfoundation.org/DLP/Libraries/libmspub]
diff --git a/external/libpagemaker/README b/external/libpagemaker/README
index e60dbd7..309aa82 100644
--- a/external/libpagemaker/README
+++ b/external/libpagemaker/README
@@ -1 +1,3 @@
Library parsing Adobe PageMaker documents.
+
+[https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker]
diff --git a/external/libvisio/README b/external/libvisio/README
index 05ef170..d3ddc6c 100644
--- a/external/libvisio/README
+++ b/external/libvisio/README
@@ -1,4 +1,3 @@
Libvisio is library providing ability to interpret and import visio diagrams into various applications.
-See also:
[https://wiki.documentfoundation.org/DLP/Libraries/libvisio]
diff --git a/external/libzmf/README b/external/libzmf/README
index 26e05fc..ceb21ba 100644
--- a/external/libzmf/README
+++ b/external/libzmf/README
@@ -1,6 +1,4 @@
libzmf is a library and a set of tools for reading and converting
Zoner Draw and Zebra file formats.
-libzmf requires boost and librevenge to build.
-
-The library is available under MPL 2.0+ license.
+[https://wiki.documentfoundation.org/DLP/Libraries/libzmf]
commit 3f69d7b8f5faed61c3d904b865919f0a3347e77b
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 23 12:54:18 2017 +0100
update upstream link
Change-Id: I1ef0e9079c7af6eddae3e3dae11ca8c3899fd59e
diff --git a/external/libexttextcat/README b/external/libexttextcat/README
index 5aceab3..ee8ab0c 100644
--- a/external/libexttextcat/README
+++ b/external/libexttextcat/README
@@ -3,4 +3,4 @@ N-Gram-Based Text Categorization library
This guesses the language that input text is written in. Fundamentally
an adaption of wiseguys libtextcat extended to be UTF-8 aware.
-It is hosted at: [http://cgit.freedesktop.org/libreoffice/libexttextcat/]
+It is hosted at: [https://wiki.documentfoundation.org/Libexttextcat]
diff --git a/external/libvisio/README b/external/libvisio/README
index 216fee9..05ef170 100644
--- a/external/libvisio/README
+++ b/external/libvisio/README
@@ -1,4 +1,4 @@
Libvisio is library providing ability to interpret and import visio diagrams into various applications.
See also:
-[http://www.freedesktop.org/wiki/Software/libvisio]
+[https://wiki.documentfoundation.org/DLP/Libraries/libvisio]
commit a3f2bf61d93c3f599ed24039632055c4dbdf80e5
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 23 12:37:29 2017 +0100
change intervall -> interval
Change-Id: Ib211619428f16304603d9c0a9fce0b22dde2a617
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 2ec349e..6419005 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 1a964e5f..c01142a 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 75bf1ce..95dedec 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 <FALSE/>,
the TimerBasedTaskExecution destroys itself. This, of course, works
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 86ace64..7953b2b 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 8e3800b..f876ea7 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 477dafd..4c18c07 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 903a7ed..739955d 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 911c1dd..abd6fc4 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))
{
More information about the Libreoffice-commits
mailing list