[Libreoffice-commits] core.git: slideshow/opengl slideshow/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Jan 5 11:43:48 PST 2016
slideshow/opengl/vortexVertexShader.glsl | 2 +-
slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx | 2 +-
slideshow/source/engine/animationnodes/basenode.cxx | 2 +-
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 2 +-
slideshow/source/engine/slide/userpaintoverlay.cxx | 2 +-
slideshow/source/engine/slideshowimpl.cxx | 2 +-
slideshow/source/engine/tools.cxx | 2 +-
slideshow/source/engine/transitions/clippingfunctor.cxx | 2 +-
slideshow/source/engine/transitions/clippingfunctor.hxx | 2 +-
slideshow/source/inc/enumanimation.hxx | 2 +-
slideshow/source/inc/eventqueue.hxx | 2 +-
slideshow/source/inc/slideshowcontext.hxx | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 2851683d8ae51525b2324f4871baabe499980f14
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Jan 5 17:59:50 2016 +0100
Fix typos
Change-Id: I7c40d7eb90a5c2b5d9808683c83b664707c27cb1
Reviewed-on: https://gerrit.libreoffice.org/21128
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/slideshow/opengl/vortexVertexShader.glsl b/slideshow/opengl/vortexVertexShader.glsl
index e01b331..33fdc93 100644
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -113,7 +113,7 @@ void main( void )
vec4 v = vec4(a_position, 1.0);
vec4 normal = vec4(a_normal, 1.0);
- // Each tile moves during only half of the transition. The letmost
+ // Each tile moves during only half of the transition. The leftmost
// tiles start moving at the start and arrive at their end
// position around time=0.5, when the tiles there (the rightmost
// ones) start moving. (The exact time each tile is moving is
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
index df058c2..ad03f23 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
@@ -43,7 +43,7 @@ public:
virtual ~Operation(){}
protected:
- /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to mnT0 to being completely transformed from t = mnT1 to 1. If FALSE, the transform will be inneffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
+ /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to mnT0 to being completely transformed from t = mnT1 to 1. If FALSE, the transform will be ineffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
*/
bool mbInterpolate;
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 5e0b3fb..b2e66b0 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -538,7 +538,7 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr const& pEvent )
// xxx todo:
// think about set node, anim base node!
- // if anim base node has no activity, this is called to schedule deactivatiion,
+ // if anim base node has no activity, this is called to schedule deactivation,
// but what if it does not schedule anything?
// TODO(F2): Handle end time attribute, too
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 5804f7e..5a2a7f1 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -221,7 +221,7 @@ private:
// Flag decides if TextScroll alternates. Default is sal_False.
bool mbAlternate;
- // Flag to remember if this is a simple scrollin text
+ // Flag to remember if this is a simple scrolling text
bool mbScrollIn;
// start time for this animation
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index cd7437b..1e3aab9 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -169,7 +169,7 @@ namespace slideshow
// therefore destroy all the polygons stored
if(mbIsEraseAllModeActivated)
{
- // The Erase Mode should be desactivated
+ // The Erase Mode should be deactivated
mbIsEraseModeActivated = false;
repaintWithoutPolygons();
maPolygons.clear();
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index e837fd1..008f5fa 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -884,7 +884,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
PolygonMap::iterator SlideShowImpl::findPolygons( uno::Reference<drawing::XDrawPage> const& xDrawPage)
{
- // TODO(P2) : Optimze research in the map.
+ // TODO(P2): optimize research in the map.
PolygonMap::iterator aEnd = maPolygons.end();
for( PolygonMap::iterator aIter = maPolygons.begin();
aIter != aEnd;
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index a34f144..64d5246 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -539,7 +539,7 @@ namespace slideshow
}
// return identity transform for un-attributed
- // shapes. This renders the sprite as-is, in it's
+ // shapes. This renders the sprite as-is, in its
// document-supplied size.
return aTransform;
}
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 32def86..c2e8fac 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -64,7 +64,7 @@ namespace slideshow
// perform general transformations _before_ the reverse
// mode changes. This allows the Transition table to be
- // filled more constitently (otherwise, when e.g. rotating
+ // filled more consistently (otherwise, when e.g. rotating
// a clip 90 degrees, the REVERSEMETHOD_FLIP_X becomes
// REVERSEMETHOD_FLIP_Y instead)
if (rTransitionInfo.mnRotationAngle != 0.0 ||
diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx
index 954b799..dfe0a94 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.hxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.hxx
@@ -41,7 +41,7 @@ namespace slideshow
The ParametricPolyPolygon can be obtained from the
ParametricPolyPolygonFactory, see there.
- The TransitionInfo further parameterizes the polygon
+ The TransitionInfo further parametrizes the polygon
generated by the ParametricPolyPolygon, with common
modifications such as rotation, flipping, or change of
direction. This allows the ParametricPolyPolygonFactory to
diff --git a/slideshow/source/inc/enumanimation.hxx b/slideshow/source/inc/enumanimation.hxx
index 4737acd..e649057 100644
--- a/slideshow/source/inc/enumanimation.hxx
+++ b/slideshow/source/inc/enumanimation.hxx
@@ -33,7 +33,7 @@ namespace slideshow
This interface is a specialization of the Animation
interface, and is used to animate attributes representable
- by a set of constant values, such as UNO constantsm, or enums.
+ by a set of constant values, such as UNO constants, or enums.
*/
class EnumAnimation : public Animation
{
diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx
index d3f5beb..c67e5d7 100644
--- a/slideshow/source/inc/eventqueue.hxx
+++ b/slideshow/source/inc/eventqueue.hxx
@@ -62,7 +62,7 @@ namespace slideshow
bool addEventForNextRound( const EventSharedPtr& event );
/** Another way to control the order of asynchronous event
- exeqution. Use this method to schedule events that are to
+ execution. Use this method to schedule events that are to
be executed after all regular events that have no delay,
even when they schedule new regular events without delay.
*/
diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx
index 19b0739..3f414aa 100644
--- a/slideshow/source/inc/slideshowcontext.hxx
+++ b/slideshow/source/inc/slideshowcontext.hxx
@@ -46,7 +46,7 @@ namespace slideshow
/** Common arguments for slideshow objects.
This struct combines a number of object references
- ubiquituously needed throughout the slideshow.
+ ubiquitously needed throughout the slideshow.
*/
struct SlideShowContext
{
More information about the Libreoffice-commits
mailing list