[Libreoffice-commits] core.git: shell/source slideshow/source solenv/bin solenv/doc soltools/cpp sot/source starmath/inc
Andrea Gelmini
andrea.gelmini at gelma.net
Wed Sep 30 03:34:38 PDT 2015
shell/source/unix/misc/open-url.sh | 2 +-
shell/source/win32/shlxthandler/infotips/infotips.cxx | 2 +-
slideshow/source/engine/effectrewinder.hxx | 2 +-
slideshow/source/engine/slideshowimpl.cxx | 4 ++--
slideshow/source/inc/eventmultiplexer.hxx | 2 +-
slideshow/source/inc/shape.hxx | 2 +-
slideshow/source/inc/usereventqueue.hxx | 2 +-
solenv/bin/concat-deps.c | 2 +-
solenv/doc/gbuild/solenv/gbuild/package.mk | 2 +-
soltools/cpp/Test.txt | 14 ++++++--------
soltools/cpp/_macro.c | 2 +-
sot/source/sdstor/stgcache.cxx | 2 +-
sot/source/sdstor/ucbstorage.cxx | 2 +-
starmath/inc/caret.hxx | 2 +-
starmath/inc/cursor.hxx | 6 +++---
15 files changed, 23 insertions(+), 25 deletions(-)
New commits:
commit f45ac62a20b80033a7f5ccdef4a6c116b6fece24
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Wed Sep 30 12:21:39 2015 +0200
Fix typos
Change-Id: I89ff6d31662824d83961d6457b82db8d8031168c
Reviewed-on: https://gerrit.libreoffice.org/18977
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/shell/source/unix/misc/open-url.sh b/shell/source/unix/misc/open-url.sh
index 98a4d3f..72aa566 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -90,7 +90,7 @@ else
exit 0
fi
done
- # handle all non mozilla browers below
+ # handle all non mozilla browsers below
# ..
fi
exit 1
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 70d253a..4d6241a 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -255,7 +255,7 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws
msg += meta_info_accessor.getTagData( META_INFO_DESCRIPTION );
}
- //display midified time formatted into locale representation.
+ //display modified time formatted into locale representation.
if ( iso8601_date_to_local_date(meta_info_accessor.getTagData(META_INFO_MODIFIED )).length() > 0)
{
if ( msg != EMPTY_STRING )
diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx
index 97975d5..fff6fab 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -78,7 +78,7 @@ public:
its internals to us. Only one of the two functors is called.
@param rpPaintLock
This paint lock is released after the whole asynchronous
- procoess of rewinding the current effect is completed. It
+ process of rewinding the current effect is completed. It
prevents intermediate repaints that would show partial replay
of effects.
@param rSlideRewindFunctor
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index db5f135..3d694c4 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -475,7 +475,7 @@ private:
SlideSharedPtr mpPrefetchSlide;
/// slide to be prefetched: best candidate for upcoming slide
uno::Reference<drawing::XDrawPage> mxPrefetchSlide;
- /// save the XDrawPagesSupplier to retieve polygons
+ /// save the XDrawPagesSupplier to retrieve polygons
uno::Reference<drawing::XDrawPagesSupplier> mxDrawPagesSupplier;
/// slide animation to be prefetched:
uno::Reference<animations::XAnimationNode> mxPrefetchAnimationNode;
@@ -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( auto aIter = maPolygons.begin();
aIter != aEnd;
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index cd70cd9..6262bc7 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -718,7 +718,7 @@ public:
*/
bool notifyCommandStopAudio( const boost::shared_ptr<AnimationNode>& rNode );
- /** Botifies that a hyperlink has been clicked.
+ /** Notifies that a hyperlink has been clicked.
@return true, if this event was processed by
anybody. If false is returned, no handler processed
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index 4d11ab8..741e76a 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -211,7 +211,7 @@ namespace slideshow
/** Functor struct, for shape ordering
This defines a strict weak ordering of shapes, primary
- sort key is the shape priority, and secondy sort key
+ sort key is the shape priority, and secondary sort key
the object ptr value. Most typical use is for
associative containers holding shapes (and which also
have to maintain something like a paint order).
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index 61dbab9..dd7ae4a 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -149,7 +149,7 @@ public:
void registerShapeClickEvent( const EventSharedPtr& rEvent,
const ShapeSharedPtr& rShape );
- /** Registes an event that is fired when the current effects(s)
+ /** Registers an event that is fired when the current effects(s)
are skipped, .e.g. when the left mouse button is pressed.
Then, all registered events are fired and removed from this
queue. After firing, a next effect event is issued to this
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index a669dbb..9be0f5d 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -774,7 +774,7 @@ static inline void print_fullpaths(char* line)
int boost_count = 0;
int token_len;
const char * unpacked_end = 0; /* end of UnpackedTarget match (if any) */
- /* for UnpackedTarget the target is GenC{,xx}Object, dont mangle! */
+ /* for UnpackedTarget the target is GenC{,xx}Object, don't mangle! */
int target_seen = 0;
token = line;
diff --git a/solenv/doc/gbuild/solenv/gbuild/package.mk b/solenv/doc/gbuild/solenv/gbuild/package.mk
index d45eb5d..b1d25a6 100644
--- a/solenv/doc/gbuild/solenv/gbuild/package.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/package.mk
@@ -29,7 +29,7 @@ namespace gb
/// file extension) from the root of their source repository.
PackagePart(String name, Path Source);
friend Package;
- /// Returns a list of aboslute paths where files are copied to with the PackagePart class.
+ /// Returns a list of absolute paths where files are copied to with the PackagePart class.
/// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
static const List<Path> get_destinations();
diff --git a/soltools/cpp/Test.txt b/soltools/cpp/Test.txt
index e2d7159..cbf1ea2 100644
--- a/soltools/cpp/Test.txt
+++ b/soltools/cpp/Test.txt
@@ -21,7 +21,7 @@
ABC
-/* Standards --------------------------------------------------------------- */
+/* Standards */
#define NOTHING
NOTHING
@@ -50,7 +50,7 @@ MAC(A,B);
MAC(X,Y)
#endif // MAC
-/* Recursions -------------------------------------------------------------- */
+/* Recursions */
#define y x
#define x y
@@ -73,7 +73,7 @@ args(t1, (args(t2, (x, y)))) // t1 (t2 (x, y))
#define __ ARGS
int foo __((int x)); // int foo (int x);
-/* Concatinations ---------------------------------------------------------- */
+/* Concatinations */
#define tail _Test
// Txt_##tail // Txt_##_Test
@@ -91,14 +91,14 @@ CAT3( a, b ) // ab::ab
#define CAT2( var ) fix##var::fix##var
CAT2( a ) // fixa::fixa
-/* Extrems ----------------------------------------------------------------- */
+/* Extremes */
#define MAKE_X( name ) name##_Test
#define MAKE_Y( name ) MAKE_X( name##_Sym )
MAKE_Y( Txt ); // Txt_Sym_Test;
-/* Extensions -------------------------------------------------------------- */
+/* Extensions */
/*
#ident "(c)# Test.txt"
@@ -109,10 +109,8 @@ MAKE_Y( Txt ); // Txt_Sym_Test;
char machine[6];
*/
-/* Last bug ----------------------------------------------------------------- */
+/* Last bug */
#define Cfstrcpy Cstrcpy
#define Cstrcpy( s1, s2 ) strcpy( s1, s2 )
Cfstrcpy(Par1,Par2 ) // blub( Par1, Par2 )
-
-/* ---------------------------------------------------------------------- */
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index 6d48ef6..8484035 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -344,7 +344,7 @@ void
/** If gatherargs passed a macro validating token, this token
must become valid here.
- trp->tp+0 was checked in expandrow(), so we dont need to do it
+ trp->tp+0 was checked in expandrow(), so we don't need to do it
again here:
*/
for (i = 1; i < ntokc; i++)
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index e54ffa4..4846fb3 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -82,7 +82,7 @@ bool StgPage::IsPageGreater( const StgPage *pA, const StgPage *pB )
static sal_Int32 lcl_GetPageCount( sal_uLong nFileSize, short nPageSize )
{
// return (nFileSize >= 512) ? (nFileSize - 512) / nPageSize : 0;
- // #i61980# reallife: last page may be incomplete, return number of *started* pages
+ // #i61980# real life: last page may be incomplete, return number of *started* pages
return (nFileSize >= 512) ? (nFileSize - 512 + nPageSize - 1) / nPageSize : 0;
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 6014af9..ff7a206 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -487,7 +487,7 @@ public:
bool m_bDirect; // the storage and its streams are opened in direct mode; for UCBStorages
// this means that the root storage does an autocommit when its external
// reference is destroyed
- bool m_bIsRoot; // marks this storage as root storages that manages all oommits and reverts
+ bool m_bIsRoot; // marks this storage as root storages that manages all commits and reverts
bool m_bDirty; // ???
bool m_bIsLinked;
bool m_bListCreated;
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index fcd6823..d7f7b9e 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -333,7 +333,7 @@ private:
* As the placement of caret positions depends very much on the context within which a node
* appears it is not trivial to find all caret positions and determine which follows which.
* In OpenOffice Math this is done by the SmCaretPosGraphBuildingVisitor. This visitor builds
- * graph (an instnce of SmCaretPosGraph) over the caret positions. For details on how this
+ * graph (an instance of SmCaretPosGraph) over the caret positions. For details on how this
* graph is build, and how new methods should be implemented see SmCaretPosGraphBuildingVisitor.
*
* The result of the SmCaretPosGraphBuildingVisitor is a graph over the caret positions in a
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 07f62a0..d0c1229 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -73,7 +73,7 @@ class SmDocShell;
*
* This class is used to represent a cursor in a formula, which can be used to manipulate
* an formula programmatically.
- * @remarks This class is a very intimite friend of SmDocShell.
+ * @remarks This class is a very intimate friend of SmDocShell.
*/
class SmCursor{
public:
@@ -133,7 +133,7 @@ public:
* Note: This method uses the parser to translate a command text into a
* tree, then it copies line entries from this tree into the current tree.
* Will not work for commands such as newline or ##, if position is in a matrix.
- * This will work for stuff like "A intersection B". But stuff spaning multiple lines
+ * This will work for stuff like "A intersection B". But stuff spanning multiple lines
* or dependent on the context which position is placed in will not work!
*/
void InsertCommandText(const OUString& aCommandText);
@@ -370,7 +370,7 @@ private:
/** Finish editing
*
* Finishes editing by parsing pLineList and inserting back into pParent at nParentIndex.
- * This method also rebuilts the graph, annotates the selection, sets caret position and
+ * This method also rebuilds the graph, annotates the selection, sets caret position and
* Calls EndEdit.
*
* @remarks Please note that this method will delete pLineList, as the elements are taken.
More information about the Libreoffice-commits
mailing list