summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2017-03-02 12:28:22 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-03 07:06:52 +0000
commit2e0db91d90f46348cbde9fe51e2ce1c1fffd7cfa (patch)
tree08d33ae848791982c017086588b53148c201fddd /desktop
parent3063d55b8be2188532e3e2892f440ff0d481db71 (diff)
Fix typos
Change-Id: I6b547a864e7a8c8eeedcd7f7c56796e2b3a606d1 Reviewed-on: https://gerrit.libreoffice.org/34807 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx12
-rw-r--r--desktop/source/app/cmdlineargs.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/lib/init.cxx2
-rw-r--r--desktop/test/deployment/locationtest/LocationTest.java2
-rw-r--r--desktop/test/deployment/update/updateinfocreation/build/TestExtension.java2
6 files changed, 11 insertions, 11 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 81cbecedc686..1a9cd263b5d8 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -990,7 +990,7 @@ namespace {
// type is omnipresent
CPPUNIT_ASSERT( aType );
- // seperator doesn't have any other attribs
+ // separator doesn't have any other attribs
if ( aType.get().data() == "separator" )
{
CPPUNIT_ASSERT( !aText && !aCommand && !aSubmenu && !aEnabled && !aChecktype && !aChecked );
@@ -1345,11 +1345,11 @@ void DesktopLOKTest::testNotificationCompression()
std::unique_ptr<CallbackFlushHandler> handler(new CallbackFlushHandler(pDocument, callbackCompressionTest, &notifs));
handler->queue(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, ""); // 0
- handler->queue(LOK_CALLBACK_TEXT_SELECTION, "15, 25, 15, 10"); // Superseeded.
+ handler->queue(LOK_CALLBACK_TEXT_SELECTION, "15, 25, 15, 10"); // Superseded.
handler->queue(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, ""); // Should be dropped.
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "15, 25, 15, 10"); // 1
handler->queue(LOK_CALLBACK_TEXT_SELECTION, "15, 25, 15, 10"); // Should be dropped.
- handler->queue(LOK_CALLBACK_TEXT_SELECTION, ""); // Superseeded.
+ handler->queue(LOK_CALLBACK_TEXT_SELECTION, ""); // Superseded.
handler->queue(LOK_CALLBACK_STATE_CHANGED, ""); // 2
handler->queue(LOK_CALLBACK_STATE_CHANGED, ".uno:Bold"); // 3
handler->queue(LOK_CALLBACK_STATE_CHANGED, ""); // 4
@@ -1357,8 +1357,8 @@ void DesktopLOKTest::testNotificationCompression()
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "15, 25, 15, 10"); // Should be dropped.
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "15, 25, 15, 10"); // Should be dropped.
handler->queue(LOK_CALLBACK_MOUSE_POINTER, "text"); // Should be dropped.
- handler->queue(LOK_CALLBACK_TEXT_SELECTION_START, "15, 25, 15, 10"); // Superseeded.
- handler->queue(LOK_CALLBACK_TEXT_SELECTION_END, "15, 25, 15, 10"); // Superseeded.
+ handler->queue(LOK_CALLBACK_TEXT_SELECTION_START, "15, 25, 15, 10"); // Superseded.
+ handler->queue(LOK_CALLBACK_TEXT_SELECTION_END, "15, 25, 15, 10"); // Superseded.
handler->queue(LOK_CALLBACK_TEXT_SELECTION, "15, 25, 15, 10"); // Superseedd.
handler->queue(LOK_CALLBACK_TEXT_SELECTION_START, "15, 25, 15, 10"); // Should be dropped.
handler->queue(LOK_CALLBACK_TEXT_SELECTION_END, "15, 25, 15, 10"); // Should be dropped.
@@ -1370,7 +1370,7 @@ void DesktopLOKTest::testNotificationCompression()
handler->queue(LOK_CALLBACK_CELL_CURSOR, "15, 25, 15, 10"); // Should be dropped.
handler->queue(LOK_CALLBACK_CELL_FORMULA, "blah"); // 12
handler->queue(LOK_CALLBACK_SET_PART, "1"); // 13
- handler->queue(LOK_CALLBACK_STATE_CHANGED, ".uno:AssignLayout=20"); // Superseeded
+ handler->queue(LOK_CALLBACK_STATE_CHANGED, ".uno:AssignLayout=20"); // Superseded
handler->queue(LOK_CALLBACK_CURSOR_VISIBLE, ""); // Should be dropped.
handler->queue(LOK_CALLBACK_CELL_FORMULA, "blah"); // Should be dropped.
handler->queue(LOK_CALLBACK_SET_PART, "1"); // Should be dropped.
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 112fa580ad6b..003136989406 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -180,7 +180,7 @@ CommandLineArgs::Supplier::Exception::operator =(Exception const &)
CommandLineArgs::Supplier::~Supplier() {}
-// intialize class with command line parameters from process environment
+// initialize class with command line parameters from process environment
CommandLineArgs::CommandLineArgs()
{
InitParamValues();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 79ac4e10dfbe..44fa43e614b6 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -372,7 +372,7 @@ void ExtensionBox_Impl::selectEntry( const long nPos )
{
bool invalidate = false;
{
- //ToDo whe should not use the guard at such a big scope here.
+ //ToDo we should not use the guard at such a big scope here.
//Currently it is used to guard m_vEntries and m_nActive. m_nActive will be
//modified in this function.
//It would be probably best to always use a copy of m_vEntries
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 50c51eea3d2d..89659fa7bcc4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1288,7 +1288,7 @@ static bool lo_runMacro( LibreOfficeKit* pThis, const char *pURL)
if (aErr.Name == "ErrorCode")
{
- pLib->maLastExceptionMsg = "An error occured running macro";
+ pLib->maLastExceptionMsg = "An error occurred running macro";
SAL_INFO("lok", "Macro execution terminated with errors");
return false;
}
diff --git a/desktop/test/deployment/locationtest/LocationTest.java b/desktop/test/deployment/locationtest/LocationTest.java
index 14a0e7d922a9..a2d99170d678 100644
--- a/desktop/test/deployment/locationtest/LocationTest.java
+++ b/desktop/test/deployment/locationtest/LocationTest.java
@@ -149,7 +149,7 @@ public class LocationTest {
public void initialize( Object[] object )
throws com.sun.star.uno.Exception {
/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can intialize
+ * order!At this point you can read the objects and can initialize
* your component using these objects.
*/
}
diff --git a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
index f147270d58bb..84908f0180c3 100644
--- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
+++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
@@ -148,7 +148,7 @@ public class TestExtension {
public void initialize( Object[] object )
throws com.sun.star.uno.Exception {
/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can intialize
+ * order!At this point you can read the objects and can initialize
* your component using these objects.
*/
}