summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx2
-rw-r--r--slideshow/source/engine/animatedsprite.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/basenode.hxx2
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx6
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.cxx2
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.hxx2
-rw-r--r--slideshow/source/engine/slide/layer.hxx6
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx2
-rw-r--r--slideshow/source/engine/slide/layermanager.hxx2
-rw-r--r--slideshow/source/engine/transitions/clippingfunctor.cxx2
-rw-r--r--slideshow/source/engine/wakeupevent.cxx2
-rw-r--r--slideshow/source/inc/animatedsprite.hxx2
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx2
-rw-r--r--slideshow/source/inc/usereventqueue.hxx2
14 files changed, 18 insertions, 18 deletions
diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
index 3ad80b77fd15..8da7458f8e8b 100644
--- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
@@ -282,7 +282,7 @@ private:
vector<basegfx::B2DVector> TexCoords;
};
-/** This class is to be derived to make any operation (tranform) you may need in order to construct your transitions
+/** This class is to be derived to make any operation (transform) you may need in order to construct your transitions
*/
class Operation
{
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 0b6e61288bbb..2817af4c031f 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -101,7 +101,7 @@ namespace slideshow
{
// Enlarge or reduce the sprite size, if necessary. This
// method employs a strategy similar to container, when
- // allocating memory: size is doubled or halved everytime
+ // allocating memory: size is doubled or halved every time
// the limit is reached. This makes for amortized constant
// time in runtime complexity. Note that we take exact
// powers of two here, since several HW-accelerated canvas
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index 90fc67967dbe..70a2246acbe5 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -148,7 +148,7 @@ protected:
private:
// all state affecting methods have "_st" counterparts being called at
- // derived classes when in state transistion: no-ops here at BaseNode...
+ // derived classes when in state transition: no-ops here at BaseNode...
virtual bool init_st();
virtual bool resolve_st();
virtual void activate_st();
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 285b43c2295c..e88c15f43219 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -660,7 +660,7 @@ namespace slideshow
};
}
- /// Counts number of class occurences
+ /// Counts number of class occurrences
class CountClassFunctor
{
public:
@@ -678,7 +678,7 @@ namespace slideshow
if( eCurrElemClassification == meClass )
++mnCurrCount;
- return true; // never stop, count all occurences
+ return true; // never stop, count all occurrences
}
sal_Int32 getCount() const
@@ -703,7 +703,7 @@ namespace slideshow
// actions
CountClassFunctor aFunctor( eRequestedClass );
- // count all occurences in the given range
+ // count all occurrences in the given range
iterateActionClassifications( aFunctor, rBegin, rEnd );
return aFunctor.getCount();
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index 1f5a2e935bb4..0e76b7240617 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -66,7 +66,7 @@ namespace slideshow
@param rWakeupEvent
Externally generated wakeup event, to set this
activity to sleep during inter-frame intervals. Must
- come frome the outside, since wakeup event and this
+ come from the outside, since wakeup event and this
object have mutual references to each other.
@param rTimeouts
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
index a2e288253613..2d0e40e96c39 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
@@ -52,7 +52,7 @@ namespace slideshow
@param rWakeupEvent
Externally generated wakeup event, to set this
activity to sleep during inter-frame intervals. Must
- come frome the outside, since wakeup event and this
+ come from the outside, since wakeup event and this
object have mutual references to each other.
@param rTimeouts
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 22be8d8a7bb4..7b2cb34c1875 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -52,13 +52,13 @@ namespace slideshow
Since slides have a notion of depth, i.e. shapes on it
have a certain order in which they lie upon each other,
- this layering must be modeled. A prime example for this
+ this layering must be modelled. A prime example for this
necessity are animations of shapes lying behind other
shapes. Then, everything behind the animated shape will be
in a background layer, the shape itself will be in an
animation layer, and everything before it will be in a
- foreground layer (these layers are most preferrably
- modeled as XSprite objects internally).
+ foreground layer (these layers are most preferably
+ modelled as XSprite objects internally).
@attention All methods of this class are only supposed to
be called from the LayerManager. Normally, it shouldn't be
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 089394e800ba..98238a679543 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -113,7 +113,7 @@ namespace slideshow
{
mbActive = true;
maUpdateShapes.clear(); // update gets forced via area, or
- // has happend outside already
+ // has happened outside already
if( !bSlideBackgoundPainted )
{
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index 2acd7203251e..5f4c2fd14368 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -358,7 +358,7 @@ namespace slideshow
*/
const basegfx::B2DRange maPageBounds;
- /// Number of shape sprites currenly active on this LayerManager
+ /// Number of shape sprites currently active on this LayerManager
sal_Int32 mnActiveSprites;
/// sal_True, if shapes might need to move to different layer
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 717c0e3e5232..3e0f08f506b2 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -203,7 +203,7 @@ namespace slideshow
else
{
// when not completely inside aBackgroundRange clipping is needed
- // substract aClipPoly from aBackgroundRange
+ // subtract aClipPoly from aBackgroundRange
const basegfx::B2DPolyPolygon aBackgroundPolyPoly(basegfx::tools::createPolygonFromRect(aBackgroundRange));
aClipPoly = basegfx::tools::solvePolygonOperationDiff(aBackgroundPolyPoly, aClipPoly);
}
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 7bde8b4f9a32..ff12bdfafdd7 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -63,7 +63,7 @@ namespace slideshow
bool WakeupEvent::isCharged() const
{
- // this event won't expire, we fire everytime we're
+ // this event won't expire, we fire every time we're
// re-inserted into the event queue.
return true;
}
diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx
index 8973f5fdad4f..d2e84bf474be 100644
--- a/slideshow/source/inc/animatedsprite.hxx
+++ b/slideshow/source/inc/animatedsprite.hxx
@@ -103,7 +103,7 @@ namespace slideshow
/** Query the content canvas for the current sprite.
Note that this method must be called
- <em>everytime</em> something is rendered to the
+ <em>every time</em> something is rendered to the
sprite, because XCustomSprite does not guarantee the
validity of the canvas after a render operation.
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 58d27655de6d..1450b356b5b7 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -56,7 +56,7 @@ struct EventMultiplexerImpl;
are handled as well. Note that registered events which
have a non-zero timeout (i.e. events that return non-zero
from getActivationTime()) will not be fired immediately
- after the user action occured, but only after the given
+ after the user action occurred, but only after the given
timeout. Which is actually a feature.
*/
class EventMultiplexer : private ::boost::noncopyable
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index 425f1efacc12..08ac1f9fff44 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -52,7 +52,7 @@ class MouseLeaveHandler;
This class registeres at the EventMultiplexer and fires
events registered for certain user actions. Note that all
events will not be fired immediately after the user action
- occured, but always added to the EventQueue (and fired the
+ occurred, but always added to the EventQueue (and fired the
next time that queue is processed). Which is actually a
feature.