[Libreoffice-commits] core.git: compilerplugins/clang framework/source icon-themes/colibre sw/source

[Libreoffice Gerrit user]

 compilerplugins/clang/vclwidgets.cxx |    2 +-
 framework/source/loadenv/loadenv.cxx |    4 ++--
 icon-themes/colibre/links.txt        |    2 +-
 sw/source/filter/html/swhtml.cxx     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ad1fb1c3dfb04e956d8793a320714c1ae1ba5941
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Wed Jul 4 13:43:33 2018 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu Jul 19 14:01:01 2018 +0200

    Fix typos
    
    Change-Id: I7d12fe95d1c65a431325273c6e95943166e2ec58
    Reviewed-on: https://gerrit.libreoffice.org/56941
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx
index 84d7ffea6bb2..b20963510181 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -392,7 +392,7 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) {
         return true;
     }
     // std::pair seems to show up in whacky ways in clang's AST. Sometimes it's a class, sometimes it's a typedef, and sometimes
-    // its an ElaboratedType (whatever that is)
+    // it's an ElaboratedType (whatever that is)
     if (s.find("pair") != std::string::npos) {
         return true;
     }
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 6ae60ebeadc5..26f51f775049 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1394,8 +1394,8 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::
     css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY);
 
     // ? no lock interface ?
-    // Might its an external written frame implementation :-(
-    // Allowing using of it ... but it can fail if it's not synchronized with our processes !
+    // Maybe it's an external written frame implementation :-(
+    // Allowing using of it... but it can fail if it's not synchronized with our processes!
     if (!xLock.is())
         return false;
 
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index a30f839e4b6b..aa581b5c9f17 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -855,7 +855,7 @@ cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png
 cmd/lc_setobjecttobackground.png cmd/lc_sendtoback.png
 cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png
 
-# Cacl
+# Calc
 cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png
 cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
 cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 508bbc1a4671..e6368cf07c40 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3992,7 +3992,7 @@ void SwHTMLParser::EndPara( bool bReal )
             AddParSpace();
     }
 
-    // If a DD or DT was open, its an implied definition list,
+    // If a DD or DT was open, it's an implied definition list,
     // which must be closed now.
     if( (m_nOpenParaToken == HtmlTokenId::DT_ON || m_nOpenParaToken == HtmlTokenId::DD_ON) &&
         m_nDefListDeep)