diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 400d79f613b2..985a43547b52 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -220,7 +220,7 @@ CPPUNIT_TEST_FIXTURE(Test, testDrawImageEmbeddedNotBlocked) CPPUNIT_TEST_FIXTURE(Test, testEmptySvgFamilyName) { createSwDoc("empty-svg-family-name.odt"); - // .odt import did crash on the empty font list (which I think is valid according SVG spec) + // .odt import did crash on the empty font list (which I think is valid according to SVG spec) } CPPUNIT_TEST_FIXTURE(Test, testHideAllSections) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index b2f75d76466a..9e58e366888f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -103,7 +103,7 @@ CPPUNIT_TEST_FIXTURE(Test, testWrapPolygonCustomShape) xmlDocUniquePtr pXmlDocument = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pXmlDocument); // Expected coordinates are 0|10800, 8936|8936, 10800|0, 12664|8936, 21600|10800, 12664|12664, - // 10800|21600, 8936|12664, 0|10800. Assert forth point, which comes from equations. Allow some + // 10800|21600, 8936|12664, 0|10800. Assert fourth point, which comes from equations. Allow some // tolerance. sal_Int32 nXCoord = getXPath(pXmlDocument, "(//wp:lineTo)[3]", "x").toInt32(); // Without fix it would fail with expected 12664, actual 3 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport27.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport27.cxx index f9905e7782ec..0f95241d4078 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport27.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport27.cxx @@ -95,7 +95,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf163178_columnbreakInTable) CPPUNIT_TEST_FIXTURE(Test, testTdf171527_flyInFramePr) { - // given a with a framePr'd image anchoring a drawing shape + // given a document with a framePr'd image anchoring a drawing shape createSwDoc("tdf171527_flyInFramePr.doc"); save(TestFilter::DOCX); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 2c7cc9557c19..2c72c894483f 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -527,7 +527,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testFormulaNumberWithGroupSeparator) pWrtShell->Down(false); pField = pWrtShell->GetCurField(); CPPUNIT_ASSERT_EQUAL(u"5.000*10%"_ustr, pField->GetFormula()); - // the problem was that this was + // the problem was that this was 0 CPPUNIT_ASSERT_EQUAL(u"500"_ustr, pField->ExpandField(true, nullptr)); pWrtShell->Down(false); pField = pWrtShell->GetCurField(); diff --git a/sw/qa/extras/uiwriter/uiwriter11.cxx b/sw/qa/extras/uiwriter/uiwriter11.cxx index f67d2a620347..fc0a021fd89e 100644 --- a/sw/qa/extras/uiwriter/uiwriter11.cxx +++ b/sw/qa/extras/uiwriter/uiwriter11.cxx @@ -540,7 +540,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest11, testTdf163194) { // Test (1) that exporting comments in margin to PDF produces expected layout of the comments, // that have limited and reasonable width and position, inside the page bounds (and close to - // its right side), independent on the manually set comment sidebar width; and (2) that the + // its right side), independent of the manually set comment sidebar width; and (2) that the // export doesn't change the annotation sizes in the document. // Annotation size depends on DisplayWidthFactor. Set it to a fixed value for testing. diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 57aeaa10cab1..aa4792128f8b 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -293,7 +293,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf159026) // undo tracked table deletion - // This resulted crashing + // This resulted in crashing dispatchCommand(mxComponent, u".uno:Undo"_ustr, {}); } @@ -606,7 +606,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791) dispatchCommand(mxComponent, u".uno:PasteRowsBefore"_ustr, {}); pXmlDoc = parseLayoutDump(); - // repeating table header (and its thead/tbody indentation) doesn't effect row number + // repeating table header (and its thead/tbody indentation) doesn't affect row number assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 32); // there are two nested tables after the paste assertXPath(pXmlDoc, "/root/page[1]/body/tab/row/cell/tab", 4); @@ -1477,7 +1477,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf107893) pTxBxFrm = SwTextBoxHelper::getOtherTextBoxFormat(getShape(1)); //This was nullptr because of unsuccessful re-adding - CPPUNIT_ASSERT_MESSAGE("Textbox cannot be readd after Undo!", pTxBxFrm); + CPPUNIT_ASSERT_MESSAGE("Textbox cannot be re-added after Undo!", pTxBxFrm); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121031) @@ -1671,7 +1671,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf139566) uno::Reference xFrames = mxDesktop->getFrames(); sal_Int32 nFrames = xFrames->getCount(); - // Create a second window so the first window looses focus + // Create a second window so the first window loses focus dispatchCommand(mxComponent, u".uno:NewWindow"_ustr, {}); CPPUNIT_ASSERT_EQUAL(nFrames + 1, xFrames->getCount()); @@ -2480,7 +2480,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, AtPageTextBoxCrash) u"AnchorType"_ustr, uno::Any(text::TextContentAnchorType::TextContentAnchorType_AT_PAGE)); // The page anchored objects must not have content anchor - // unless this will lead to crash later, for example on + // otherwise this will lead to crash later, for example on // removing the paragraph where it is anchored to... CPPUNIT_ASSERT_EQUAL(RndStdIds::FLY_AT_PAGE, pTxBxFrm->GetAnchor().GetAnchorId()); CPPUNIT_ASSERT(!pTxBxFrm->GetAnchor().GetAnchorNode()); @@ -3159,7 +3159,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testCursorPositionAfterUndo) // select the word dispatchCommand(mxComponent, u".uno:SelectWord"_ustr, {}); - // check the word is select + // check the word is selected SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false); CPPUNIT_ASSERT_EQUAL(u"tincidunt"_ustr, pShellCursor->GetText()); diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx b/sw/qa/extras/uiwriter/uiwriter9.cxx index f99983dfb0ac..b66e4dd27476 100644 --- a/sw/qa/extras/uiwriter/uiwriter9.cxx +++ b/sw/qa/extras/uiwriter/uiwriter9.cxx @@ -836,7 +836,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf135083) auto xLastPara = getParagraph(3); CPPUNIT_ASSERT_EQUAL(u"dolor"_ustr, xLastPara->getString()); - // Without the fix in place, the last paragraph would loose its settings. ListId would be empty. + // Without the fix in place, the last paragraph would lose its settings. ListId would be empty. CPPUNIT_ASSERT(!getProperty(xLastPara, u"ListId"_ustr).isEmpty()); } @@ -1342,7 +1342,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf158375_ole_object_disable) // it shouldn't switch because the current configuration // (DisableActiveContent) prohibits OLE objects changing to states other - // then LOADED + // than LOADED auto xShape = getShape(1); uno::Reference xEmbedSupplier(xShape, uno::UNO_QUERY); auto xEmbeddedObj = xEmbedSupplier->getExtendedControlOverEmbeddedObject(); diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 0526314d921e..a38b0e3a9c24 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1636,8 +1636,8 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, pFrame = pTextNd->getLayoutFrame(GetLayout(), nullptr, &tmp); if (pFrame) { - //tdf#116397 now that we looking for the bounds of the field drop the SmartTag - //index within field setting so we don't the bounds of the char within the field + //tdf#116397 now that we are looking for the bounds of the field drop the SmartTag + //index within field setting so we don't get the bounds of the char within the field SwSpecialPos* pSpecialPos = aTmpState.m_pSpecialPos; aTmpState.m_pSpecialPos = nullptr; pFrame->GetCharRect( *pFieldRect, aPos, &aTmpState ); diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 1c5eaf1516da..3641f027b87d 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -674,7 +674,7 @@ bool SwPaM::HasReadonlySel(bool bFormView, bool const isReplace) const GetPoint(), &tmp); } - // Will be set if point are inside edit-in-readonly environment + // Will be set if point is inside edit-in-readonly environment const SwFrame* pPointEditInReadonlyFrame = nullptr; if ( pFrame != nullptr && ( pFrame->IsProtected() diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 9e816e37b78c..cb14706a4908 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -374,7 +374,7 @@ void DocumentLinksAdministrationManager::SetData( const OUString& rItem ) return nullptr; } -/// embedded all local links (Areas/Graphics) +/// embeds all local links (Areas/Graphics) bool DocumentLinksAdministrationManager::EmbedAllLinks() { bool bRet = false; diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 7c4eaa94a0c8..227e9c5911a9 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -80,7 +80,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat, " - anchor frame is a follow." ); bool bVert = false; bool bR2L = false; - // #i45952# - use anchor position of anchor frame, if it exist. + // #i45952# - use anchor position of anchor frame, if it exists. Point aAnchorPos; if ( pAnchorFrame ) { @@ -93,7 +93,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat, { // #i45952# aAnchorPos = _rSdrObj.GetAnchorPos(); - // If no anchor frame exist - e.g. because no layout exists - the + // If no anchor frame exists - e.g. because no layout exists - the // default layout direction is taken. const SvxFrameDirectionItem& rDirItem = _pFrameFormat->GetAttrSet().GetPool()->GetUserOrPoolDefaultItem( RES_FRAMEDIR ); @@ -166,7 +166,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat, _pFrameFormat->SetFormatAttr( SwFormatVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); // #i44334#, #i44681# - positioning attributes already set _pFrameFormat->PosAttrSet(); - // #i34750# - keep current object rectangle for drawing + // #i34750# - keep current object rectangle for drawing // objects. The object rectangle is used on events from the drawing layer // to adjust the positioning attributes - see . { @@ -249,7 +249,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) DelFrameFormat( pFormat ); // #i45952# - re-introduce position normalization of group member - // objects, because its anchor position is cleared, when they are + // objects, because their anchor position is cleared, when they are // grouped. Point aAnchorPos( pObj->GetAnchorPos() ); pObj->NbcSetAnchorPos( Point( 0, 0 ) ); @@ -509,7 +509,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView ) { SwDrawFrameFormat *pFormat = static_cast(pContact->GetFormat()); // before delete of selection is performed, marked - // -objects have to be replaced by its + // -objects have to be replaced by their // reference objects. Thus, assert, if a // -object is found in the mark list. if ( dynamic_cast( pObj) != nullptr ) @@ -695,7 +695,7 @@ namespace docfunc } else { - // contact object of drawing object doesn't exists. + // contact object of drawing object doesn't exist. // Thus, the drawing object isn't yet positioned. // Thus, it isn't known, if all drawing objects are on page. bAllDrawObjsOnPage = false; diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 41aaa2f6550f..d85a246902aa 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -72,8 +72,8 @@ using namespace ::com::sun::star; //JP 16.12.99: definition: -// from pos cPosEnDash to cPosEmDash all chars changed to em dashes, -// from pos cPosEmDash to cPosEnd all chars changed to em dashes +// from pos cnPosEnDash to cnPosEmDash all chars changed to en dashes, +// from pos cnPosEmDash to cPosEnd all chars changed to em dashes // all other chars are changed to the user configuration const sal_Unicode pBulletChar[6] = { '+', '*', '-', 0x2013, 0x2014, 0 }; @@ -133,7 +133,7 @@ class SwAutoFormat } static bool IsSpace( const sal_Unicode c ) - { return (' ' == c || '\t' == c || 0x0a == c|| 0x3000 == c /* Jap. space */); } + { return (' ' == c || '\t' == c || 0x0a == c || 0x3000 == c /* Jap. space */); } void SetColl( SwPoolFormatId nId, bool bHdLineOrText = false ); void GoNextPara(); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 8938252d4f78..2337aaa040da 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -118,7 +118,7 @@ void SwAlignGrfRect( SwRect *pGrfRect, const vcl::RenderContext &rOut ); /** * Paint border around a run of characters using frame painting code. * - * @param[in] rFont font object of actual text, which specify the border + * @param[in] rFont font object of actual text, which specifies the border * @param[in] rPaintArea rectangle area in which line portion takes place * @param[in] bVerticalLayout corresponding text frame verticality * @param[in] bVerticalLayoutLRBT corresponding text frame verticality (LRBT subset) diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 840005ecd707..f64d7e6077f8 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -72,7 +72,7 @@ namespace sw::mark enum class RestoreMode { Flys = 1, NonFlys = 2, All = 3 }; - /// Takes care of storing relevant attributes of an SwTextNode before split, then restore them on the new node. + /// Takes care of storing relevant attributes of an SwTextNode before split, then restoring them on the new node. class ContentIdxStore { public: diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 25bf3245c583..d51a4946581b 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -140,7 +140,7 @@ public: void JoinAndDelFollows(); // for DelFrames of the TableNodes! - // calls thr RegistFlys of the rows + // calls the RegistFlys of the rows void RegistFlys(); inline const SwTabFrame *GetFollow() const; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 46955d7b3606..d68489d70137 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -170,7 +170,7 @@ bool HasNumberingWhichNeedsLayoutUpdate(const SwTextNode& rTextNode); } // namespace sw /// Represents the visualization of a paragraph. Typical upper is an -/// SwBodyFrame. The first text portion of the first line is az SwParaPortion. +/// SwBodyFrame. The first text portion of the first line is an SwParaPortion. class SW_DLLPUBLIC SwTextFrame final : public SwContentFrame { friend class SwTextIter; @@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwTextFrame final : public SwContentFrame void ParagraphComposer( SwTextFormatter &rLine, SwTextFormatInfo &rInf, const SvxAdjustItem& rAdjust ); - // In order to safe stack space, we split this method: + // In order to save stack space, we split this method: // Format_ calls Format_ with parameters void FormatImpl( vcl::RenderContext* pRenderContext, SwParaPortion *pPara, ::std::vector & rIntersectingObjs); @@ -798,11 +798,11 @@ public: OUString GetCurWord(SwPosition const&) const; sal_uInt16 GetScalingOfSelectedText(TextFrameIndex nStt, TextFrameIndex nEnd); - /// This text frame may have a split fly frames anchored to it. Is any of them a frame that has + /// This text frame may have a split fly frame anchored to it. Is any of them a frame that has /// a follow, i.e. not the last in a master -> follow 1 -> ... -> last follow chain? SwFlyAtContentFrame* HasNonLastSplitFlyDrawObj() const; - /// This text frame has a follow and the text frame don't contain text. Additionally one split + /// This text frame has a follow and the text frame doesn't contain text. Additionally one split /// fly is anchored to the text frame. bool IsEmptyMasterWithSplitFly() const; diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 0ef3819fbbcb..efee0677e40e 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -233,7 +233,7 @@ static tools::Long lcl_Undersize( const SwFrame* pFrame ) { if( static_cast(pFrame)->IsUndersized() ) { - // Does this TextFrame would like to be a little bit bigger? + // Would this TextFrame like to be a little bit bigger? nRet = static_cast(pFrame)->GetParHeight() - aRectFnSet.GetHeight(pFrame->getFramePrintArea()); if( nRet < 0 ) diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx index 6d532433e452..a2f69e600cec 100644 --- a/sw/source/core/text/atrhndl.hxx +++ b/sw/source/core/text/atrhndl.hxx @@ -108,12 +108,12 @@ inline void SwAttrHandler::ResetFont( SwFont& rFnt ) const OSL_ENSURE(m_oFnt, "ResetFont without a font"); if (m_oFnt) rFnt = *m_oFnt; -}; +} inline const SwFont* SwAttrHandler::GetFont() const { return m_oFnt ? &*m_oFnt : nullptr; -}; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 388831e36a33..356e9222c39a 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -893,7 +893,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) } } -/// Takes the default font and calculated the ascent and height +/// Takes the default font and calculates the ascent and height void SwAttrHandler::GetDefaultAscentAndHeight( SwViewShell const * pShell, OutputDevice const & rOut, sal_uInt16& nAscent, sal_uInt16& nHeight ) const { diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index bad2a3175179..cb150b56b8d7 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -612,7 +612,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf, { // New: We should have a look into the last portion, if it was a // field portion. For this, we expand the text of the field portion - // into our string. If the line break position is inside of before + // into our string. If the line break position is inside or before // the field portion, we trigger an underflow. TextFrameIndex nOldIdx = rInf.GetIdx();