diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2017-11-13 00:20:20 +0100 |
---|---|---|
committer | Mark Page <aptitude@btconnect.com> | 2017-11-13 08:43:17 +0100 |
commit | d71bcc4dc5025ea24944454908098269cfd095a3 (patch) | |
tree | 4e0e21223c2b7fc157b840d2c717eb1dd1ba7942 /sw | |
parent | iOS, update to version 11.1 (diff) | |
download | core-d71bcc4dc5025ea24944454908098269cfd095a3.tar.gz core-d71bcc4dc5025ea24944454908098269cfd095a3.zip |
Fix typos
Change-Id: Ia544298334364ece3b3963a4adc00c5e01189b91
Reviewed-on: https://gerrit.libreoffice.org/44654
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Page <aptitude@btconnect.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/docary.hxx | 4 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 6 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/ww8export/ww8export2.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/doc/doclay.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/edfcol.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/fly.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/frmtool.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlctxt.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/select.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 2 |
17 files changed, 23 insertions, 23 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 932c31f327e8..7f0aeb772f69 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -370,11 +370,11 @@ public: vector_type::const_iterator end() const { return maVector.end(); } void Resort() { maVector.Resort(); } - // Notifies all LOK clients when redliens are added/modified/removed + // Notifies all LOK clients when redlines are added/modified/removed static void LOKRedlineNotification(RedlineNotification eType, SwRangeRedline* pRedline); }; -/// Table that holds 'extra' redlines, such as 'table row insert\delete', 'paragraph moves' etc... +/// Table that holds 'extra' redlines, such as 'table row insert/delete', 'paragraph moves' etc... class SwExtraRedlineTable { private: diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 7c8d3be8acda..5498eb4f1a02 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -1147,7 +1147,7 @@ DECLARE_OOXMLEXPORT_TEST( testTableCrossReference, "table_cross_reference.odt" ) if (!mbExported) return; - // Check whether we have all the neccessary bookmarks exported and imported back + // Check whether we have all the necessary bookmarks exported and imported back uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4), xBookmarksByIdx->getCount()); @@ -1306,7 +1306,7 @@ DECLARE_OOXMLEXPORT_TEST( testTableCrossReferenceCustomFormat, "table_cross_refe if (!mbExported) return; - // Check whether we have all the neccessary bookmarks exported and imported back + // Check whether we have all the necessary bookmarks exported and imported back uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(16), xBookmarksByIdx->getCount()); @@ -1422,7 +1422,7 @@ DECLARE_OOXMLEXPORT_TEST( testObjectCrossReference, "object_cross_reference.odt" if (!mbExported) return; - // Check whether we have all the neccessary bookmarks exported and imported back + // Check whether we have all the necessary bookmarks exported and imported back uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(15), xBookmarksByIdx->getCount()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index d4ef02c10cb5..fc98eb98243d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -480,7 +480,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78882, "fdo78882.docx") // Ensure that Section Break is getting written inside second paragraph assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[2]/w:pPr[1]/w:sectPr[1]",1); - // Ensure that no dummy paragarph gets created inside second paragraph for Section Break + // Ensure that no dummy paragraph gets created inside second paragraph for Section Break assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[2]/w:p[1]/w:pPr[1]/w:sectPr[1]",0); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 41cd6ac8b676..4240f7530f7c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1139,7 +1139,7 @@ DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") // check rotation angle assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); // check the first few coordinates of the polygon -#ifndef MACOSX /* Retina-related rounding rountrip error +#ifndef MACOSX /* Retina-related rounding roundtrip error * hard to smooth out due to the use of string compare * instead of number */ #if !defined(_WIN32) diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index 06005998f5f4..cc064dcde293 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -330,7 +330,7 @@ DECLARE_OOXMLEXPORT_TEST( testTableCrossReference, "table_cross_reference.odt" ) if (!mbExported) return; - // Check whether we have all the neccessary bookmarks exported and imported back + // Check whether we have all the necessary bookmarks exported and imported back uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4), xBookmarksByIdx->getCount()); @@ -488,7 +488,7 @@ DECLARE_OOXMLEXPORT_TEST( testTableCrossReferenceCustomFormat, "table_cross_refe if (!mbExported) return; - // Check whether we have all the neccessary bookmarks exported and imported back + // Check whether we have all the necessary bookmarks exported and imported back uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(16), xBookmarksByIdx->getCount()); @@ -604,7 +604,7 @@ DECLARE_OOXMLEXPORT_TEST( testObjectCrossReference, "object_cross_reference.odt" if (!mbExported) return; - // Check whether we have all the neccessary bookmarks exported and imported back + // Check whether we have all the necessary bookmarks exported and imported back uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(15), xBookmarksByIdx->getCount()); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 574c30c9d76d..641bfb282c0e 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -813,7 +813,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, // The old one should not have a flow and it should be adjusted to above and // middle. - // Also, the width should be 100% and it should also adjust the hight, if changed. + // Also, the width should be 100% and it should also adjust the height, if changed. pNewSet->ClearItem(); pNewSet->Put( SwFormatSurround( css::text::WrapTextMode_NONE ) ); diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 3ccc7616877b..37c8f1f0d7e7 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -2131,7 +2131,7 @@ void SwEditShell::FillByEx(SwTextFormatColl* pColl) const SfxItemSet* pSet = pCnt->GetpSwAttrSet(); if( pSet ) { - // JP 05.10.98: Special treatment if one of the attribues Break/PageDesc/NumRule(auto) is + // JP 05.10.98: Special treatment if one of the attributes Break/PageDesc/NumRule(auto) is // in the ItemSet. Otherwise there will be too much or wrong processing (NumRules!) // Bug 57568 diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 66cf55754c6c..a3c8890df118 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1600,7 +1600,7 @@ void CalcContent( SwLayoutFrame *pLay, bool bNoColl ) } // Stay in the pLay // Except for SectionFrames with Follow: the first ContentFrame of the Follow - // will be formatted, so that it get's a chance to load in the pLay. + // will be formatted, so that it gets a chance to load in the pLay. // As long as these Frames are loading in pLay, we continue } while ( pFrame && ( pLay->IsAnLower( pFrame ) || diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 1c536f45aacd..7144ee460dcd 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -466,7 +466,7 @@ SwLayNotify::~SwLayNotify() //Proportional adoption of the internal. //1. If the formatted is no Fly //2. If he contains no columns - //3. If the Fly has a fixed hight and the columns + //3. If the Fly has a fixed height and the columns // are next to be. // Hoehe danebenliegen. //4. Never at SectionFrames. diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index e154f7bd2140..d8be7da3f44d 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -996,7 +996,7 @@ void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement { if(!pBase->IsUserDefined()) throw lang::IllegalArgumentException(); - //if theres an object available to this style then it must be invalidated + //if there's an object available to this style then it must be invalidated uno::Reference<style::XStyle> xStyle = FindStyle(pBase->GetName()); if(xStyle.is()) { diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 76144ff6cb5c..f93e5ffee1d0 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -53,7 +53,7 @@ class HTMLAttrContext_SaveDoc size_t nContextStMin; // Stack lower bound for the environment // if stack needs to be protected size_t nContextStAttrMin; // Stack lower bound for the environment - // if the attribues shouldn't be preserved + // if the attributes shouldn't be preserved bool bStripTrailingPara : 1; bool bKeepNumRules : 1; bool bFixHeaderDist : 1; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 07801186d85a..7a6d70b612d1 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2271,7 +2271,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) // If we find a hint that starts before the current end position, // we have to set it. If we find a hint that start behind or at // that position, we have to take the hint value into account. - // If it is equal to the style, or in fact the paragarph value + // If it is equal to the style, or in fact the paragraph value // for that hint, the hint is removed. Otherwise its end position // is remembered. sal_Int32 aEndPos[15] = diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 570057a34b3f..b1c1d7a71315 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2671,7 +2671,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) /* If a given para is using the SvxFrameDirection::Environment direction we - cannot export that, if it's ltr then that's ok as thats word's + cannot export that, if it's ltr then that's ok as that is word's default. Otherwise we must add a RTL attribute to our export list */ const SvxFrameDirectionItem* pItem = static_cast<const SvxFrameDirectionItem*>( diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 51f9a7588cf0..cf6f5555b6fc 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1359,7 +1359,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) // 2.2.2 read all LFOLVL (and LVL) for the new NumRule - WW8aISet aItemSet; // Character attribues from GrpprlChpx + WW8aISet aItemSet; // Character attributes from GrpprlChpx WW8aCFormat aCharFormat; // Character Style Pointer memset(&aCharFormat, 0, sizeof( aCharFormat )); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index b33d19fa8a55..2d9877396a51 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2394,7 +2394,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // This happens only for percentage values for the table itself. // In this case, the columns get the correct width even if - // the sum of the relative withs is smaller than the available + // the sum of the relative widths is smaller than the available // width in TWIP. Therefore, we can use the relative width. m_nWidth = nRelWidth > USHRT_MAX ? USHRT_MAX : nRelWidth; } diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 0d1f1be27d15..0695185d2fa2 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -423,7 +423,7 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, bool ) // Then destroy the actual an go to prev, this will be expand if( !HasMark() && GoPrevCursor() ) { - bool bHasMark = HasMark(); // thats wrong! + bool bHasMark = HasMark(); // that's wrong! GoNextCursor(); if( bHasMark ) { @@ -485,7 +485,7 @@ long SwWrtShell::ExtSelLn(const Point *pPt, bool ) // Then destroy the actual an go to prev, this will be expand if( !HasMark() && GoPrevCursor() ) { - bool bHasMark = HasMark(); // thats wrong! + bool bHasMark = HasMark(); // that's wrong! GoNextCursor(); if( bHasMark ) { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index ac5debe9ec49..d401687ec5a3 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -315,7 +315,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter, aGrfSize.Width() = aBound.Width(); aGrfSize.Height() = BigInt(aBound.Width()) * aTempHeight / aTempWidth; } - // Fit hight if necessary, scale down the width proportional thereafter. + // Fit height if necessary, scale down the width proportional thereafter. if( aGrfSize.Height() > aBound.Height() ) { aGrfSize.Height() = aBound.Height(); |