dbaccess/Module_dbaccess.mk | 2 - dbaccess/source/ui/browser/unodatbr.cxx | 2 - dbaccess/source/ui/inc/JoinController.hxx | 2 - dbaccess/source/ui/misc/TableCopyHelper.cxx | 2 - desktop/qa/desktop_lib/test_desktop_lib.cxx | 12 +++++----- desktop/source/app/cmdlineargs.cxx | 2 - desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 - desktop/source/lib/init.cxx | 2 - desktop/test/deployment/locationtest/LocationTest.java | 2 - desktop/test/deployment/update/updateinfocreation/build/TestExtension.java | 2 - dtrans/source/win32/clipb/MtaOleClipb.cxx | 2 - 11 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 2e0db91d90f46348cbde9fe51e2ce1c1fffd7cfa Author: Andrea Gelmini <andrea.gelm...@gelma.net> Date: Thu Mar 2 12:28:22 2017 +0100 Fix typos Change-Id: I6b547a864e7a8c8eeedcd7f7c56796e2b3a606d1 Reviewed-on: https://gerrit.libreoffice.org/34807 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 9c2a125..218fa66 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ )) endif -# This runs a suite of peformance tests on embedded firebird and HSQLDB. +# This runs a suite of performance tests on embedded firebird and HSQLDB. # Instructions on running the test can be found in qa/unit/embeddedb_performancetest ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) ifeq ($(ENABLE_JAVA),TRUE) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 0b433e3..2375a1a 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -518,7 +518,7 @@ bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_f if(!m_pCurrentlyDisplayed) return true; - // this method set all format settings from the orignal table or query + // this method set all format settings from the original table or query try { DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(m_pCurrentlyDisplayed->GetUserData()); diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 41da7156..8718d88 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -145,7 +145,7 @@ namespace dbaui TTableWindowData::value_type createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName); // ask the user if the design should be saved when it is modified virtual short saveModified() = 0; - // called when the orignal state should be reseted (first time load) + // called when the original state should be reseted (first time load) virtual void reset() = 0; virtual void describeSupportedFeatures() override; diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index d5b0596..57eb77f 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -166,7 +166,7 @@ void OTableCopyHelper::pasteTable( const svx::ODataAccessDescriptor& _rPasteData { OSL_VERIFY( _rPasteData[ DataAccessDescriptorProperty::BookmarkSelection ] >>= bBookmarkSelection ); } - OSL_ENSURE( bBookmarkSelection, "OTableCopyHelper::pasteTable: working with selection-indicies (instead of bookmarks) is error-prone, and thus deprecated!" ); + OSL_ENSURE( bBookmarkSelection, "OTableCopyHelper::pasteTable: working with selection-indices (instead of bookmarks) is error-prone, and thus deprecated!" ); sal_Int32 nCommandType = CommandType::COMMAND; if ( _rPasteData.has(DataAccessDescriptorProperty::CommandType) ) diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 81cbece..1a9cd26 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, ¬ifs)); 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 112fa58..0031369 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 79ac4e1..44fa43e 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 50c51ee..89659fa 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 14a0e7d..a2d9917 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 f147270..84908f0 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. */ } diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index f416baa..6c8ec20 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -206,7 +206,7 @@ public: if ( S_OK == m_hResult ) OSL_FAIL( - "com was not yet initialzed, the thread was not created using osl_createThread" ); + "com was not yet initialized, the thread was not created using osl_createThread" ); else if ( FAILED( m_hResult ) && !( RPC_E_CHANGED_MODE == m_hResult ) ) OSL_FAIL( "com could not be initialized, maybe the thread was not created using osl_createThread" ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits