android/README | 2 - android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java | 4 +- android/lib/src/main/java/org/libreoffice/androidlib/ProgressDialog.java | 4 +- common/FileUtil.cpp | 2 - common/FileUtil.hpp | 4 +- common/JsonUtil.hpp | 2 - common/Protocol.hpp | 2 - configure.ac | 8 ++--- cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js | 2 - cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js | 2 - cypress_test/integration_tests/mobile/writer/toolbar_spec.js | 4 +- ios/Mobile/CODocument.mm | 2 - ios/README | 4 +- kit/ChildSession.hpp | 6 +-- logerrit | 2 - loleaflet/README | 2 - loleaflet/admin/src/Util.js | 2 - loleaflet/css/leaflet.css | 2 - loleaflet/html/signing-identities.html | 2 - loleaflet/js/select2.js | 4 +- loleaflet/js/vex.combined.js | 8 ++--- loleaflet/js/w2ui-1.5.rc1.js | 6 +-- loleaflet/reference.html | 16 +++++----- loleaflet/src/control/Control.LokDialog.js | 2 - loleaflet/src/control/Control.Menubar.js | 2 - loleaflet/src/control/Control.TopToolbar.js | 8 ++--- loleaflet/src/control/Signing.js | 2 - loleaflet/src/layer/BackgroundColor.js | 2 - loleaflet/src/layer/ObjectFocusDarkOverlay.js | 2 - loleaflet/src/layer/tile/GridLayer.js | 8 ++--- loleaflet/src/layer/tile/TileLayer.TableOverlay.js | 2 - loleaflet/src/layer/tile/TileLayer.js | 4 +- loleaflet/src/layer/vector/Path.Drag.Transform.js | 2 - loleaflet/src/layer/vector/Path.Drag.js | 2 - loleaflet/src/layer/vector/Path.Transform.Util.js | 2 - loleaflet/src/layer/vector/Path.Transform.js | 2 - loleaflet/src/map/Clipboard.js | 6 +-- loleaflet/src/map/Map.js | 2 - loleaflet/src/map/handler/Map.TouchGesture.js | 2 - loolstat | 6 +-- net/Socket.hpp | 4 +- test/TileCacheTests.cpp | 2 - test/UnitHTTP.cpp | 2 - wsd/Admin.hpp | 2 - wsd/DocumentBroker.cpp | 4 +- wsd/DocumentBroker.hpp | 2 - wsd/LOOLWSD.cpp | 4 +- wsd/LOOLWSD.hpp | 4 +- wsd/SenderQueue.hpp | 2 - wsd/TileCache.hpp | 2 - wsd/protocol.txt | 6 +-- wsd/reference.md | 4 +- 52 files changed, 93 insertions(+), 93 deletions(-)
New commits: commit 33000dfded7cb32930e6c21770f5d388da28bd76 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Sun Apr 26 22:55:16 2020 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Apr 26 23:19:52 2020 +0200 typo fixes in comments and code Change-Id: I6f31e050aab701e31064e1abc9429dce0a50c279 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92953 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/android/README b/android/README index 4a6ec771a..f4d737c94 100644 --- a/android/README +++ b/android/README @@ -145,7 +145,7 @@ to setup lldb to actually read & use them. From now on, you will be able to debug directly in the Android Studio debugger. Happy debugging! -Note: to re-buld your app with a newly compiled libnative-lo code - it is +Note: to re-build your app with a newly compiled libnative-lo code - it is == Tip: How to speed up your core.git build == diff --git a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java index f7a1b9151..3075c6a0a 100644 --- a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java +++ b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java @@ -136,7 +136,7 @@ class RecentFilesAdapter extends RecyclerView.Adapter<RecentFilesAdapter.ViewHol String filename = file.filename; long length = file.fileLength; - // TODO Date not avaiable now + // TODO Date not available now //Date date = null; holder.filenameView.setText(filename); @@ -177,7 +177,7 @@ class RecentFilesAdapter extends RecyclerView.Adapter<RecentFilesAdapter.ViewHol holder.fileSizeView.setText(size); holder.fileSizeUnitView.setText(unit); - /* TODO Date not avaiable now + /* TODO Date not available now if (date != null) { SimpleDateFormat df = new SimpleDateFormat("dd MMM yyyy hh:ss"); //TODO format date diff --git a/android/lib/src/main/java/org/libreoffice/androidlib/ProgressDialog.java b/android/lib/src/main/java/org/libreoffice/androidlib/ProgressDialog.java index 39115fc29..44085c643 100644 --- a/android/lib/src/main/java/org/libreoffice/androidlib/ProgressDialog.java +++ b/android/lib/src/main/java/org/libreoffice/androidlib/ProgressDialog.java @@ -55,7 +55,7 @@ public class ProgressDialog { .create(); } - /** Set the progress to indereterminate state. */ + /** Set the progress to indeterminate state. */ public void indeterminate(int messageId) { create(); @@ -66,7 +66,7 @@ public class ProgressDialog { mProgressDialog.show(); } - /** Set the progress to indereterminate state. */ + /** Set the progress to indeterminate state. */ public void determinate(int messageId) { create(); diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp index 92d5d3dc4..054a9461d 100644 --- a/common/FileUtil.cpp +++ b/common/FileUtil.cpp @@ -377,7 +377,7 @@ namespace FileUtil } /// Anonymize user names and IDs. - /// Will use the Obfuscated User ID if one is provied via WOPI. + /// Will use the Obfuscated User ID if one is provided via WOPI. std::string anonymizeUsername(const std::string& username) { return AnonymizeUserData ? Util::anonymize(username, AnonymizationSalt) : username; diff --git a/common/FileUtil.hpp b/common/FileUtil.hpp index 77b96bf15..a64ff9758 100644 --- a/common/FileUtil.hpp +++ b/common/FileUtil.hpp @@ -23,7 +23,7 @@ namespace FileUtil std::string anonymizeUrl(const std::string& url); /// Anonymize user names and IDs. - /// Will use the Obfuscated User ID if one is provied via WOPI. + /// Will use the Obfuscated User ID if one is provided via WOPI. std::string anonymizeUsername(const std::string& username); /// Create a secure, random directory path. @@ -55,7 +55,7 @@ namespace FileUtil bool checkDiskSpace(const std::string& path); /// Safely remove a file or directory. - /// Supresses exception when the file is already removed. + /// Suppresses exception when the file is already removed. /// This can happen when there is a race (unavoidable) or when /// we don't care to check before we remove (when no race exists). void removeFile(const std::string& path, const bool recursive = false); diff --git a/common/JsonUtil.hpp b/common/JsonUtil.hpp index 42cd4e915..d85f01500 100644 --- a/common/JsonUtil.hpp +++ b/common/JsonUtil.hpp @@ -92,7 +92,7 @@ T getJSONValue(const Poco::JSON::Object::Ptr &object, const std::string& key) } /// Function that searches `object` for `key` and warns if there are minor mis-spellings involved. -/// Upon successfull search, fills `value` with value found in object. +/// Upon successful search, fills `value` with value found in object. /// Removes the entry from the JSON object if @bRemove == true. template <typename T> bool findJSONValue(Poco::JSON::Object::Ptr &object, const std::string& key, T& value, bool bRemove = true) diff --git a/common/Protocol.hpp b/common/Protocol.hpp index 56cff7896..72a9aaa34 100644 --- a/common/Protocol.hpp +++ b/common/Protocol.hpp @@ -267,7 +267,7 @@ namespace LOOLProtocol return getFirstLine(message.data(), message.size()); } - /// Returns an abbereviation of the message (the first line, indicating truncation). We assume + /// Returns an abbreviation of the message (the first line, indicating truncation). We assume /// that it adhers to the LOOL protocol, i.e. that there is always a first (or only) line that /// is in printable UTF-8. I.e. no encoding of binary bytes is done. The format of the result is /// not guaranteed to be stable. It is to be used for logging purposes only, not for decoding diff --git a/configure.ac b/configure.ac index 8973269d0..ae72b9d13 100644 --- a/configure.ac +++ b/configure.ac @@ -154,7 +154,7 @@ AC_ARG_ENABLE([androidapp], AC_ARG_ENABLE([android-google-play], AS_HELP_STRING([--enable-android-google-play], - [When enabled, the app encoruages the user periodically to rate the app on Google Play Store.])) + [When enabled, the app encourages the user periodically to rate the app on Google Play Store.])) AC_ARG_WITH(android-package-name, AS_HELP_STRING([--with-android-package-name="org.libreoffice.androidapp"], @@ -172,7 +172,7 @@ AC_ARG_WITH([app-name], AC_ARG_WITH([icon-theme], AS_HELP_STRING([--with-icon-theme=<path>], - [Path to custom icon theme (similiar to loleflet/images).])) + [Path to custom icon theme (similar to loleflet/images).])) AC_ARG_WITH(vendor, AS_HELP_STRING([--with-vendor="John the Builder"], @@ -327,11 +327,11 @@ AC_SUBST(ENABLE_DEBUG_PROTOCOL) ENABLE_BROWSERSYNC= browsersync_msg="disabled: copy files to the target directory" if test "$enable_browsersync" = "yes"; then - AC_DEFINE([ENABLE_BROWSERSYNC],1,[Whether to create symlinks instead of copying files to the target dorectory to run browsersync]) + AC_DEFINE([ENABLE_BROWSERSYNC],1,[Whether to create symlinks instead of copying files to the target directory to run browsersync]) ENABLE_BROWSERSYNC=true browsersync_msg="enabled: create symlinks in the target directory" else - AC_DEFINE([ENABLE_BROWSERSYNC],0,[Whether to create symlinks instead of copying files to the target dorectory to run browsersync]) + AC_DEFINE([ENABLE_BROWSERSYNC],0,[Whether to create symlinks instead of copying files to the target directory to run browsersync]) fi AC_SUBST(ENABLE_BROWSERSYNC) diff --git a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js index 910311b95..80bf94ad1 100644 --- a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js +++ b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js @@ -38,7 +38,7 @@ describe('Change cell appearance.', function() { openAppearencePanel(); } - it('Apply backgound color', function() { + it('Apply background color', function() { openAppearencePanelOnFirtsCell(); // Select a new color diff --git a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js index 352860dc0..d19e92ca6 100644 --- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js +++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js @@ -23,7 +23,7 @@ describe('Calc insertion wizard.', function() { helper.afterAll('insertion_wizard.ods'); }); - it('Check existance of image insertion items.', function() { + it('Check existence of image insertion items.', function() { cy.contains('.menu-entry-with-icon', 'Local Image...') .should('be.visible'); diff --git a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js index aca83d73d..b1894e990 100644 --- a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js @@ -63,7 +63,7 @@ describe('Toolbar tests', function() { cy.get('#tb_actionbar_item_undo') .should('have.class', 'disabled'); - // Type somthing in the document + // Type something in the document cy.get('#document-container').type('x'); // Button should become enabled @@ -83,7 +83,7 @@ describe('Toolbar tests', function() { cy.get('#tb_actionbar_item_redo') .should('have.class', 'disabled'); - // Type somthing in the document + // Type something in the document cy.get('#document-container').type('x'); // Button should be still disabled diff --git a/ios/Mobile/CODocument.mm b/ios/Mobile/CODocument.mm index 5dcd9b136..7eaa9c90f 100644 --- a/ios/Mobile/CODocument.mm +++ b/ios/Mobile/CODocument.mm @@ -43,7 +43,7 @@ - (BOOL)loadFromContents:(id)contents ofType:(NSString *)typeName error:(NSError **)errorPtr { // If this method is called a second time on the same CODocument object, just ignore it. This - // seems to happen occastionally when the device is awakened after sleep. See tdf#122543. + // seems to happen occasionally when the device is awakened after sleep. See tdf#122543. if (fakeClientFd >= 0) return YES; diff --git a/ios/README b/ios/README index 388377689..cc213758d 100644 --- a/ios/README +++ b/ios/README @@ -44,7 +44,7 @@ make POCO_TARGET_OSARCH=x86_64 install This will install the poco static libraries and headers to your $home directory into poco-ios-arm64 (and poco-ios-x64) directory. You can change the directory to your wishes, but by installing it this way into -a directory in $HOME it doesn't polute your root directories, doesn't +a directory in $HOME it doesn't pollute your root directories, doesn't need root permissions and can be removed easily. If compiler can't find <string.h> you need to install: @@ -77,7 +77,7 @@ Then back to the Mac: As you were able to build LibreOffice in step 1, you must already have GNU autoconf installed on the Mac. Install also GNU automake and -libtool. Preferrably from sources, to make sure a potential +libtool. Preferably from sources, to make sure a potential installation of brew or similar will not pollute your environment with unknown stuff. diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp index f739388d1..fad3061aa 100644 --- a/kit/ChildSession.hpp +++ b/kit/ChildSession.hpp @@ -35,7 +35,7 @@ class DocumentManagerInterface public: virtual ~DocumentManagerInterface() {} - /// Reqest loading a document, or a new view, if one exists. + /// Request loading a document, or a new view, if one exists. virtual bool onLoad(const std::string& sessionId, const std::string& uriAnonym, const std::string& renderOpts, @@ -170,7 +170,7 @@ public: _recordedStates[name] = value; } - /// In the case we need to rememeber all the events that come, not just + /// In the case we need to remember all the events that come, not just /// the final state. void recordEventSequence(const int type, const std::string& payload) { @@ -322,7 +322,7 @@ private: /// View ID, returned by createView() or 0 by default. int _viewId; - /// Whether document has been opened succesfuly + /// Whether document has been opened successfully bool _isDocLoaded; std::string _docType; diff --git a/logerrit b/logerrit index 36f9530e4..e7f2e7d21 100755 --- a/logerrit +++ b/logerrit @@ -102,7 +102,7 @@ case "$1" in fi echo echo "Note that you need to register additional email addresses, if you want to" - echo "commit from them. Additional emails must be confirmed with repling to the" + echo "commit from them. Additional emails must be confirmed with replying to the" echo "invitation mail it sends you." echo read -p 'Which user name did you choose? ' GERRITUSER diff --git a/loleaflet/README b/loleaflet/README index b1263bab6..bdeeeebf1 100644 --- a/loleaflet/README +++ b/loleaflet/README @@ -143,7 +143,7 @@ API & events Search: - API: map.search(text, [backward]) - map.higlightAll(text) + map.highlightAll(text) - events: map.on('search', function (e) {}) (currently only fired when no search result is found) where: + e.originalPhrase = the phrase that has been searched for diff --git a/loleaflet/admin/src/Util.js b/loleaflet/admin/src/Util.js index 9d8e2b179..1b9839385 100644 --- a/loleaflet/admin/src/Util.js +++ b/loleaflet/admin/src/Util.js @@ -7,7 +7,7 @@ var Util = Base.extend({ constructor: null -}, { // class itnerface +}, { // class interface humanizeMem: function (kbytes) { var unit = 1000; diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css index 10b892599..f8f5eb95c 100644 --- a/loleaflet/css/leaflet.css +++ b/loleaflet/css/leaflet.css @@ -41,7 +41,7 @@ display: block; } -/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ +/* .leaflet-container svg: reset svg max-width declaration shipped in Joomla! (joomla.org) 3.x */ /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ .leaflet-container svg, .leaflet-container img { diff --git a/loleaflet/html/signing-identities.html b/loleaflet/html/signing-identities.html index e6ba57416..ca7e78f2d 100644 --- a/loleaflet/html/signing-identities.html +++ b/loleaflet/html/signing-identities.html @@ -15,6 +15,6 @@ </style> <p id="select-identity"></p> -<div id="identites"></div> +<div id="identities"></div> <p><a href="#" id="login-qr"></a></p> <p><a href="#" id="recover-from-email"></a></p> diff --git a/loleaflet/js/select2.js b/loleaflet/js/select2.js index 09af93ea5..61e08e00b 100644 --- a/loleaflet/js/select2.js +++ b/loleaflet/js/select2.js @@ -3801,7 +3801,7 @@ S2.define('select2/dropdown',[ }; Dropdown.prototype.position = function ($dropdown, $container) { - // Should be implmented in subclasses + // Should be implemented in subclasses }; Dropdown.prototype.destroy = function () { @@ -4323,7 +4323,7 @@ S2.define('select2/dropdown/selectOnClose',[ var data = $highlightedResults.data('data'); - // Don't re-select already selected resulte + // Don't re-select already selected results if ( (data.element != null && data.element.selected) || (data.element == null && data.selected) diff --git a/loleaflet/js/vex.combined.js b/loleaflet/js/vex.combined.js index 2e09a5497..c726d514b 100644 --- a/loleaflet/js/vex.combined.js +++ b/loleaflet/js/vex.combined.js @@ -16,7 +16,7 @@ if ("document" in window.self) { // Full polyfill for browsers with no classList support // Including IE < Edge missing SVGElement.classList -if (!("classList" in document.createElement("_")) +if (!("classList" in document.createElement("_")) || document.createElementNS && !("classList" in document.createElementNS("http://www.w3.org/2000/svg","g"))) { (function (view) { @@ -446,7 +446,7 @@ function serialize(form, options) { for (var i=0 ; i<elements.length ; ++i) { var element = elements[i]; - // ingore disabled fields + // ignore disabled fields if ((!options.disabled && element.disabled) || !element.name) { continue; } @@ -824,7 +824,7 @@ function serialize(form, options) { for (var i=0 ; i<elements.length ; ++i) { var element = elements[i]; - // ingore disabled fields + // ignore disabled fields if ((!options.disabled && element.disabled) || !element.name) { continue; } @@ -1625,4 +1625,4 @@ vex.registerPlugin = function registerPlugin (pluginFn, name) { module.exports = vex },{"classlist-polyfill":1,"domify":2,"es6-object-assign":3}]},{},[6])(6) -}); \ No newline at end of file +}); diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js index 379f9d085..533941987 100644 --- a/loleaflet/js/w2ui-1.5.rc1.js +++ b/loleaflet/js/w2ui-1.5.rc1.js @@ -1971,7 +1971,7 @@ w2utils.event = { id : null, // id for the tag, otherwise input id is used html : text, // or html position : 'right|top', // can be left, right, top, bottom - align : 'none', // can be none, left, right (only works for potision: top | bottom) + align : 'none', // can be none, left, right (only works for position: top | bottom) left : 0, // delta for left coordinate top : 0, // delta for top coordinate style : '', // adition style for the tag @@ -2009,7 +2009,7 @@ w2utils.event = { var tagID = w2utils.escapeId(origID); var $tags = $('#w2ui-tag-'+tagID); if (text === '' || text == null) { - // remmove element + // remove element $tags.css('opacity', 0); clearInterval($tags.data('timer')); $tags.remove(); @@ -2784,7 +2784,7 @@ w2utils.event = { color: options, transparent: true }; - // add remove transarent color + // add remove transparent color if (options.transparent && pal[0][1] == '555555') { pal[0].splice(1, 1); pal[0].push(''); diff --git a/loleaflet/reference.html b/loleaflet/reference.html index 5f917e102..b52d34688 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -1671,14 +1671,14 @@ unexpected behaviour.</h4> <td><code><b>removePreviewUpdate</b>( <nobr><Object><i>id</i>)</nobr> </code></td> - <td><code>undfined</code></td> + <td><code>undefined</code></td> <td>Cancels the automatic update for the preview defined by 'id'.</td> </tr> <tr> <td><code><b>fitWidthZoom</b>( <nobr><Number><i>maxZoom</i>)</nobr> </code></td> - <td><code>undfined</code></td> + <td><code>undefined</code></td> <td>Zooms in or out so that the document's width fits the viewing area. The document will not zoom in more than `maxZoom` if the parameter is provided.</td> </tr> @@ -1838,7 +1838,7 @@ unexpected behaviour.</h4> <td><code><b>goToPage</b>( <nobr><Number><i>pageNumber</i>)</nobr> </code></td> - <td><code>undfined</code></td> + <td><code>undefined</code></td> <td>Scrolls to the beginning of the given page.</td> </tr> </table> @@ -1867,7 +1867,7 @@ unexpected behaviour.</h4> <td><code><b>setPart</b>( <nobr><Number><i>partNumber</i>)</nobr> </code></td> - <td><code>undfined</code></td> + <td><code>undefined</code></td> <td>Select a specific part.</td> </tr> </table> @@ -3016,7 +3016,7 @@ Editor to WOPI host </code></td> <td> Shows an in-progress overlay, just like what appears when saving - the doument, with the given Label. + the document, with the given Label. </td> </tr> <tr> @@ -8624,7 +8624,7 @@ map.addControl(new MyControl()); <tr> <td><code><b>containerPoint</b></code></td> <td><code><a href="#point">Point</a></code></td> - <td>Pixel coordinates of the point where the mouse event occurred relative to the map сontainer.</td> + <td>Pixel coordinates of the point where the mouse event occurred relative to the map container.</td> </tr> <tr> <td><code><b>originalEvent</b></code></td> @@ -9253,7 +9253,7 @@ var unoCommands = [ { uno: '.uno:ResetAttributes', parameter: null, - description: 'Clear direct formating.' + description: 'Clear direct formatting.' }, { @@ -9530,7 +9530,7 @@ var unoCommands = [ 'type': 'boolean', 'value': 'false' }, - description: 'Continous web view of the document.' + description: 'Continuous web view of the document.' }, { diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js index 63ed3f4a8..0a372e3a2 100644 --- a/loleaflet/src/control/Control.LokDialog.js +++ b/loleaflet/src/control/Control.LokDialog.js @@ -1413,7 +1413,7 @@ L.Control.LokDialog = L.Control.extend({ // The image is rendered per the HiDPI scale we used // while requesting rendering the image. Here we // set the canvas to have the actual size, while - // the image is rendred with the HiDPI scale. + // the image is rendered with the HiDPI scale. this._setCanvasWidthHeight(canvas, this._dialogs[parentId].childwidth, this._dialogs[parentId].childheight); diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index f0dc158da..9649055af 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -1001,7 +1001,7 @@ L.Control.Menubar = L.Control.extend({ var itemState = self._map[constState].getItemValue(unoCommand); if (itemState === 'disabled') { if (unoCommand.startsWith('.uno:Paste')) { - console.log('dont disable paste based on server side data'); + console.log('do not disable paste based on server side data'); } else { $(aItem).addClass('disabled'); } diff --git a/loleaflet/src/control/Control.TopToolbar.js b/loleaflet/src/control/Control.TopToolbar.js index 06fdd038f..ff5b1d704 100644 --- a/loleaflet/src/control/Control.TopToolbar.js +++ b/loleaflet/src/control/Control.TopToolbar.js @@ -270,7 +270,7 @@ L.Control.TopToolbar = L.Control.extend({ window.insertShapes(); } }); - + toolbar.bind('touchstart', function() { w2ui['editbar'].touchStarted = true; }); @@ -398,7 +398,7 @@ L.Control.TopToolbar = L.Control.extend({ if (commands && commands.length > 0) { // Inserts a separator element data = data.concat({text: '\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true}); - + commands.forEach(function (command) { var translated = command.text; if (L.Styles.styleMappings[command.text]) { @@ -424,7 +424,7 @@ L.Control.TopToolbar = L.Control.extend({ if (topStyles.length > 0) { // Inserts a separator element data = data.concat({text: '\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true}); - + topStyles.forEach(function (style) { data = data.concat({id: style, text: L.Styles.styleMappings[style].toLocaleString()}); }, this); @@ -554,7 +554,7 @@ L.Control.TopToolbar = L.Control.extend({ $('.fontsizes-select').val(state).trigger('change'); } - // call shared handler for font color and higlight items handling + // call shared handler for font color and highlight items handling window.onCommandStateChanged(e); } }); diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js index 7a253ddf0..81411e0f3 100644 --- a/loleaflet/src/control/Signing.js +++ b/loleaflet/src/control/Signing.js @@ -490,7 +490,7 @@ L.Map.include({ $('#recover-from-email').text(_('Recover from email')); library.listIdentities().then(function(response) { var identities = response.data; - var identitiesDiv = $vexContent.find('#identites'); + var identitiesDiv = $vexContent.find('#identities'); for (var key in identities) { var button = $('<input class="identity-button" type="button"/>'); button.attr('value', identities[key].initials); diff --git a/loleaflet/src/layer/BackgroundColor.js b/loleaflet/src/layer/BackgroundColor.js index 2e0198e28..31a96ef17 100644 --- a/loleaflet/src/layer/BackgroundColor.js +++ b/loleaflet/src/layer/BackgroundColor.js @@ -39,7 +39,7 @@ L.BackgroundColor = L.Layer.extend({ } }); -// Libreoffice-specific functionality follows. +// LibreOffice-specific functionality follows. /* * A L.BackgroundColor that automatically resets its color diff --git a/loleaflet/src/layer/ObjectFocusDarkOverlay.js b/loleaflet/src/layer/ObjectFocusDarkOverlay.js index 16e8eddde..fec1e9459 100644 --- a/loleaflet/src/layer/ObjectFocusDarkOverlay.js +++ b/loleaflet/src/layer/ObjectFocusDarkOverlay.js @@ -8,7 +8,7 @@ L.ObjectFocusDarkOverlay = L.Layer.extend({ } }); -// Libreoffice-specific functionality follows. +// LibreOffice-specific functionality follows. /* * A L.ObjectFocusDarkOverlay diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js index 8e1a046ea..850981777 100644 --- a/loleaflet/src/layer/tile/GridLayer.js +++ b/loleaflet/src/layer/tile/GridLayer.js @@ -393,7 +393,7 @@ L.GridLayer = L.Layer.extend({ var bottomRight = new L.Point(docPixelLimits.x, docPixelLimits.y); bottomRight = bottomRight.multiplyBy(scale); if (extraSize) { - // extraSize is unscalled. + // extraSize is unscaled. bottomRight = bottomRight.add(extraSize); } bottomRight = this._map.unproject(bottomRight); @@ -408,7 +408,7 @@ L.GridLayer = L.Layer.extend({ this._docHeightTwips / this._tileHeightTwips); scrollPixelLimits = scrollPixelLimits.multiplyBy(this._tileSize); if (extraSize) { - // extraSize is unscalled. + // extraSize is unscaled. scrollPixelLimits = scrollPixelLimits.add(extraSize); } this._docPixelSize = {x: scrollPixelLimits.x, y: scrollPixelLimits.y}; @@ -439,7 +439,7 @@ L.GridLayer = L.Layer.extend({ } else if (this._map.options._origMaxBounds) { // if after zoomimg the document becomes larger than the viewing area - // we need to restore the inital bounds + // we need to restore the initial bounds this._map.setMaxBounds(this._map.options._origMaxBounds); this._map.options._origMaxBounds = null; } @@ -989,7 +989,7 @@ L.GridLayer = L.Layer.extend({ var current = coordsQueue[i]; // extend the bound vertically if possible (so far it was - // continous) + // continuous) if (!hasHole && (current.y === bound.y + 1)) { rowLocked = true; ++bound.y; diff --git a/loleaflet/src/layer/tile/TileLayer.TableOverlay.js b/loleaflet/src/layer/tile/TileLayer.TableOverlay.js index 79fde60eb..49b556aec 100644 --- a/loleaflet/src/layer/tile/TileLayer.TableOverlay.js +++ b/loleaflet/src/layer/tile/TileLayer.TableOverlay.js @@ -288,7 +288,7 @@ L.TileLayer.include({ } }, _onSelectRowColumnClick: function(e) { - // fake seelcting a column + // fake selecting a column this._postSelectTextEvent('start', e.target._start.x + 5, e.target._start.y + 5); this._postSelectTextEvent('end', e.target._end.x - 5, e.target._end.y - 5); }, diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index dab4a0790..df9910230 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -1648,7 +1648,7 @@ L.TileLayer = L.GridLayer.extend({ return; for (var i = 0; i < this._referencesAll.length; i++) { - // Avoid doubed marks, add only marks for current sheet + // Avoid doubled marks, add only marks for current sheet if ((this._references == null || !hasMark(this._references.getLayers(), this._referencesAll[i].mark)) && this._selectedPart === this._referencesAll[i].part) { this._references.addLayer(this._referencesAll[i].mark); @@ -2696,7 +2696,7 @@ L.TileLayer = L.GridLayer.extend({ return; } - // handle scroling + // handle scrolling // This is rather hacky, but it seems to be the only way to make the // marker follow the mouse cursor if the document is autoscrolled under diff --git a/loleaflet/src/layer/vector/Path.Drag.Transform.js b/loleaflet/src/layer/vector/Path.Drag.Transform.js index d8618a6be..0bb1d1114 100644 --- a/loleaflet/src/layer/vector/Path.Drag.Transform.js +++ b/loleaflet/src/layer/vector/Path.Drag.Transform.js @@ -28,7 +28,7 @@ L.Path.include({ }, /** - * Check if the feature was dragged, that'll supress the click event + * Check if the feature was dragged, that'll suppress the click event * on mouseup. That fixes popups for example * * @param {MouseEvent} e diff --git a/loleaflet/src/layer/vector/Path.Drag.js b/loleaflet/src/layer/vector/Path.Drag.js index c85a9ac32..4ca7ff847 100644 --- a/loleaflet/src/layer/vector/Path.Drag.js +++ b/loleaflet/src/layer/vector/Path.Drag.js @@ -128,7 +128,7 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends L.Path.Drag.prototype */ { } if (this._path._map.dragging.enabled()) { - // I guess it's required because mousdown gets simulated with a delay + // I guess it's required because mousedown gets simulated with a delay //this._path._map.dragging._draggable._onUp(evt); this._path._map.dragging.disable(); diff --git a/loleaflet/src/layer/vector/Path.Transform.Util.js b/loleaflet/src/layer/vector/Path.Transform.Util.js index 736d5a635..7e9530881 100644 --- a/loleaflet/src/layer/vector/Path.Transform.Util.js +++ b/loleaflet/src/layer/vector/Path.Transform.Util.js @@ -5,7 +5,7 @@ L.PathTransform = {}; /** - * Point on the line segment or its extention + * Point on the line segment or its extension * * @param {L.Point} start * @param {L.Point} final diff --git a/loleaflet/src/layer/vector/Path.Transform.js b/loleaflet/src/layer/vector/Path.Transform.js index 2beb7a3dd..270009346 100644 --- a/loleaflet/src/layer/vector/Path.Transform.js +++ b/loleaflet/src/layer/vector/Path.Transform.js @@ -533,7 +533,7 @@ L.Handler.PathTransform = L.Handler.extend({ /** - * Rotation marker and small connectin handle + * Rotation marker and small connecting handle */ _createRotationHandlers: function() { var map = this._map; diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js index b1dc23227..700369d29 100644 --- a/loleaflet/src/map/Clipboard.js +++ b/loleaflet/src/map/Clipboard.js @@ -250,7 +250,7 @@ L.Clipboard = L.Class.extend({ // Suck the data from one server to another asynchronously ... _dataTransferDownloadAndPasteAsync: function(src, dest, fallbackHtml) { var that = this; - // FIXME: add a timestamp in the links (?) ignroe old / un-responsive servers (?) + // FIXME: add a timestamp in the links (?) ignore old / un-responsive servers (?) that._doAsyncDownload( 'GET', src, null, function(response) { @@ -465,7 +465,7 @@ L.Clipboard = L.Class.extend({ } var text = this._getHtmlForClipboard(); -// this._stopHideDownload(); - this confuses the borwser ruins copy/cut on iOS +// this._stopHideDownload(); - this confuses the browser ruins copy/cut on iOS var plainText = this.stripHTML(text); if (ev.clipboardData) { // Standard @@ -496,7 +496,7 @@ L.Clipboard = L.Class.extend({ _beforeSelectImpl: function(operation) { if (L.Browser.isInternetExplorer && operation != 'paste') // We need populate our content into the div for - // the brower to copy. + // the browser to copy. this._dummyDiv.innerHTML = this._getHtmlForClipboard(); else // We need some spaces in there ... diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index fd6ae2397..bebb1af99 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -1521,7 +1521,7 @@ L.Map = L.Evented.extend({ e.preventDefault(); } - // workaround for drawing shapes, wihout this shapes cannot be shrunken + // workaround for drawing shapes, without this shapes cannot be shrunken if (target !== undefined && target._path !== undefined && type === 'mousemove') { target = undefined; } diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js index 95c2eb25e..6120a8d1a 100644 --- a/loleaflet/src/map/handler/Map.TouchGesture.js +++ b/loleaflet/src/map/handler/Map.TouchGesture.js @@ -289,7 +289,7 @@ L.Map.TouchGesture = L.Handler.extend({ // edit mode not entered, or toggled, keyboard toggles, etc.). // We only process the first tap and subsequent ones are handled // by the double-tap and triple-tap handlers below. - // Note: Hammer has requireFailure() which supressses this call + // Note: Hammer has requireFailure() which suppresses this call // when multi-taps are detected. This isn't working for us. if (e.tapCount > 1) return; diff --git a/loolstat b/loolstat index 2c0e3f2a3..d86e73fa1 100755 --- a/loolstat +++ b/loolstat @@ -72,8 +72,8 @@ THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{.*}' | $WC -l); # get the number of running client socket. LOOLWSD_CLIENT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{client_socket}' | $WC -l); -# get the number of running prision socket. -LOOLWSD_PRISIONER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{prision_socket}' | $WC -l); +# get the number of running prison socket. +LOOLWSD_PRISONER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{prison_socket}' | $WC -l); # get the number of processes swapped out. SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '(.*)' | $WC -l); @@ -85,6 +85,6 @@ printf " %-10s %d\n" "Running process:" "$PROCESS"; printf " %-10s %d\n" "Running threads:" "$THREADS"; printf " %-10s %d\n" "Process swapped out:" "$SWAPPEDOUT"; printf " %-10s %d\n" "Socket Client threads:" "$LOOLWSD_CLIENT"; -printf " %-10s %d\n" "Socket Prision threads:" "$LOOLWSD_PRISIONER"; +printf " %-10s %d\n" "Socket Prison threads:" "$LOOLWSD_PRISONER"; $TOP -bn 1 | $GREP -E 'loolwsd|COMMAND' diff --git a/net/Socket.hpp b/net/Socket.hpp index 218de2866..ed59edb23 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -574,7 +574,7 @@ public: std::thread::id us = std::this_thread::get_id(); if (_owner == us) return; // all well - LOG_DBG("Ununusual - SocketPoll used from a new thread"); + LOG_DBG("Unusual - SocketPoll used from a new thread"); _owner = us; for (const auto& it : _pollSockets) it->setThreadOwner(us); @@ -1116,7 +1116,7 @@ public: ssize_t len; do { - // Writing more than we can absorb in the kernel causes SSL wasteage. + // Writing more than we can absorb in the kernel causes SSL wastage. len = writeData(&_outBuffer[0], std::min((int)_outBuffer.size(), getSendBufferSize())); diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp index 58b21ecbd..973d6722e 100644 --- a/test/TileCacheTests.cpp +++ b/test/TileCacheTests.cpp @@ -1443,7 +1443,7 @@ void TileCacheTests::testTileBeingRenderedHandling() // For the first input wsd will send all invalidated tiles LOK_ASSERT_MESSAGE("Expected at least two tiles.", countMessages(socket, "tile:", testname, 500) > 1); - // For the later inputs wsd will send one tile, since other ones are indentical + // For the later inputs wsd will send one tile, since other ones are identical for(int i = 0; i < 5; ++i) { sendTextFrame(socket, "tileprocessed tile=0:0:0:3200:3200:0", testname); diff --git a/test/UnitHTTP.cpp b/test/UnitHTTP.cpp index 3fa10c6c0..f173638eb 100644 --- a/test/UnitHTTP.cpp +++ b/test/UnitHTTP.cpp @@ -193,7 +193,7 @@ public: return; } - // Sometimes we get the content with the first recieve. + // Sometimes we get the content with the first receive. if (strstr(buffer, "\357\273\277This is some text.\nAnd some more.\n")) { return; diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp index 9dc015596..80364378d 100644 --- a/wsd/Admin.hpp +++ b/wsd/Admin.hpp @@ -23,7 +23,7 @@ class Admin; class AdminSocketHandler : public WebSocketHandler { public: - /// Client connection to remote amdin socket + /// Client connection to remote admin socket AdminSocketHandler(Admin* adminManager); /// Connection from remote admin socket diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index cb4685544..d9fc339c9 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -2388,8 +2388,8 @@ void DocumentBroker::dumpState(std::ostream& os) os << "\n last saved: " << Util::getSteadyClockAsString(_lastSaveTime); os << "\n last save request: " << Util::getSteadyClockAsString(_lastSaveRequestTime); os << "\n last save response: " << Util::getSteadyClockAsString(_lastSaveResponseTime); - os << "\n last modifed: " << Util::getHttpTime(_documentLastModifiedTime); - os << "\n file last modifed: " << Util::getHttpTime(_lastFileModifiedTime); + os << "\n last modified: " << Util::getHttpTime(_documentLastModifiedTime); + os << "\n file last modified: " << Util::getHttpTime(_lastFileModifiedTime); if (_limitLifeSeconds) os << "\n life limit in seconds: " << _limitLifeSeconds; os << "\n idle time: " << getIdleTimeSecs(); diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 49bed8cbf..a5bc5c160 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -397,7 +397,7 @@ private: /// All session of this DocBroker by ID. SessionMap<ClientSession> _sessions; - /// If we set the user-requested inital (on load) settings to be forced. + /// If we set the user-requested initial (on load) settings to be forced. std::set<std::string> _isInitialStateSet; std::unique_ptr<StorageBase> _storage; diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 29d4b31cb..b996c9877 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -760,7 +760,7 @@ public: void wakeupHook() override; #if !MOBILEAPP - // Resets the forkit porcess object + // Resets the forkit process object void setForKitProcess(const std::weak_ptr<ForKitProcess>& forKitProc) { assertCorrectThread(); @@ -3004,7 +3004,7 @@ private: { LOG_ERR("Error while loading : " << exc.what()); } - // badness occured: + // badness occurred: std::ostringstream oss; oss << "HTTP/1.1 400\r\n" << "Date: " << Util::getHttpTimeNow() << "\r\n" diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp index bdac020fa..07561906e 100644 --- a/wsd/LOOLWSD.hpp +++ b/wsd/LOOLWSD.hpp @@ -358,7 +358,7 @@ public: static bool checkAndRestoreForKit(); /// Creates a new instance of Forkit. - /// Return true when successfull. + /// Return true when successful. static bool createForKit(); /// Sends a message to ForKit through PrisonerPoll. @@ -385,7 +385,7 @@ public: } /// Anonymize user names and IDs. - /// Will use the Obfuscated User ID if one is provied via WOPI. + /// Will use the Obfuscated User ID if one is provided via WOPI. static std::string anonymizeUsername(const std::string& username) { return FileUtil::anonymizeUsername(username); diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp index e880e5c23..94bfea41c 100644 --- a/wsd/SenderQueue.hpp +++ b/wsd/SenderQueue.hpp @@ -107,7 +107,7 @@ private: command == "invalidatecursor:" || command == "setpart:") { - // Remove previous identical enties of this command, + // Remove previous identical entries of this command, // if any, and use most recent (incoming). const auto& pos = std::find_if(_queue.begin(), _queue.end(), [&command](const queue_item_t& cur) diff --git a/wsd/TileCache.hpp b/wsd/TileCache.hpp index 38b2118a0..8c135057f 100644 --- a/wsd/TileCache.hpp +++ b/wsd/TileCache.hpp @@ -98,7 +98,7 @@ public: /// Create the TileBeingRendered object for the given tile indicating that the tile was sent to /// the kit for rendering. Note: subscribeToTileRendering calls this internally, so you don't need - /// to call this method if you need also to subcribe for the rendered tile. + /// to call this method if you need also to subscribe for the rendered tile. void registerTileBeingRendered(const TileDesc& tile); /// Cancels all tile requests by the given subscriber. diff --git a/wsd/protocol.txt b/wsd/protocol.txt index 649352454..8e8eaa847 100644 --- a/wsd/protocol.txt +++ b/wsd/protocol.txt @@ -1,6 +1,6 @@ All communication consists of messages that are one line of human-readable UTF-8 text (with no terminating newline), optionally -followed by a single newline and arbitrary (potentialy even binary) +followed by a single newline and arbitrary (potentially even binary) data. The WebSocket distinction between 'text' and 'binary' frames has no @@ -42,7 +42,7 @@ canceltiles tileprocessed tile=<tileid> Previously sent tile (server -> client) arrived and processed by the client. - Tileid has the next stucture : <selected part>:<tile x coord>:<tile y coord>:<tile width in twips>:<tile height in twips> + Tileid has the next structure : <selected part>:<tile x coord>:<tile y coord>:<tile width in twips>:<tile height in twips> downloadas name=<fileName> id=<id> format=<document format> options=<SkipImages, etc> @@ -256,7 +256,7 @@ asksignaturestatus signdocument - Sign the current document with the input cetificate and private key. + Sign the current document with the input certificate and private key. rendershapeselection mimetype=<mimeType> diff --git a/wsd/reference.md b/wsd/reference.md index a53fbbd3e..e8798debc 100644 --- a/wsd/reference.md +++ b/wsd/reference.md @@ -60,7 +60,7 @@ A string for the domain the host page sends/receives PostMessages from, we only Size of the file in bytes (64bit) ### TemplateSource -The ID of file (like the wopi/files/ID) can be a non-existing file. In that case, the file will be created from a template when the template (eg. an OTT file) is specifiend as "TemplateSource" in the CheckFileInfo response. +The ID of file (like the wopi/files/ID) can be a non-existing file. In that case, the file will be created from a template when the template (eg. an OTT file) is specified as "TemplateSource" in the CheckFileInfo response. The TemplateSource is supposed to be an URL like https://somewhere/accessible/file.ott that is accessible by the Online. @@ -70,7 +70,7 @@ For the actual saving of the content, normal PutFile mechanism will be used. A boolean flag, indicating whether the user has permission to edit and/or over-write the file. If not set PutFile will fail. ### UserCanNotWriteRelative -A boolean flag indiciating that the user cannot Save-As on this server, so PutFileRelative will fail. +A boolean flag indicating that the user cannot Save-As on this server, so PutFileRelative will fail. ### UserId A programmatic string identifier of the user. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits