[Libreoffice-commits] core.git: compilerplugins/clang sw/qa sw/source

[Andrea Gelmini]

 compilerplugins/clang/cstylecast.cxx       |    2 +-
 compilerplugins/clang/unnecessaryparen.cxx |    4 ++--
 sw/qa/extras/uiwriter/uiwriter.cxx         |    2 +-
 sw/source/uibase/wrtsh/delete.cxx          |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0183c7c3b86be4be9c5fd6eec09785bd99c0a0b4
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Mon Jan 15 09:13:49 2018 +0100

    Fix typos
    
    Change-Id: I46873c8bea3bbfeebb7dee50918d3978408fcf63
    Reviewed-on: https://gerrit.libreoffice.org/47842
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/compilerplugins/clang/cstylecast.cxx b/compilerplugins/clang/cstylecast.cxx
index ba89c1aa02b5..228e3878e5eb 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -381,7 +381,7 @@ bool CStyleCast::rewriteArithmeticCast(CStyleCastExpr const * expr, char const *
     }
     // Two or four ranges to replace:
     // First is the CStyleCast's LParen, plus following whitespace, replaced with either "" or
-    // "static_cast<".  (TOOD: insert space before "static_cast<" when converting "else(int)...".)
+    // "static_cast<".  (TODO: insert space before "static_cast<" when converting "else(int)...".)
     // Second is the CStyleCast's RParen, plus preceding and following whitespace, replaced with
     // either "" or ">".
     // If the sub expr is not a ParenExpr, third is the sub expr's begin, inserting "(", and fourth
diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx
index d4ebd6ed0b14..8e038319fda8 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -489,12 +489,12 @@ bool badCombinationChar(char c) {
 }
 
 bool UnnecessaryParen::badCombination(SourceLocation loc, int prevOffset, int nextOffset) {
-    //TODO: check for start/end of file; take backslash-newline line concatentation into account
+    //TODO: check for start/end of file; take backslash-newline line concatenation into account
     auto const c1
         = compiler.getSourceManager().getCharacterData(loc.getLocWithOffset(prevOffset))[0];
     auto const c2
         = compiler.getSourceManager().getCharacterData(loc.getLocWithOffset(nextOffset))[0];
-    // An approximation of avoiding whatever combinations that would cause two ajacent tokens to be
+    // An approximation of avoiding whatever combinations that would cause two adjacent tokens to be
     // lexed differently, using, for now, letters (TODO: non-ASCII ones) and digits and '_'; '+' and
     // '-' (to avoid ++, etc.); '\'' and '"' (to avoid u'x' or "foo"bar, etc.):
     return badCombinationChar(c1) && badCombinationChar(c2);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 1e8d7431bc52..18bbf80acd32 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5730,7 +5730,7 @@ void SwUiWriterTest::testTdf113481()
     SwDoc* pDoc = createDoc("tdf113481-IVS.odt");
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
-    // One backspace should completely remove the CJK ideograph varation sequence
+    // One backspace should completely remove the CJK ideograph variation sequence
     pWrtShell->EndPara();
     // Before: U+8FBA U+E0102. After: empty
     pWrtShell->DelLeft();
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index 2f0be3984c85..4e0709342792 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -50,7 +50,7 @@ inline bool isUnicodeVariationSequenceSelector( sal_uInt32 nCode )
         || ( nCode >= 0xE0100 && nCode <= 0xE01EF );// Variation Selectors Supplement block
 }
 
-// Return if the chracter might be a base character of a CJK ideographic varaiation sequence
+// Return if the character might be a base character of a CJK ideographic variation sequence
 inline bool isCJKIVSCharacters( sal_uInt32 nCode )
 {
     return ( nCode >= 0x4E00 && nCode <= 0x9FFF )       // CJK Unified Ideographs