sw/qa/extras/ww8import/ww8import.cxx | 2 +- sw/source/core/access/acccontext.cxx | 2 +- sw/source/core/access/accframe.cxx | 2 +- sw/source/core/access/accportions.cxx | 2 +- sw/source/core/access/acctable.cxx | 2 +- sw/source/core/crsr/swcrsr.cxx | 2 +- sw/source/core/doc/DocumentContentOperationsManager.cxx | 4 ++-- sw/source/core/doc/DocumentFieldsManager.cxx | 2 +- sw/source/core/doc/DocumentLayoutManager.cxx | 2 +- sw/source/core/doc/docedt.cxx | 2 +- sw/source/core/doc/doclay.cxx | 2 +- sw/source/core/docnode/ndtbl.cxx | 2 +- sw/source/core/draw/dflyobj.cxx | 4 ++-- sw/source/core/edit/autofmt.cxx | 6 +++--- sw/source/core/fields/reffld.cxx | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-)
New commits: commit db494c6b34fa14d5f444f39b52a7cdad90e7f21a Author: Andrea Gelmini <[email protected]> Date: Thu Oct 1 18:28:12 2015 +0200 Fix typos Change-Id: I9bae7b6fd8d66b4877fc96d93fc8f57d17987002 Reviewed-on: https://gerrit.libreoffice.org/18984 Tested-by: Jenkins <[email protected]> Reviewed-by: Samuel Mehrbrodt <[email protected]> diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 87fde37..600ca41 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -174,7 +174,7 @@ xray ThisComponent.DrawPage.getByIndex(0).BoundRect DECLARE_WW8IMPORT_TEST(testN757905, "n757905.doc") { // The problem was that the paragraph had only a single fly - // (as-character-anchored), and the height of that was smallar than the + // (as-character-anchored), and the height of that was smaller than the // paragraph height. When in Word-compat mode, we should take the max of // the two, not just the height of the fly. diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index a99a642..9bc92ad 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -339,7 +339,7 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea ) // all children that are existing only if they are visible. They // are not disposed by the recursive Dispose call that follows later on, // because this call will only dispose children that are in the - // new vis area. The children we want to dispode however are in the + // new vis area. The children we want to dispose however are in the // old vis area all. ChildrenScrolled( GetFrm(), rOldVisArea ); diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 6582cca..7ea9134 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -248,7 +248,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, else { // The unsorted list is sorted enough, because it returns lower - // frames in the correct order. Morover, we can iterate forward, + // frames in the correct order. Moreover, we can iterate forward, // because the lowers don't overlap! const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap ); SwAccessibleChildSList::const_iterator aIter( aVisList.begin() ); diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index c0a6073..e100e16 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -598,7 +598,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos( // skip backwards over zero-length portions, since GetCharRect() // counts all model-zero-length portions as belonging to the - // previus portion + // previous portion size_t nCorePortionNo = nPortionNo; while( nModelPos == nModelEndPos ) { diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 5e04f50..8eacffb 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -206,7 +206,7 @@ void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrm *pFrm ) else if( pLower->IsCellFrm() && rLower.IsAccessible( mbIsInPagePreview ) ) { - //Added by yanjun. Can't find the "GetRowHeaderFlag" function(Need vefiry). + //Added by yanjun. Can't find the "GetRowHeaderFlag" function (need verify). //if(static_cast<SwCellFrm*>(pLower)->GetRowHeaderFlag()) // maColumns.insert( pLower->Frm().Left() - maTabFrmPos.X() ); } diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index f9630c1..98a6237 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -558,7 +558,7 @@ bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr ) if (m_pSavePos->nNode == GetPoint()->nNode.GetIndex()) return false; - // Check for convered cell: + // Check for covered cell: bool bInCoveredCell = false; const SwStartNode* pTmpSttNode = pCNd->FindTableBoxStartNode(); OSL_ENSURE( pTmpSttNode, "In table, therefore I expect to get a SwTableBoxStartNode" ); diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index db11a23..ba8ea11 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -3244,7 +3244,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( //frames at the last source node are not always copied: //- if the node is empty and is the last node of the document or a table cell // or a text frame then they have to be copied - //- if the content index in this node is > 0 then paragph and frame bound objects are copied + //- if the content index in this node is > 0 then paragraph and frame bound objects are copied //- to-character bound objects are copied if their index is <= nEndContentIndex bool bAdd = false; if( pAPos->nNode < rRg.aEnd ) @@ -4100,7 +4100,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, // Catch when there's no copy to do. if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) || - //JP 29.6.2001: 88963 - dont copy if inspos is in region of start to end + //JP 29.6.2001: 88963 - don't copy if inspos is in region of start to end //JP 15.11.2001: don't test inclusive the end, ever exclusive ( pDoc == &m_rDoc && *pStt <= rPos && rPos < *pEnd )) { diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 44b16d3..aefb359 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -301,7 +301,7 @@ void DocumentFieldsManager::RemoveFieldType(size_t nField) { SwFieldType* pTmp = (*mpFieldTypes)[nField]; - // JP 29.07.96: Optionally prepare FieldLst for Calculator + // JP 29.07.96: Optionally prepare FieldList for Calculator sal_uInt16 nWhich = pTmp->Which(); switch( nWhich ) { diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 020672e..04638b8 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -311,7 +311,7 @@ void DocumentLayoutManager::DelLayoutFormat( SwFrameFormat *pFormat ) RES_TXTATR_FLYCNT )); if ( pAttr && (pAttr->GetFlyCnt().GetFrameFormat() == pFormat) ) { - // dont delete, set pointer to 0 + // don't delete, set pointer to 0 const_cast<SwFormatFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFormat(); SwIndex aIdx( pPos->nContent ); pTextNd->EraseText( aIdx, 1 ); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 65934d7..c492c2a 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -353,7 +353,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) // (see sw_GetJoinFlags) { // If PageBreaks are deleted/set, it must not be added to the Undo history! - // Also, deleting the Node is not added to the Undo histroy! + // Also, deleting the Node is not added to the Undo history! ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); /* PageBreaks, PageDesc, ColumnBreaks */ diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 93a8628..9511b50 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1509,7 +1509,7 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const // That can also be a Fly in a Fly in the Header. // Is also used by sw3io, to determine if a Redline object is // in the Header or Footer. - // Because Redlines are also attached to Start and EndNoden, + // Because Redlines are also attached to Start and EndNode, // the Index must not necessarily be from a ContentNode. SwNode* pNd = &rIdx.GetNode(); const SwNode* pFlyNd = pNd->FindFlyStartNode(); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 3911d84..51e3fe1 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2384,7 +2384,7 @@ void SwTableNode::MakeFrms(const SwNodeIndex & rIdx ) SwFrm *pNew = pNode->MakeFrm( pFrm ); // Will the Node receive Frames before or after? if ( bBefore ) - // The new one preceds me + // The new one precedes me pNew->Paste( pFrm->GetUpper(), pFrm ); else // The new one succeeds me diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index f44ee9a..1f97a6d 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -196,7 +196,7 @@ namespace drawinglayer if(!getOuterRange().isEmpty()) { // currently this SW object has no primitive representation. As long as this is the case, - // create invisible geometry to allow corfect HitTest and BoundRect calculations for the + // create invisible geometry to allow correct HitTest and BoundRect calculations for the // object. Use a filled primitive to get 'inside' as default object hit. The special cases from // the old SwVirtFlyDrawObj::CheckHit implementation are handled now in SwDrawView::PickObj; // this removed the 'hack' to get a view from inside model data or to react on null-tolerance @@ -449,7 +449,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject( SwViewShell* pShell = pFlyFrm->getRootFrm()->GetCurrShell(); // Only paint when we have a current shell and a DrawingLayer paint is in progress. - // This avcoids evtl. problems with renderers which do processing stuff, + // This avoids evtl. problems with renderers which do processing stuff, // but no paints. IsPaintInProgress() depends on SW repaint, so, as long // as SW paints self and calls DrawLayer() for Heaven and Hell, this will // be correct diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 76bc11e..85620ba 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 endashes, -// from pos cPosEmDash to cPosEnd all chars changed to emdashes +// from pos cPosEnDash to cPosEmDash all chars changed to em dashes, +// from pos cPosEmDash 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 }; @@ -178,7 +178,7 @@ class SwAutoFormat sal_uInt16 GetDigitLevel( const SwTextNode& rTextNd, sal_Int32& rPos, OUString* pPrefix = 0, OUString* pPostfix = 0, OUString* pNumTypes = 0 ) const; - /// get the FORMATED TextFrame + /// get the FORMATTED TextFrame SwTextFrm* GetFrm( const SwTextNode& rTextNd ) const; void BuildIndent(); diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index b034da4..f403d4a 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -1075,7 +1075,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, } /// 1. if _both_ SetExp + GetExp / Footnote + GetExp field are copied, -/// enusure that both get a new unused matching number +/// ensure that both get a new unused matching number /// 2. if only SetExp / Footnote is copied, it gets a new unused number /// 3. if only GetExp field is copied, for the case of copy from / paste to /// same document it's desirable to keep the same number; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
