[Libreoffice-commits] core.git: compilerplugins/clang sw/qa sw/source
compilerplugins/clang/test/cppunitassertequals.cxx |2 +- sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +- sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +- sw/source/core/doc/number.cxx |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 7685dff381f538bf011a56da4a0493228b84614a Author: Andrea Gelmini AuthorDate: Tue Apr 28 17:19:13 2020 +0200 Commit: Andrea Gelmini CommitDate: Thu Apr 30 10:31:29 2020 +0200 Fix typos Change-Id: I8d0e10b08393b7752d55298e0e1ba64e5fd6c422 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93083 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx b/compilerplugins/clang/test/cppunitassertequals.cxx index d0825000be07..d42007c99d66 100644 --- a/compilerplugins/clang/test/cppunitassertequals.cxx +++ b/compilerplugins/clang/test/cppunitassertequals.cxx @@ -53,7 +53,7 @@ void test( CPPUNIT_ASSERT(t.operator ==(t)); // `P == nullptr` for P of pointer type is awkward to write with CPPUNIT_ASSERT_EQUAL, and the -// actual pointer values that would be printed if CPPUNIT_ASSERT_EQUAL failed would likey not be +// actual pointer values that would be printed if CPPUNIT_ASSERT_EQUAL failed would likely not be // very meaningful, so let it use CPPUNIT_ASSERT (but stick to CPPUNIT_ASSERT_EQUAL for // consistency in the unlikely case that P is of type std::nullptr_t): CPPUNIT_ASSERT(p == nullptr); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 0b142d51141a..65036bbbc3bc 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -765,7 +765,7 @@ DECLARE_OOXMLEXPORT_TEST(testNumOverrideLvltext, "num-override-lvltext.docx") { uno::Reference xRules = getProperty< uno::Reference >(getStyles("NumberingStyles")->getByName("WWNum1"), "NumberingRules"); // This was 1, i.e. the numbering on the second level was "1", not "1.1". -// Check the praragraph properties, not the list ones, since they can differ due to overrides +// Check the paragraph properties, not the list ones, since they can differ due to overrides uno::Reference xPara(getParagraph(1), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast(1), getProperty(xPara, "NumberingLevel")); CPPUNIT_ASSERT_EQUAL(OUString("1.1"), getProperty(xPara, "ListLabelString")); diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 396f2a6e1513..773b5c457a73 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1553,7 +1553,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108995, "xml_space.docx") DECLARE_OOXMLIMPORT_TEST(testGroupShapeTextHighlight, "tdf131841_HighlightColorGroupedShape.docx") { -// tdf#131841 Highligh color of text in grouped shapes was not imported. +// tdf#131841 Highlight color of text in grouped shapes was not imported. // These are the possible highlight colors in MSO Word. Check that we import them properly. const std::vector xColors { diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index d26c48fe579d..cfa140a58817 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -648,7 +648,7 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto if (!sLevelFormat.isEmpty()) { // In this case we are ignoring GetIncludeUpperLevels: we put all -// level nubers requested by level format +// level numbers requested by level format for (SwNumberTree::tNumberVector::size_type i=0; i <= nLevel; ++i) { OUString sReplacement; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sw/qa sw/source
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 GelminiDate: Mon Jan 15 09:13:49 2018 +0100 Fix typos Change-Id: I46873c8bea3bbfeebb7dee50918d3978408fcf63 Reviewed-on: https://gerrit.libreoffice.org/47842 Reviewed-by: Julien Nabet Tested-by: Julien Nabet 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 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits