diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2017-03-24 10:40:07 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2017-03-25 16:52:53 +0000 |
commit | b93201ffc6ab4908e25bbfbf4337354c09b5c07a (patch) | |
tree | 131f2632de8fae46dbc966c2855fa0f406418840 | |
parent | ea0b508025ebe074e25d0250d0ce5e5444ea6a76 (diff) |
Fix typos
Change-Id: I4b2eac5c999771b10e65fedebdab1d4ef435b367
Reviewed-on: https://gerrit.libreoffice.org/35626
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins <ci@libreoffice.org>
17 files changed, 19 insertions, 19 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index bbf8ac91afc7..aac2b3ad078b 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -459,7 +459,7 @@ void DesktopLOKTest::testPaintTile() int nTileWidth = 1000; int nTileHeight = 3000; - // This used to crash: painTile() implementation did not handle + // This used to crash: paintTile() implementation did not handle // nCanvasWidth != nCanvasHeight correctly, as usually both are just always // 256. pDocument->pClass->paintTile(pDocument, aBuffer.data(), nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight); @@ -1362,7 +1362,7 @@ void DesktopLOKTest::testNotificationCompression() handler->queue(LOK_CALLBACK_MOUSE_POINTER, "text"); // Should be dropped. 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, "15, 25, 15, 10"); // Superseded. 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. handler->queue(LOK_CALLBACK_TEXT_SELECTION, ""); // 7 diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 45f66201c83b..b8a70c08e33b 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -34,7 +34,7 @@ namespace desktop /* Class for controls dispatching of command URL through office command line. There are "dangerous" command URLs, that can result in a running office without UI. To prevent - this situation the implementation surveille all dispatches and looks for an open task if + this situation the implementation monitors all dispatches and looks for an open task if there is arose a problem. If there is none the office will be shutdown to prevent a running office without UI. */ diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index d431e299f10a..f48260507dca 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -1198,7 +1198,7 @@ void PipeIpcThread::execute() // we might have decided to shutdown while we were sleeping if (!RequestHandler::pGlobal.is()) return; - // only lock the mutex when processing starts, othewise we deadlock when the office goes + // only lock the mutex when processing starts, otherwise we deadlock when the office goes // down during wait osl::ClearableMutexGuard aGuard( RequestHandler::GetMutex() ); diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index f3f1da28d07a..68dbb8ee0df2 100644 --- a/desktop/source/deployment/inc/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -19,7 +19,7 @@ /* Information: * This class implements a mechanism to lock a users installation directory, - * which is necessesary because instances of staroffice could be running on + * which is necessary because instances of staroffice could be running on * different hosts while using the same directory thus causing data * inconsistency. * When an existing lock is detected, the user will be asked whether he wants diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 59533819cd0d..b6b0b8b8e77f 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -47,7 +47,7 @@ public: OUString temporaryName; /* The file name (shared, user) or the folder name (bundled) If the key is the file name, then file name is not encoded. - If the key is the idendifier then the file name is UTF-8 encoded. + If the key is the identifier then the file name is UTF-8 encoded. */ OUString fileName; OUString mediaType; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 68305de971b1..34864cbfee4c 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -272,7 +272,7 @@ void ExtensionManager::addExtensionsToMap( returns a list containing extensions with the same identifier from all repositories (user, shared, bundled). If one repository does not have this extension, then the list contains an empty Reference. The list - is ordered according to the priority of the repostories: + is ordered according to the priority of the repositories: 1. user 2. shared 3. bundled diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 55c42ad8c920..f437ec410b74 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -882,7 +882,7 @@ void PackageManagerImpl::removePackage( //shared extension was "deleted". When a user starts OOo, then it //will check if something changed in the shared repository. Based on //the flag file it will then recognize, that the extension was - //deleted and can then update the extnesion database of the shared + //deleted and can then update the extension database of the shared //extensions in the user installation. if ( xPackage.is() && !m_readOnly && !xPackage->isRemoved() && (m_context == "shared")) { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index fc9c1a2f32d5..a17a214978f2 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -539,7 +539,7 @@ void syncRepositories( return; Reference<deployment::XExtensionManager> xExtensionManager; - //synchronize shared before bundled otherewise there are + //synchronize shared before bundled otherwise there are //more revoke and registration calls. bool bModified = false; if (force || needToSyncRepository("shared") || needToSyncRepository("bundled")) diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 062f76668307..2028d18c2192 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -49,7 +49,7 @@ bool create_ucb_content( // content ctor/isFolder() will throw exception in case the resource // does not exist. - // dilemma: no chance to use the given iahandler here, because it would + // dilemma: no chance to use the given handler here, because it would // raise no such file dialogs, else no interaction for // passwords, ...? xxx todo ::ucbhelper::Content ucbContent( diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 20c71225dfc7..a7906c3694e1 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -497,7 +497,7 @@ bool BackendImpl::removeFromConfigmgrIni( //in case the xcu contained %origin% then the configmr.ini contains the //url to the file in the user installation (e.g. $BUNDLED_EXTENSIONS_USER) //However, m_url (getURL()) contains the URL for the file in the actual - //extension installatation. + //extension installation. ::boost::optional<ConfigurationBackendDb::Data> data = readDataFromDb(url_); if (data) i = std::find(rSet.begin(), rSet.end(), data->iniEntry); diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 98f7d6b16a0d..8f8387788279 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -641,7 +641,7 @@ bool BackendImpl::PackageImpl::checkLicense( //check correct value for attribute if ( ! (simplLicAttr->acceptBy == "user" || simplLicAttr->acceptBy == "admin")) throw css::deployment::DeploymentException( - "Could not obtain attribute simple-lincense@accept-by or it has no valid value", nullptr, Any()); + "Could not obtain attribute simple-license@accept-by or it has no valid value", nullptr, Any()); //Only use interaction if there is no version of this extension already installed diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 0f98bdded730..3c59f781a049 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -435,7 +435,7 @@ void BackendImpl::PackageImpl::processPackage_( bool bDialogSuccess = false; if (!startup) { - //If there is a bundled extension, and the user installes the same extension + //If there is a bundled extension, and the user installs the same extension //then the script from the bundled extension must be removed. If this does not work //then live deployment does not work for scripts. bScriptSuccess = lcl_maybeAddScript(bScript, m_name, m_scriptURL, xScriptLibs); diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 8893e487522f..274ee2f827c2 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -152,7 +152,7 @@ BackendImpl::PackageImpl::PackageImpl( rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); m_name = m_displayName; - dp_misc::TRACE("PakageImpl displayName is " + m_displayName); + dp_misc::TRACE("PackageImpl displayName is " + m_displayName); } diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index edbeb4a01975..1a01253e70fe 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -892,7 +892,7 @@ void CallbackFlushHandler::queue(const int type, const char* data) [&rcNew] (const queue_type::value_type& elem) { if (elem.first == LOK_CALLBACK_INVALIDATE_TILES) { - // Remove exiting if new is all-encompasing, or if of the same part. + // Remove exiting if new is all-encompassing, or if of the same part. const RectangleAndPart rcOld = RectangleAndPart::Create(elem.second); return (rcNew.m_nPart == -1 || rcOld.m_nPart == rcNew.m_nPart); } @@ -1408,7 +1408,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha break; case LOK_DOCTYPE_OTHER: default: - SAL_INFO("lok", "Can't save document - unsopported document type."); + SAL_INFO("lok", "Can't save document - unsupported document type."); return false; } diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index b3a5b72e5d5e..7483a51cf9df 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -231,7 +231,7 @@ extern "C" int unopkg_main() dp_misc::writeConsole("\n" APP_NAME " Version 3.3\n"); return 0; } - //consume all bootstrap variables which may occur before the subcommannd + //consume all bootstrap variables which may occur before the subcommand while(isBootstrapVariable(&nPos)) ; diff --git a/desktop/test/deployment/update/license/readme.txt b/desktop/test/deployment/update/license/readme.txt index 03123d2c5812..8c2a4d4f0412 100644 --- a/desktop/test/deployment/update/license/readme.txt +++ b/desktop/test/deployment/update/license/readme.txt @@ -1,4 +1,4 @@ -The extensions contain a license which is displayed during installaion. If a the license is displayed during a update can be determined by the attribute +The extensions contain a license which is displayed during installation. If a the license is displayed during a update can be determined by the attribute /description/registration/simple-license/@suppress-on-update The default value is false, which means that the attribute is not set, then the license is displayed during an update. diff --git a/desktop/test/deployment/update/wrong_url/readme.txt b/desktop/test/deployment/update/wrong_url/readme.txt index cc2459763ca9..9e3bf8b96911 100644 --- a/desktop/test/deployment/update/wrong_url/readme.txt +++ b/desktop/test/deployment/update/wrong_url/readme.txt @@ -14,5 +14,5 @@ wrongdownload2.oxt: same as wrongdownload1.oxt wrongdownload3.oxt: same as wrongdownload1.oxt -Use the wrongdownload extensions to check the automatic scolling of the text area that contains the results. +Use the wrongdownload extensions to check the automatic scrolling of the text area that contains the results. |