diff --git a/sw/qa/extras/uiwriter/uiwriter10.cxx b/sw/qa/extras/uiwriter/uiwriter10.cxx index d1625dbed32a..9163ca89ca52 100644 --- a/sw/qa/extras/uiwriter/uiwriter10.cxx +++ b/sw/qa/extras/uiwriter/uiwriter10.cxx @@ -55,7 +55,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testRedlineTableRowDeletionWithExport) { // load a 1-row table, and delete the row with enabled change tracking: // now the row is not deleted silently, but keeps the deleted cell contents, - // and only accepting all of them will result the deletion of the table row. + // and only accepting all of them will result in the deletion of the table row. createSwDoc("tdf118311.fodt"); SwDoc* pDoc = getSwDoc(); @@ -239,8 +239,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf157662_AcceptInsertRedlineCutWithDe pEditShell->RejectRedline(6); CPPUNIT_ASSERT_EQUAL(static_cast(6), pEditShell->GetRedlineCount()); - // Accept insert that split into 4 parts, but separated to 2-2 parts, with another insert. - // It will accept only 2 parts, that is not separated. It leave the deletion. + // Accept insert that split into 4 parts, but separated into 2-2 parts, with another insert. + // It will accept only 2 parts that are not separated. It leaves the deletion. pEditShell->AcceptRedline(0); CPPUNIT_ASSERT_EQUAL(static_cast(5), pEditShell->GetRedlineCount()); // Accepting the delete will remove that redline. @@ -267,13 +267,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf157662_RejectInsertRedlineCutWithDe CPPUNIT_ASSERT(pEditShell); CPPUNIT_ASSERT_EQUAL(static_cast(9), pEditShell->GetRedlineCount()); - // Reject the insert that split into 3 parts. reject all 3 of them - // it even remove the deletion, that was on the 2. insert... + // Reject the insert that split into 3 parts: reject all 3 of them. + // It even removes the deletion that was on the second insert. pEditShell->RejectRedline(6); CPPUNIT_ASSERT_EQUAL(static_cast(6), pEditShell->GetRedlineCount()); - // Reject insert that split into 4 parts, but separated to 2-2 parts, with another insert. - // It will reject only 2 parts, that is not separated. It remove the deletion. + // Reject insert that split into 4 parts, but separated into 2-2 parts, with another insert. + // It will reject only 2 parts that are not separated. It removes the deletion. pEditShell->RejectRedline(0); CPPUNIT_ASSERT_EQUAL(static_cast(4), pEditShell->GetRedlineCount()); } @@ -304,8 +304,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf157663_RedlineMoveRecognition) true, false, true, false, true, false, false, false, false, false, false }; // 20. and 22. redline is a delete/insert redline with the same text "three". // they are not recognised as a move, because 22. redline is not a whole paragraph. - // Note: delete/insert redlines that are just a part of a paragraph decided to be part of - // a move, only if it is at least 6 character long and contain a space "" character. + // Note: delete/insert redlines that are just a part of a paragraph are decided to be part of + // a move, only if they are at least 6 characters long and contain a space character. for (SwRedlineTable::size_type i = 0; i < rTable.size(); i++) { CPPUNIT_ASSERT_EQUAL(vMovedRedlines[i], rTable[i]->GetMoved() > 0); diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index 92b4bb881769..5511cfc4a1f8 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -792,7 +792,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkText) lcl_selectCharacters(aPaM, 0, 3); pDoc->getIDocumentContentOperations().DeleteRange(aPaM); - // verify: bookmark is still exist + // verify: bookmark still exists IDocumentMarkAccess& rIDMA = *pDoc->getIDocumentMarkAccess(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); } @@ -870,7 +870,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNew) lcl_selectCharacters(aPaM, 0, 3); pDoc->getIDocumentContentOperations().DeleteRange(aPaM); - // verify: bookmark is still exist + // verify: bookmark still exists IDocumentMarkAccess& rIDMA = *pDoc->getIDocumentMarkAccess(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); } @@ -891,7 +891,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNew) // write "abc" xRange->setString(u"abc"_ustr); - // verify: bookmark is still exist + // verify: bookmark still exists IDocumentMarkAccess& rIDMA = *pDoc->getIDocumentMarkAccess(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); } @@ -956,7 +956,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNewAfterReload // write "abc" xRange->setString(u"abc"_ustr); - // verify: bookmark is still exist + // verify: bookmark still exists IDocumentMarkAccess& rIDMA = *pDoc->getIDocumentMarkAccess(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); } @@ -1616,7 +1616,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf151548_tabNavigation) Scheduler::ProcessEventsToIdle(); } - // Tab 4 more times, verifying beforehand that the checkbox had been toggle on, then toggles off + // Tab 4 more times, verifying beforehand that the checkbox had been toggled on, then toggles off // meaning that looping is working, and no other controls are reacting to the tab key. for (auto it = pMarkAccess->getFieldmarksBegin(); it != pMarkAccess->getFieldmarksEnd(); ++it) { @@ -2435,7 +2435,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf113877NoMerge) } // Related test to testTdf113877(): Inserting into empty document a new document with list. -// Insert position has NO its own paragraph style ("Standard" will be used). +// Insert position has no paragraph style of its own ("Standard" will be used). // // Resulting document should be the same for following tests: // - testTdf113877_default_style() diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx index ac6051b59b7b..cfec73beac52 100644 --- a/sw/qa/extras/uiwriter/uiwriter6.cxx +++ b/sw/qa/extras/uiwriter/uiwriter6.cxx @@ -632,7 +632,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf99689TableOfTables) // tdf#112448: Fix: take correct line height // -// When line metrics is not calculated we need to call CalcRealHeight() +// When line metrics are not calculated we need to call CalcRealHeight() // before usage of the Height() and GetRealHeight(). CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf112448) { @@ -688,7 +688,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf157937) dispatchCommand(mxComponent, u".uno:ChangeCaseRotateCase"_ustr, {}); dispatchCommand(mxComponent, u".uno:ChangeCaseRotateCase"_ustr, {}); - // This resulted freezing + // This resulted in freezing dispatchCommand(mxComponent, u".uno:ChangeCaseRotateCase"_ustr, {}); } @@ -2303,7 +2303,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf51223) CPPUNIT_ASSERT_EQUAL(2, getParagraphs()); } -// Unit test for fix inconsistent bookmark behavior around at-char/as-char anchored frames +// Unit test to fix inconsistent bookmark behavior around at-char/as-char anchored frames // // We have a placeholder character in the sw doc model for as-char anchored frames, // so it's possible to have a bookmark before/after the frame or a non-collapsed bookmark