diff options
Diffstat (limited to 'sw')
123 files changed, 233 insertions, 233 deletions
diff --git a/sw/inc/IInterface.hxx b/sw/inc/IInterface.hxx index 780dfae21861..6b3bf52aed3e 100644 --- a/sw/inc/IInterface.hxx +++ b/sw/inc/IInterface.hxx @@ -32,7 +32,7 @@ { public: - /** Aquire a reference to an instance. A caller shall release + /** Acquire a reference to an instance. A caller shall release the instance by calling 'release' when it is no longer needed. 'acquire' and 'release' calls need to be balanced. @@ -42,7 +42,7 @@ virtual sal_Int32 acquire() = 0; /** Releases a reference to an instance. A caller has to call - 'release' when a before aquired reference to an instance + 'release' when a before acquired reference to an instance is no longer needed. 'acquire' and 'release' calls need to be balanced. diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 61aa457dbe0c..2f81cf42caf1 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -457,7 +457,7 @@ protected: mutable SwNumberTree::tSwNumTreeNumber mnNumber; // --> OD 2008-11-26 #158694# - // boolean indicating, that a node of a not counted parent node is continueing + // boolean indicating, that a node of a not counted parent node is continuing // the numbering of parent's previous node sub tree. // Example: // 1. kshdkjfs @@ -508,7 +508,7 @@ protected: /** Invalidates a child. - Calls SetLastValid for the preceeding sibling of the child and + Calls SetLastValid for the preceding sibling of the child and notifies all invalid children. @param pChild the child to invalidate @@ -544,7 +544,7 @@ protected: @param aItLastValid iterator pointing to the new last valid child @param bValidating - true always set the last valid node to aItLastValid - - false only set if aItLastValid is preceeding + - false only set if aItLastValid is preceding the current last valid node */ void SetLastValid(tSwNumberTreeChildren::const_iterator aItLastValid, diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index be5911f78972..9f468d8339d0 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -128,7 +128,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, //mpSelectedFrmMap contains the old selected objects. SwAccessibleContextMap_Impl *mpSeletedFrmMap; - //IvalidateShapeInParaSelection() method is reponsible for the updating the selected states of the objects. + //IvalidateShapeInParaSelection() method is responsible for the updating the selected states of the objects. void InvalidateShapeInParaSelection(); void _InvalidateRelationSet( const SwFrm* pFrm, sal_Bool bFrom ); diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 12f77b52ef83..a64277a56846 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode PolyPolygon *pContour; // Polygon fuer Konturumlauf sal_Bool bAutomaticContour : 1; // automatic contour polygon, not manipulated sal_Bool bContourMapModeValid : 1; // contour map mode is not the graphics's - // prefered map mode, but either + // preferred map mode, but either // MM100 or or pixel sal_Bool bPixelContour : 1; // contour map mode is invalid and pixel. diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index 434d4fec66f3..39652bd79d36 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -481,7 +481,7 @@ public: @param _orNewStartPos output parameter - new start position in document preview - @return boolean - indicating, that move was sucessful. + @return boolean - indicating, that move was successful. */ bool CalcStartValuesForSelectedPageMove( const sal_Int16 _nHoriMove, const sal_Int16 _nVertMove, diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index f92e80701778..3f1a2413693f 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -143,7 +143,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos() if( bNew ) { // remember that object as the one that has the caret. This is - // neccessary to notify that object if the cursor leaves it. + // necessary to notify that object if the cursor leaves it. ::vos::ORef < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 7f32318c013d..5c31b338c487 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -58,7 +58,7 @@ class SwAccessibleCell : public SwAccessibleContext, protected: // Set states for getAccessibleStateSet. - // This drived class additionaly sets SELECTABLE(1) and SELECTED(+) + // This drived class additionally sets SELECTABLE(1) and SELECTED(+) virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); virtual void _InvalidateCursorPos(); diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index b82f0d0c8bbe..10e53626b6c4 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -176,7 +176,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() if( bNewSelected ) { // remember that object as the one that has the caret. This is - // neccessary to notify that object if the cursor leaves it. + // necessary to notify that object if the cursor leaves it. ::vos::ORef < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index be882c005495..fd3630bf0119 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -43,7 +43,7 @@ class SwAccessibleFrameBase : public SwAccessibleContext, protected: // Set states for getAccessibleStateSet. - // This drived class additionaly sets SELECTABLE(1), SELECTED(+), + // This drived class additionally sets SELECTABLE(1), SELECTED(+), // FOCUSABLE(1) and FOCUSED(+) virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); SwFlyFrm* getFlyFrm() const; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 437b2f62ed30..11575b94d60f 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -678,7 +678,7 @@ class SwAccPreviewData rectangle; needed to determine the visible part of the logic page rectangle. @param _rPrevwWinSize - input paramter - constant reference to the preview window size in TWIP; + input parameter - constant reference to the preview window size in TWIP; needed to determine the visible part of the logic page rectangle */ void AdjustLogicPgRectToVisibleArea( SwRect& _iorLogicPgSwRect, @@ -1061,7 +1061,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) break; case SwAccessibleEvent_Impl::DISPOSE: // DISPOSE events overwrite all others. They are not stored - // but executed immediatly to avoid broadcasting of + // but executed immediately to avoid broadcasting of // defunctional objects. So what needs to be done here is to // remove all events for the frame in question. bAppendEvent = sal_False; @@ -2020,7 +2020,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, // focused state then. Sending the focus changes event // after that seems to be strange. However, we cannot // send a focus event fo the new context now, because - // noone except us knows it. In any case, we remeber + // no one except us knows it. In any case, we remember // the new context as the one that has the focus // currently. diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 912bfb45f1a0..69cf8008e991 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -90,7 +90,7 @@ void SwAccessiblePage::_InvalidateCursorPos() if( bNewSelected ) { // remember that object as the one that has the caret. This is - // neccessary to notify that object if the cursor leaves it. + // necessary to notify that object if the cursor leaves it. ::vos::ORef < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index c4845ba57c2a..39ed1493cc0c 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -49,7 +49,7 @@ protected: SwRect GetBounds( /* const SwFrm *pFrm =0 */ ); // Set states for getAccessibleStateSet. - // This drived class additionaly sets + // This drived class additionally sets // FOCUSABLE(1) and FOCUSED(+) virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 382e1f849dd9..74737beda3f9 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -503,7 +503,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() if( -1 != nNew ) { // remember that object as the one that has the caret. This is - // neccessary to notify that object if the cursor leaves it. + // necessary to notify that object if the cursor leaves it. ::vos::ORef < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } @@ -846,7 +846,7 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary( rBound.endPos = nEndPos; } } - // add the " " into the word boundry + // add the " " into the word boundary else { rBound = pBreakIt->xBreak->getWordBoundary(rText, nPos, aLocale, nWordType, sal_True ); @@ -1917,7 +1917,7 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes( for( i = 0; i < nLength; i++ ) pIndices[i] = i; sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) ); - // create sorted sequences accoring to index array + // create sorted sequences according to index array uno::Sequence<PropertyValue> aNewValues( nLength ); PropertyValue* pNewValues = aNewValues.getArray(); for( i = 0; i < nLength; i++ ) @@ -3244,7 +3244,7 @@ sal_Bool SwAccessibleParagraph::setAttributes( pIndices[i] = i; sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) ); - // create sorted sequences accoring to index array + // create sorted sequences according to index array uno::Sequence< ::rtl::OUString > aNames( nLength ); ::rtl::OUString* pNames = aNames.getArray(); uno::Sequence< uno::Any > aValues( nLength ); diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index fcafae708531..24026e01ad73 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -202,7 +202,7 @@ protected: /// remove the current portion data void ClearPortionData(); - /// get portion data; update if necesary + /// get portion data; update if necessary SwAccessiblePortionData& GetPortionData() throw( com::sun::star::uno::RuntimeException ) { diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index 785d2def1728..5d8ad8997330 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -244,7 +244,7 @@ void SwRect::Justify() } -// Similiar to the inline methods, but we need the function pointers +// Similar to the inline methods, but we need the function pointers void SwRect::_Width( const long nNew ) { m_Size.setWidth(nNew); } void SwRect::_Height( const long nNew ) { m_Size.setHeight(nNew); } diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 5e286a8c91ae..9ef7c499e86d 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -3274,7 +3274,7 @@ bool lcl_PosOk(const SwPosition & aPos) /** Checks if a PaM is valid. For a PaM to be valid its point must be - valid. Additionaly if the PaM has a mark this has to be valid, too. + valid. Additionally if the PaM has a mark this has to be valid, too. @param aPam the PaM to check */ diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index f4db117d9bd4..3324462736cf 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -283,7 +283,7 @@ sal_uInt8 SwPaM::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes nStart = rCntntIdx.GetIndex(); /* #i80135# */ - // if there are SwPostItFields inside our current node text, we split the text into seperate pieces + // if there are SwPostItFields inside our current node text, we split the text into separate pieces // and search for text inside the pieces as well as inside the fields const SwpHints *pHts = ((SwTxtNode*)pNode)->GetpSwpHints(); diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 3fbea69f9af5..49bff063d369 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -296,7 +296,7 @@ sal_Bool SwCrsrShell::SelTblBox() // if we're in a table, create a table cursor, and select the cell // that the current cursor's point resides in - // search for start node of our table box. If not found, exit realy + // search for start node of our table box. If not found, exit really const SwStartNode* pStartNode = pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode(); diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index fcab094a5a5a..27f46945703c 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -162,7 +162,7 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs ) bool SwDoc::GetData( const String& rItem, const String& rMimeType, uno::Any & rValue ) const { - //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive + //search for bookmarks and sections case sensitive at first. If nothing is found then try again case insensitive bool bCaseSensitive = true; while( true ) { @@ -201,7 +201,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType, bool SwDoc::SetData( const String& rItem, const String& rMimeType, const uno::Any & rValue ) { - //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive + //search for bookmarks and sections case sensitive at first. If nothing is found then try again case insensitive bool bCaseSensitive = true; while( true ) { @@ -240,7 +240,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType, { SwServerObject* pObj = NULL; - //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive + //search for bookmarks and sections case sensitive at first. If nothing is found then try again case insensitive bool bCaseSensitive = true; while( true ) { @@ -380,7 +380,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam, return sal_False; } - //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive + //search for bookmarks and sections case sensitive at first. If nothing is found then try again case insensitive bool bCaseSensitive = true; while( true ) { diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 48d489f07478..97230bd8e4d7 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -334,7 +334,7 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset ) } /* If moving of the outline levels is applicable, i.e. for all - outline levels occuring in the document there has to be a valid + outline levels occurring in the document there has to be a valid target outline level implied by aMoveArr. */ bool bMoveApplicable = true; for (n = nSttPos; n < nEndPos; n++) @@ -467,7 +467,7 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset ) // If the given range ends at an outlined text node we have to decide if it has to be a part of // the moving range or not. Normally it will be a sub outline of our chapter // and has to be moved, too. But if the chapter ends with a table(or a section end), - // the next text node will be choosen and this could be the next outline of the same level. + // the next text node will be chosen and this could be the next outline of the same level. // The criteria has to be the outline level: sub level => incorporate, same/higher level => no. if( GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) ) { @@ -492,8 +492,8 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset ) // The following code corrects the range to handle sections (start/end nodes) // The range will be extended if the least node before the range is a start node // which ends inside the range => The complete section will be moved. - // The range will be shrinked if the last position is a start node. - // The range will be shrinked if the last node is an end node which starts before the range. + // The range will be shrunk if the last position is a start node. + // The range will be shrunk if the last node is an end node which starts before the range. aSttRg--; while( aSttRg.GetNode().IsStartNode() ) { diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index bf3330187691..e1275cba7417 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -549,7 +549,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes ) delete to. This is done by first searching forward from the end of the TOX' section. If no content node is found behind the TOX one is searched before it. If this is not - successfull, too, insert new text node behind the end of + successful, too, insert new text node behind the end of the TOX' section. The cursors from the TOX' section will be moved to the content node found or the new text node. */ diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 232326d2ff6b..440033098edf 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -909,7 +909,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons { //#i78025# charts own borders are not completely visible //the above pixel correction is not correct - at least not for charts - //so a different pixel correction is choosen here + //so a different pixel correction is chosen here //this might be a good idea for all other OLE objects also, //but as I cannot oversee the consequences I fix it only for charts for now lcl_correctlyAlignRect( aAlignedGrfArea, rGrfArea, pOut ); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 716b0ea1add7..8daff50856b8 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1264,7 +1264,7 @@ void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) // Der Return-Wert gibt an, was mit der Shell zu geschehen hat: // 0 - Fehler, konnte DocShell nicht finden // 1 - DocShell ist ein existieren Document -// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden ( will be assigned to xLockRef additionaly ) +// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden ( will be assigned to xLockRef additionally ) int lcl_FindDocShell( SfxObjectShellRef& xDocSh, SfxObjectShellLock& xLockRef, diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 32784e018a99..4aa635245d04 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1152,7 +1152,7 @@ void SwDrawContact::Changed( const SdrObject& rObj, const Rectangle& rOldBoundRect ) { // OD 2004-06-01 #i26791# - no event handling, if existing <ViewShell> - // is in contruction + // is in construction SwDoc* pDoc = GetFmt()->GetDoc(); if ( pDoc->GetCurrentViewShell() && pDoc->GetCurrentViewShell()->IsInConstructor() ) diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index c390287e46b4..dfbad1422ffd 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -1678,7 +1678,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar SetCurrX( new SwPosition( *pCrsr->GetMark() )); //if an error has been found go back to the text - //preceeding the error + //preceding the error if(xSpellRet.is()) { *pCrsr->GetPoint() = aSaveStartPos; diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index bc63d52afb2e..593e53424548 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -352,7 +352,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle) SwTOXSortTabBase* pOld = aSortArr[i]; if(*pOld == *pNew) { - //only the first occurence in the document + //only the first occurrence in the document //has to be in the array if(*pOld < *pNew) DELETEZ(pNew); diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index c922b221d856..978c1e4cdc14 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -283,7 +283,7 @@ namespace objectpositioning @author OD @param _rPageAlignLayFrm - input paramter - layout frame, which determines the 'page area' + input parameter - layout frame, which determines the 'page area' the object has to be horizontal positioned in. @param _nProposedRelPosX @@ -332,7 +332,7 @@ namespace objectpositioning is oriented at. @param _rPageAlignLayFrm - input paramter - layout frame, which determines the 'page area' + input parameter - layout frame, which determines the 'page area' the object has to be horizontal positioned in. @param _eRelOrient diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 612b3d332306..ce45b6feed0a 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -201,7 +201,7 @@ bool SwObjPosOscillationControl::OscillationDetected() { if ( *(pNewObjPos) == *(*aObjPosIter) ) { - // position already occured -> oscillation + // position already occurred -> oscillation bOscillationDetected = true; delete pNewObjPos; break; diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index df9c5a2d90db..ee8cdeb35d85 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -341,7 +341,7 @@ bool SwOszControl::ChkOsz() { if ( *(pNewObjPos) == *(*aObjPosIter) ) { - // position already occured -> oscillation + // position already occurred -> oscillation bOscillationDetected = true; delete pNewObjPos; break; diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 8173438becfd..a8a487b27860 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -1124,7 +1124,7 @@ sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove ) : pClipFrm->Frm(); // --> OD 2004-10-14 #i26945# - consider that a table, during // its format, can exceed its upper printing area bottom. - // Thus, enlarge the clip rectangle, if such a case occured + // Thus, enlarge the clip rectangle, if such a case occurred if ( pFly->GetAnchorFrm()->IsInTab() ) { const SwTabFrm* pTabFrm = const_cast<SwFlyFrm*>(pFly) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 4d7d0ecfe72a..e7768a0fe0d4 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -913,7 +913,7 @@ SwCntntNotify::~SwCntntNotify() // The layout is calculated _before_ calling PrtOLENotify, // and the OLE objects are not invalidated during import. // Therefore I added the condition !IsUpdateExpFld, - // have a look at the occurence of CalcLayout in + // have a look at the occurrence of CalcLayout in // uiview/view.cxx. if ( !pNd->IsOLESizeInvalid() && !pSh->GetDoc()->IsUpdateExpFld() ) diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx index 66f13d449aae..6745b4244cff 100644 --- a/sw/source/core/layout/objectformatterlayfrm.hxx +++ b/sw/source/core/layout/objectformatterlayfrm.hxx @@ -50,7 +50,7 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter @author OD @return boolean - indicates, if format was successfull + indicates, if format was successful */ bool _AdditionalFormatObjsOnPage(); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 15e815b44938..e18a8ae8a1d0 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1420,7 +1420,7 @@ void MA_FASTCALL lcl_ExtendLeftAndRight( SwRect& _rRect, // if ( pFly->IsBackgroundTransparent() ) // { // // Background <pFly> is transparent drawn. Thus normally, its region -// // have not to be substracted from given region. +// // have not to be subtracted from given region. // // But, if method is called for a fly frame and // // <pFly> is a direct lower of this fly frame and // // <pFly> inherites its transparent background brush from its parent, @@ -1980,7 +1980,7 @@ void MA_FASTCALL DrawGraphic( { if ( !bGrfIsTransparent ) { - /// substract area of background graphic from draw area + /// subtract area of background graphic from draw area /// OD 08.10.2002 #103898# - consider only that part of the /// graphic area that is overlapping with draw area. SwRect aTmpGrf = aGrf; @@ -4098,7 +4098,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, // OD 30.09.2002 #103636# - no SwAlign of shadow rectangle // no alignment necessary, because (1) <rRect> is already aligned // and because (2) paint of border and background will occur later. - // Thus, (1) assures that no conflicts with neighbour object will occure + // Thus, (1) assures that no conflicts with neighbour object will occur // and (2) assures that border and background is not affected by the // shadow paint. /* @@ -4181,20 +4181,20 @@ void MA_FASTCALL lcl_SubTopBottom( SwRect& _iorRect, ( !bCnt || _rAttrs.GetTopLine( _rFrm ) ) ) { - // substract distance between outer and inner line. + // subtract distance between outer and inner line. SwTwips nDist = ::lcl_MinHeightDist( _rBox.GetTop()->GetDistance() ); // OD 19.05.2003 #109667# - non-overlapping border rectangles: // adjust x-/y-position, if inner top line is a hair line (width = 1) sal_Bool bIsInnerTopLineHairline = sal_False; if ( !_bPrtOutputDev ) { - // additionally substract width of top outer line + // additionally subtract width of top outer line // --> left/right inner/outer line doesn't overlap top outer line. nDist += ::lcl_AlignHeight( _rBox.GetTop()->GetOutWidth() ); } else { - // OD 29.04.2003 #107169# - additionally substract width of top inner line + // OD 29.04.2003 #107169# - additionally subtract width of top inner line // --> left/right inner/outer line doesn't overlap top inner line. nDist += ::lcl_AlignHeight( _rBox.GetTop()->GetInWidth() ); bIsInnerTopLineHairline = _rBox.GetTop()->GetInWidth() == 1; @@ -4231,20 +4231,20 @@ void MA_FASTCALL lcl_SubTopBottom( SwRect& _iorRect, ( !bCnt || _rAttrs.GetBottomLine( _rFrm ) ) ) { - // substract distance between outer and inner line. + // subtract distance between outer and inner line. SwTwips nDist = ::lcl_MinHeightDist( _rBox.GetBottom()->GetDistance() ); // OD 19.05.2003 #109667# - non-overlapping border rectangles: // adjust x-/y-position, if inner bottom line is a hair line (width = 1) sal_Bool bIsInnerBottomLineHairline = sal_False; if ( !_bPrtOutputDev ) { - // additionally substract width of bottom outer line + // additionally subtract width of bottom outer line // --> left/right inner/outer line doesn't overlap bottom outer line. nDist += ::lcl_AlignHeight( _rBox.GetBottom()->GetOutWidth() ); } else { - // OD 29.04.2003 #107169# - additionally substract width of bottom inner line + // OD 29.04.2003 #107169# - additionally subtract width of bottom inner line // --> left/right inner/outer line doesn't overlap bottom inner line. nDist += ::lcl_AlignHeight( _rBox.GetBottom()->GetInWidth() ); bIsInnerBottomLineHairline = _rBox.GetBottom()->GetInWidth() == 1; @@ -4350,7 +4350,7 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, // OD 06.05.2003 #107169# - adjustments for printer output device if ( bPrtOutputDev ) { - // substract width of outer top line. + // subtract width of outer top line. if ( rBox.GetTop() && (!bCnt || _rAttrs.GetTopLine( _rFrm )) ) { long nDist = ::lcl_AlignHeight( rBox.GetTop()->GetOutWidth() ); @@ -4381,7 +4381,7 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, } } } - // substract width of outer bottom line. + // subtract width of outer bottom line. if ( rBox.GetBottom() && (!bCnt || _rAttrs.GetBottomLine( _rFrm )) ) { long nDist = ::lcl_AlignHeight( rBox.GetBottom()->GetOutWidth()); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 14b301a30e5e..68068df5ab96 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1908,7 +1908,7 @@ void SwTabFrm::MakeAll() LockJoin(); //Ich lass mich nicht unterwegs vernichten. SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung // If pos is invalid, we have to call a SetInvaKeep at aNotify. - // Otherwise the keep atribute would not work in front of a table. + // Otherwise the keep attribute would not work in front of a table. const sal_Bool bOldValidPos = GetValidPosFlag(); //Wenn mein direkter Nachbar gleichzeitig mein Follow ist @@ -2527,7 +2527,7 @@ void SwTabFrm::MakeAll() } // --> FME 2004-06-09 #i29771# Two tries to split the table: - // If an error occured during splitting. We start a second + // If an error occurred during splitting. We start a second // try, this time without splitting of table rows. if ( bSplitError ) { @@ -2536,7 +2536,7 @@ void SwTabFrm::MakeAll() } // --> FME 2005-02-10 #119477# - // If splitting the table was successfull or not, + // If splitting the table was successful or not, // we do not want to have 'empty' follow tables. if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() ) Join(); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index f22e51a311cd..945dec248f07 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -306,7 +306,7 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, Point aOldPoint = rPoint; // PAGES01 - // search for page containing rPoint. The borders around the pages are considerd + // search for page containing rPoint. The borders around the pages are considered const SwPageFrm* pPage = GetPageAtPos( rPoint, 0, true ); // --> OD 2008-12-23 #i95626# diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 6489498d3c3a..f51bf90334b0 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2887,7 +2887,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) } else { - // variable size of body|section frame has shrinked. Thus, + // variable size of body|section frame has shrunk. Thus, // invalidate all lowers not matching the new body|section size // and the dedicated new last lower. if( bVert ) diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 8466034d65ed..2e917fbf55a2 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -907,7 +907,7 @@ sal_Bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj, if ( xPers.is() ) xPers->storeOwn(); else { - DBG_ERROR("Modified object without persistance in cache!"); + DBG_ERROR("Modified object without persistence in cache!"); } } diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index fcf37213bb53..57e2dc371bf4 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -837,7 +837,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes, // box, the left and right border does not need to be changed. // The right and bottom border instead has to be derived from the right- // bottom box of the selection. If this is a overlapped cell, - // the appropiate master box. + // the appropriate master box. SwTableBox* pLastBox = 0; // the right-bottom (master) cell SwDoc* pDoc = GetFrmFmt()->GetDoc(); SwPosition aInsPos( *pMergeBox->GetSttNd()->EndOfSectionNode() ); diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index c3973a95a953..26d5edec6177 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -214,7 +214,7 @@ sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ) * depending on its 'visited' state. There are actually two cases, which * should override the colors from the character attribute: * 1. We never take the 'visited' color during printing/pdf export/preview - * 2. The user has choosen to override these colors in the view options + * 2. The user has chosen to override these colors in the view options *************************************************************************/ bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index 714374bb0313..185e5299b283 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -378,7 +378,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf, // if we are formatting multi portions we want to allow line breaks // at the border between single line and multi line portion - // we have to be carefull with footnote portions, they always come in + // we have to be careful with footnote portions, they always come in // with an index 0 if ( nBreakPos < rInf.GetLineStart() && rInf.IsFirstMulti() && ! rInf.IsFtnInside() ) diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 7b28257d0639..52917930fa26 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -464,7 +464,7 @@ SwPosSize SwTxtSizeInfo::GetTxtSize() const const SwScriptInfo& rSI = ( (SwParaPortion*)GetParaPortion() )->GetScriptInfo(); - // in some cases, compression is not allowed or surpressed for + // in some cases, compression is not allowed or suppressed for // performance reasons sal_uInt16 nComp =( SW_CJK == GetFont()->GetActual() && rSI.CountCompChg() && @@ -690,7 +690,7 @@ void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPo if ( ! rPor.InFldGrp() ) pSI = &GetParaPortion()->GetScriptInfo(); - // in some cases, kana compression is not allowed or surpressed for + // in some cases, kana compression is not allowed or suppressed for // performance reasons sal_uInt16 nComp = 0; if ( ! IsMulti() ) @@ -1177,7 +1177,7 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked) *************************************************************************/ void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const { - ASSERT( OnWin(), "SwTxtPaintInfo::DrawBackground: printer polution ?" ); + ASSERT( OnWin(), "SwTxtPaintInfo::DrawBackground: printer pollution ?" ); SwRect aIntersect; CalcRect( rPor, 0, &aIntersect ); diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 51c86c16c1fd..a48003afbfde 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -816,7 +816,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa * SwTxtNode::GetScalingOfSelectedText() * * Calculates the width of the text part specified by nStt and nEnd, - * the height of the line containing nStt is devided by this width, + * the height of the line containing nStt is divided by this width, * indicating the scaling factor, if the text part is rotated. * Having CH_BREAKs in the text part, this method returns the scaling * factor for the longest of the text parts separated by the CH_BREAKs. diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index eb1871f5fd8c..8d13282e5d72 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -215,7 +215,7 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf ) pTmpPrev->Move( rInf ); rInf.SetLast( pTmpPrev ); pTmpPrev = pTmpPrev->GetPortion(); - ASSERT( pTmpPrev, "UnderFlow: Loosing control!" ); + ASSERT( pTmpPrev, "UnderFlow: Losing control!" ); }; } pPor = pPor->GetPortion(); diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx index 1ea43236d5cb..7cc6e38d51f3 100644 --- a/sw/source/core/text/itrform2.hxx +++ b/sw/source/core/text/itrform2.hxx @@ -81,7 +81,7 @@ class SwTxtFormatter : public SwTxtPainter // wird von SwTxtFormatter wegen UpdatePos ueberladen void CalcAdjustLine( SwLineLayout *pCurr ); - // consideres line spacing attributes + // considers line spacing attributes void CalcRealHeight( sal_Bool bNewLine = sal_False ); // uebertraegt die Daten nach rInf diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index c7f82cf751f2..5616551a1eab 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -437,7 +437,7 @@ void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const { SwFontSave aSave( rInf, pFnt ); - ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" ); + ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion pollution?" ); if( Width() && ( !bPlaceHolder || rInf.GetOpt().IsShowPlaceHolderFields() ) ) { // Dies ist eine freizuegige Auslegung der Hintergrundbelegung ... @@ -1144,7 +1144,7 @@ SwCombinedPortion::SwCombinedPortion( const XubString &rTxt ) void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const { - ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" ); + ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion pollution?" ); if( Width() ) { rInf.DrawBackBrush( *this ); diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 24eadeb4254a..9dbd2f2f07ba 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -1063,7 +1063,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos, { // If bOn is sal_False and the next attribute starts later than rPos // the winner attribute is interrupted at rPos. - // If the start of the next atribute is behind the end of + // If the start of the next attribute is behind the end of // the last attribute on the aEnd-stack, this is the endposition // on the stack is the end of the 2-line portion. if( !bOn || aEnd.back() < *pTmp->GetStart() ) diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 02aa72613997..e1f0ca0280ab 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -814,7 +814,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) sal_Bool bGrow = ( pDrop->GetLen() != 0 ); - // for growing controll + // for growing control long nMax = KSHRT_MAX; long nMin = nFactor / 2; #if OSL_DEBUG_LEVEL > 1 diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 9a818ccb6f7f..674a0ed65be3 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -1676,7 +1676,7 @@ SwContourCache::~SwContourCache() void SwContourCache::ClrObject( MSHORT nPos ) { - ASSERT( pTextRanger[ nPos ], "ClrObject: Allready cleared. Good Bye!" ); + ASSERT( pTextRanger[ nPos ], "ClrObject: Already cleared. Good Bye!" ); nPntCnt -= pTextRanger[ nPos ]->GetPointCount(); delete pTextRanger[ nPos ]; --nObjCnt; diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 4ef7f67be490..4dd41ef1cf9f 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2701,13 +2701,13 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont ) if( GetShell() && GetShell()->GetWin() ) { - // here we determine the prefered window text color for painting + // here we determine the preferred window text color for painting const SwViewOption* pViewOption = GetShell()->GetViewOptions(); if(pViewOption->IsPagePreview() && !SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews()) nNewColor = COL_BLACK; else - // we take the font color from the appearence page + // we take the font color from the appearance page nNewColor = SwViewOption::GetFontColor().GetColor(); } diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 3a9a4ebcba77..fd77db940503 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1253,7 +1253,7 @@ SwTxtAttr* SwTxtNode::InsertItem( { const bool bSuccess( InsertHint( pNew, nMode ) ); // N.B.: also check that the hint is actually in the hints array, - // because hints of certain types may be merged after succesful + // because hints of certain types may be merged after successful // insertion, and thus destroyed! if (!bSuccess || ( USHRT_MAX == m_pSwpHints->GetPos( pNew ) )) { @@ -2195,7 +2195,7 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, { const sal_uInt16 nHintWhich = pItem->Which(); ASSERT(!isUNKNOWNATR(nHintWhich), - "SwTxtNode::GetAttr(): unkonwn attribute?"); + "SwTxtNode::GetAttr(): unknown attribute?"); if ( !pAttrArr.get() ) { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index c256b6222a7c..febb5c8ec8d3 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1983,17 +1983,17 @@ void SwTxtNode::CountWords( SwDocStat& rStat, // Asian languages count words as characters if ( nCurrScript == ::com::sun::star::i18n::ScriptType::ASIAN ) { - // substract white spaces + // subtract white spaces sal_Int32 nSpaceCount = 0; sal_Int32 nSpacePos = 0; - // substract normal white spaces + // subtract normal white spaces nSpacePos = -1; while ( ( nSpacePos = aScriptText.indexOf( ' ', nSpacePos + 1 ) ) != -1 ) { nSpaceCount++; } - // substract Asian full-width white spaces + // subtract Asian full-width white spaces nSpacePos = -1; while ( ( nSpacePos = aScriptText.indexOf( 12288, nSpacePos + 1 ) ) != -1 ) { diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index a5edb5ad6f53..3359fa98f924 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -201,7 +201,7 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext) if ( !m_pOldSet.get() || !m_pFmt || !IsFmtInDoc( &rContext.GetDoc() )) return; - // --> OD 2004-10-26 #i35443# - If anchor attribute has been successfull + // --> OD 2004-10-26 #i35443# - If anchor attribute has been successful // restored, all other attributes are also restored. // Thus, keep track of its restoration bool bAnchorAttrRestored( false ); @@ -210,7 +210,7 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext) bAnchorAttrRestored = RestoreFlyAnchor(rContext); if ( bAnchorAttrRestored ) { - // Anchor attribute successfull restored. + // Anchor attribute successful restored. // Thus, keep anchor position for redo SaveFlyAnchor(); } diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 9f5ec1125830..fa925e95c12f 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1737,7 +1737,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd, // then pBox received nodes from elsewhere. // If bNodesMoved is set for pBox the undo must move the // boxes back, otherwise it must delete them. - // The bNodesMoved flag is stored in a seperate array + // The bNodesMoved flag is stored in a separate array // which mirrors Ptrs.pNewSttNds, i.e. Ptrs.pNewSttNds[i] // and aMvBoxes[i] belong together. sal_Bool bNodesMoved = diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index 8e50525e8186..d4cb11dcb66b 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -347,7 +347,7 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString ) nStartPos, nEndPos - 1, aResult )) { - // if an error occured, bail out + // if an error occurred, bail out return CellRange(); } } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 696ed773b67a..36d7f14eb397 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -697,12 +697,12 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData //Therefore we need to shift the range one row up SwRangeDescriptor aDesc; if (aRangeRepresentation.getLength() == 0) - return xRes; // we cant handle this thus returning an empty references + return xRes; // we can't handle this thus returning an empty references aRangeRepresentation = aRangeRepresentation.copy( 1 ); // get rid of '.' to have only the cell range left FillRangeDescriptor( aDesc, aRangeRepresentation ); aDesc.Normalize(); if (aDesc.nTop <= 0) // no chance to shift the range one row up? - return xRes; // we cant handle this thus returning an empty references + return xRes; // we can't handle this thus returning an empty references aDesc.nTop -= 1; aDesc.nBottom -= 1; @@ -743,7 +743,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData { SwTable* pTable = SwTable::FindTable( pTblFmt ); if(pTable->IsTblComplex()) - return xRes; // we cant handle this thus returning an empty references + return xRes; // we can't handle this thus returning an empty references else { // get a character map in the size of the table to mark @@ -833,7 +833,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData } aDataLen[oi] = nL; - // check that there is no other seperate sequence of data + // check that there is no other separate sequence of data // to be found because that is not supported while (ii < iiEnd) { diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 2d2d1fd32852..38be49a908e9 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1685,7 +1685,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) { // todo: if the start/end is in a table then insert a paragraph // before/after, move the start/end nodes, then convert and - // remove the addtional paragraphs in the end + // remove the additional paragraphs in the end if (pStartStartNode->GetStartNodeType() == SwTableBoxStartNode) { SwTableNode *const pSartTableNode(pStartStartNode->FindTableNode()); diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index d9dbeaa2a065..aa782af14696 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -168,7 +168,7 @@ void SwViewImp::UnlockPaint() |* |*************************************************************************/ // OD 29.08.2002 #102450# -// add 3rd paramter <const Color* pPageBackgrdColor> for setting this +// add 3rd parameter <const Color* pPageBackgrdColor> for setting this // color as the background color at the outliner of the draw view. // OD 09.12.2002 #103045# - add 4th parameter for the horizontal text direction // of the page in order to set the default horizontal text direction at the diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 7ef47e04c128..ae945c5fc374 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -199,7 +199,7 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::SwViewShell" ); // OD 2004-06-01 #i26791# - in order to suppress event handling in - // <SwDrawContact::Changed> during contruction of <ViewShell> instance + // <SwDrawContact::Changed> during construction of <ViewShell> instance mbInConstructor = true; bPaintInProgress = bViewLocked = bInEndAction = bFrameView = @@ -278,7 +278,7 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::SwViewShell" ); // OD 2004-06-01 #i26791# - in order to suppress event handling in - // <SwDrawContact::Changed> during contruction of <ViewShell> instance + // <SwDrawContact::Changed> during construction of <ViewShell> instance mbInConstructor = true; bPaintWorks = bEnableSmooth = sal_True; diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index b5f7fc283b8d..1c506f186ec8 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -206,7 +206,7 @@ sal_uLong SwASCIIParser::CallParser() { // Using the pool defaults for the font causes significant // trouble for the HTML filter, because it is not able - // to export the pool defaults (or to be more precice: + // to export the pool defaults (or to be more precise: // the HTML filter is not able to detect whether a pool // default has changed or not. Even a comparison with the // HTMLi template does not work, because the defaults are diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index c205002aa4f2..f20152ebc69f 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -575,7 +575,7 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule ) nParaLeft -= nLeft; else //#83154#, Don't think any of the older #80856# bugfix code is - //relevent anymore. + //relevant anymore. nParaLeft = rLR.GetTxtLeft()+rLR.GetTxtFirstLineOfst(); aLR.SetTxtLeft( nParaLeft ); } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 18ef2465cdc6..d53fd631aa92 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2014,7 +2014,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem, } // the hint starts before the next script change and ends behind - // it, so we can insert a hint upto the next script change and + // it, so we can insert a hint up to the next script change and // continue with the rest of the hint. if( bDependsOnAnyScript || nScript == aScriptLst[i] ) InsertNoScript( rItem, nPos, nChgPos, rFmtInfos, bParaAttrs ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 74fe5b37ac8c..5ea1c18b39c7 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1297,7 +1297,7 @@ sal_Bool SwHTMLParser::HasCurrentParaBookmarks( sal_Bool bIgnoreStack ) const if( !bHasMarks ) { - // second step: when we didnt find a bookmark, check if there is one set already + // second step: when we didn't find a bookmark, check if there is one set already IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin(); ppMark != pMarkAccess->getAllMarksEnd(); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 7ee3f08c5fa1..6292eb3948dd 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -604,7 +604,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( pCol->GetNumCols() ); - // minumum gutter width + // minimum gutter width sal_uInt16 nGutter = pCol->GetGutterWidth( sal_True ); if( nGutter!=USHRT_MAX ) { @@ -678,7 +678,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) if( lcl_html_IsMultiColEnd( rHTMLWrt, nSectEndIdx-1 ) ) bEndTag = sal_False; - //.is there a columned section arround this one? + //.is there a columned section around this one? const SwStartNode *pSttNd = rSectNd.StartOfSectionNode(); if( pSttNd ) { @@ -700,7 +700,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) } // The surrounding section must be closed before the current one is - // opended, except that it start immediatly before the current one or + // opended, except that it start immediately before the current one or // another end immediately before the current one if( pSurrCol && nSectSttIdx - pSurrSectNd->GetIndex() > 1 && !lcl_html_IsMultiColEnd( rHTMLWrt, nSectSttIdx-1 ) ) diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 007e77f72694..91687f9f9685 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -199,7 +199,7 @@ namespace sw alternative name for one of them.. And it needs to report to the importer if the style being mapped to - was already in existance, for the cut and paste/insert file mode we + was already in existence, for the cut and paste/insert file mode we should not modify the returned style if it is already in use as it is does not belong to us to change. @@ -259,7 +259,7 @@ namespace sw alternative name for one of them.. And it needs to report to the importer if the style being mapped to - was already in existance, for the cut and paste/insert file mode we + was already in existence, for the cut and paste/insert file mode we should not modify the returned style if it is already in use as it is does not belong to us to change. @@ -495,7 +495,7 @@ namespace sw Word generally requires characters which share the same direction, the same script, and occasionally (depending on the format) the - same charset to be exported in independant chunks. + same charset to be exported in independent chunks. So this function finds these ranges and returns a STL container of CharRuns @@ -512,7 +512,7 @@ namespace sw RTF format, not necessary for a unicode aware format like WW8+ @return STL container of CharRuns which describe the shared - direction, script and optionally script of the contigious sequences + direction, script and optionally script of the contiguous sequences of characters @author diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx index 95f82db1d6f2..699c5a01a2fe 100644 --- a/sw/source/filter/inc/wwstyles.hxx +++ b/sw/source/filter/inc/wwstyles.hxx @@ -143,7 +143,7 @@ namespace ww /** Find the WinWord sti index of an english style name. - When importing a RTF document we would like to treat styles as similiar + When importing a RTF document we would like to treat styles as similar to how word does as possible, to this end word will treat some styles with special names as inbuilt styles, and some as user defined styles. @@ -169,7 +169,7 @@ namespace ww /** Find the WinWord sti index of an old <= Word2 stc (style code) When importing a Word 2 document we would like to treat styles as - similiar to how word 8 does as possible, to this end word will treat + similar to how word 8 does as possible, to this end word will treat some styles with special codes as inbuilt styles, and some as user defined styles. diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index b1f149f891be..f6802bca8d41 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -320,7 +320,7 @@ void SwRTFParser::SetFlysInDoc() { // Take care for table nodes pNd = pNd->GetNodes()[ pNd->GetIndex() - 2 ]->GetTableNode(); - if( pNd ) // if the table starts imediately before aRg -> expand aRg + if( pNd ) // if the table starts immediately before aRg -> expand aRg aRg.aStart = *pNd; if( bMakeEmptySection ) @@ -405,7 +405,7 @@ void SwRTFParser::SetFlysInDoc() // THIS >>>>> // if the section only contains one Node and this has a - // border or backgorund, then put it to the frame + // border or background, then put it to the frame // Not in our own RTF-Format! // <<<<< DOES NOT MAKE SENSE TO ME (flr) // #102781#. Added support for transparent frames. @@ -534,7 +534,7 @@ void SwRTFParser::SetFlysInDoc() aFlyArr.Remove(0, aFlyArr.Count()); } -// clips the text box to the min or max position if it is outside our min or max boundry +// clips the text box to the min or max position if it is outside our min or max boundary long SwRTFParser::GetSafePos(long nPos) { if(nPos > SHRT_MAX) diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index f63a4cc47c6b..cb2e0dbf104f 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -1032,7 +1032,7 @@ void rtfSections::InsertSegments(bool bNewDoc) aSectPaM.GetCntntNode(), 0); SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); - //The last section if continous is always unbalanced + //The last section if continuous is always unbalanced if (aNext == aEnd && pRet) pRet->SetFmtAttr(SwFmtNoBalancedColumns(true)); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1b8d5598c436..8b46e244b2fa 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1149,7 +1149,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point TableBackgrounds( pTableTextNodeInfoInner ); - // Cell prefered width + // Cell preferred width SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )[ pTableTextNodeInfoInner->getCell() ]; m_pSerializer->singleElementNS( XML_w, XML_tcW, FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nWidth ) ).getStr( ), @@ -1293,7 +1293,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // Create the SwWriteTable instance to use col spans (and maybe other infos) GetTablePageSize( pTableTextNodeInfoInner, nPageSize, bRelBoxSize ); - // Output the table prefered width + // Output the table preferred width if ( nPageSize != 0 ) m_pSerializer->singleElementNS( XML_w, XML_tblW, FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nPageSize ) ).getStr( ), diff --git a/sw/source/filter/ww8/dump/msvbasic.cxx b/sw/source/filter/ww8/dump/msvbasic.cxx index a4167beb9dc5..20f7462c3e9e 100644 --- a/sw/source/filter/ww8/dump/msvbasic.cxx +++ b/sw/source/filter/ww8/dump/msvbasic.cxx @@ -204,7 +204,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage) //most begin with */G , and sometimes with //*/C. Those with G always have a trailer of 12 bytes, those //with C come in pairs, the first with no trailer, and the - //second with one of 12 bytes. The following code attemts + //second with one of 12 bytes. The following code attempts //to read these strings and ends when it reaches a sequence of //bytes which fails a test to be a valid string. So this //while loop here is the particular piece of code which is diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx index f8370983fc77..72716d4b2e07 100644 --- a/sw/source/filter/ww8/dump/ww8scan.cxx +++ b/sw/source/filter/ww8/dump/ww8scan.cxx @@ -4554,7 +4554,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) settings its end to the current start, then store the starting position of the current range to clipstart. The pPcd sprms will end as normal (albeit earlier than originally expected), - and the existance of a clipstart will force the pPcd iterater + and the existence of a clipstart will force the pPcd iterater to reread the current set of sprms instead of advancing to its next set. Then the clipstart will be set as the starting position which will force them to be applied directly after @@ -4586,7 +4586,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) { /* For the case of a piece table we slave the piece table attribute iterator - to the piece table and access it through that only. They are two seperate + to the piece table and access it through that only. They are two separate structures, but act together as one logical one. The attributes only go to the next entry when the piece changes */ @@ -5793,7 +5793,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) break; nMax++; nLeft -= nNextSiz; - if( nLeft < 1 ) // can we read the given ammount of bytes ? + if( nLeft < 1 ) // can we read the given amount of bytes ? break; // increase p by nNextSiz Bytes p = (WW8_FFN *)( ( (sal_uInt8*)p ) + nNextSiz ); @@ -5922,9 +5922,9 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) footnote *and endnote!!* seperator,continuation seperator, and continuation notice entry, the documentation does not mention the endnote seperators, the documentation also gets the index numbers - backwards when specifiying which bits to test. The bottom six bits + backwards when specifying which bits to test. The bottom six bits of this value must be tested and skipped over. Each section's - grpfIhdt is then tested for the existence of the appropiate headers + grpfIhdt is then tested for the existence of the appropriate headers and footers, at the end of each section the nIdxOffset must be updated to point to the beginning of the next section's group of headers and footers in this PLCF, UpdateIndex does that task. @@ -6574,7 +6574,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) nL = SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1; break; default: - ASSERT(!this, "Unknown sprm varient"); + ASSERT(!this, "Unknown sprm variant"); break; } break; diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx index a7261c1aeedb..6c1b0ec5de92 100644 --- a/sw/source/filter/ww8/dump/ww8scan.hxx +++ b/sw/source/filter/ww8/dump/ww8scan.hxx @@ -1314,15 +1314,15 @@ public: sal_uInt16 fWriteReservation : 1; sal_uInt16 fLockRev : 1; // when 1, the current revision marking state is locked sal_uInt16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts - // compatability options + // compatibility options sal_uInt16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent sal_uInt16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters - sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break + sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, suppress the paragraph Space Before and Space After options after a page break sal_uInt16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line sal_uInt16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers sal_uInt16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts sal_uInt16 copts_fConvMailMergeEsc : 1; - sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page + sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, suppress extra line spacing at top of page sal_uInt16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh sal_uInt16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures sal_uInt16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames @@ -1372,7 +1372,7 @@ public: /* bei nFib >= 103 gehts weiter: */ - sal_uInt32 fNoTabForInd :1; // see above in compatability options + sal_uInt32 fNoTabForInd :1; // see above in compatibility options sal_uInt32 fNoSpaceRaiseLower :1; // see above sal_uInt32 fSupressSpbfAfterPageBreak :1; // see above sal_uInt32 fWrapTrailSpaces :1; // see above diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx index 06bf9e1dc8dc..25082ef9875c 100644 --- a/sw/source/filter/ww8/dump/ww8struc.hxx +++ b/sw/source/filter/ww8/dump/ww8struc.hxx @@ -776,7 +776,7 @@ eigentlich muessten wir das jetzt in etwa *so* praezisieren: }; */ -// AnnoTation Refernce Descriptor (ATRD) +// AnnoTation References Descriptor (ATRD) struct WW8_ATRD // fuer die 8-Version { SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index 90c7d77cebf0..5d16e4d4d532 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.hxx @@ -44,7 +44,7 @@ namespace ww /* needed_cast is the same as static_cast except that there will be a compile time assert when NDEBUG is not defined and the in and out types are the - same. i.e. needed_cast catches unneccessary casts + same. i.e. needed_cast catches unnecessary casts */ template<typename Ret, typename Param> Ret needed_cast(Param in) { diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index c1dbeed5c5ed..c967ab8e72c6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -418,7 +418,7 @@ void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) OSL_TRACE("%s", OSL_THIS_FUNC); /* You would have thought that - m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficent here , + m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficient here , but looks like word needs to see the other directional token to be satisified that all is kosher, otherwise it seems in ver 2003 to go and semi-randomlyly stick strike through about the place. Perhaps diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 1f58cae435c3..f5e1404dc6ff 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -484,7 +484,7 @@ sal_Int32 RtfSdrExport::StartShape() /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/sw/source/filter/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx index f5ed3fc0d466..ae793111be01 100644 --- a/sw/source/filter/ww8/staticassert.hxx +++ b/sw/source/filter/ww8/staticassert.hxx @@ -45,7 +45,7 @@ namespace ww } /* - Similiar to assert, StaticAssert is only in operation when NDEBUG is not + Similar to assert, StaticAssert is only in operation when NDEBUG is not defined. It will test its first argument at compile time and on failure report the error message of the second argument, which must be a valid c++ classname. i.e. no spaces, punctuation or reserved keywords. diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 8b5d6b9fff14..83b65f015718 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -636,7 +636,7 @@ namespace sw e.g. Page Anchored elements will not be. For the winword export we need them to have something to be anchored to. So this method returns all the floating elements in a document as a STL container - of sw::Frames which are guaranteed to have an appropiate anchor. + of sw::Frames which are guaranteed to have an appropriate anchor. @param rDoc The SwDoc document to get the styles from @@ -786,7 +786,7 @@ namespace sw Word has the simple concept of a drawing object either in the foreground and in the background. We have an additional complexity - that form components live in a seperate layer, which seems + that form components live in a separate layer, which seems unnecessarily complicated. So in the winword filter we set the object's layer through this class with either SendObjectToHell for the bottom layer and SendObjectToHeaven for the top and we don't diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 3b34697ce3e1..0f04d9c761ba 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -67,7 +67,7 @@ namespace myImplHelpers /* #98506# The normal case for reexporting word docs is to have dynamic spacing, - as this is word's only setting, and the reason for the existance of the + as this is word's only setting, and the reason for the existence of the dynamic spacing features. If we have dynamic spacing active then we can add its spacing to the value height of the h/f and get the wanted total size for word. @@ -116,7 +116,7 @@ namespace myImplHelpers /* SwTxtFmtColl and SwCharFmt are quite distinct types and how they are gotten is also distinct, but the algorithm to match word's eqivalents into - them is the same, so we put the different stuff into two seperate helper + them is the same, so we put the different stuff into two separate helper implementations and a core template that uses the helpers that uses the same algorithm to do the work. We'll make the helpers specializations of a non existing template so I can let the compiler figure out the right one @@ -615,7 +615,7 @@ namespace sw if (bSplitOnCharSet) { - //Split unicode text into plausable 8bit ranges for export to + //Split unicode text into plausible 8bit ranges for export to //older non unicode aware format xub_StrLen nLen = rTxt.Len(); xub_StrLen nPos = 0; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c371469cfe10..4dc807774f9c 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -783,7 +783,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const SwTwips nLeft = aRect.Left() + nThick; SwTwips nRight = aRect.Right() - nThick; - //Nasty swap for bidi if neccessary + //Nasty swap for bidi if necessary rWrt.MiserableRTLFrmFmtHack(nLeft, nRight, rFrmFmt); //xaLeft/yaTop/xaRight/yaBottom - rel. to anchor @@ -1337,7 +1337,7 @@ void WW8Export::WriteSdrTextObj(const SdrObject& rObj, sal_uInt8 nTyp) /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 540c15967cd2..bb8340ce2034 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -525,7 +525,7 @@ void WW8SwAttrIter::OutAttr( xub_StrLen nSwPos ) } /* - For #i24291# we need to explictly remove any properties from the + For #i24291# we need to explicitly remove any properties from the aExportSet which a SwCharFmt would override, we can't rely on word doing this for us like writer does */ diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index a8ce690b5228..0436779ec64b 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -402,7 +402,7 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap ) { //If we are a character property then see if it is one of the //western/asian ones that must be collapsed together for export to - //word. If so default to the western varient. + //word. If so default to the western variant. if ( bPap || m_rExport.CollapseScriptsforWordOk( i18n::ScriptType::LATIN, n) ) { @@ -1582,7 +1582,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt AttrOutput().OutputStyleItemSet( aSet, true, bOutPgDscSet ); // <-- - //Cannot export as normal page framedir, as continous sections + //Cannot export as normal page framedir, as continuous sections //cannot contain any grid settings like proper sections AttrOutput().SectionBiDi( FRMDIR_HORI_RIGHT_TOP == TrueFrameDirection( *rSepInfo.pSectionFmt ) ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index f08b55cbcb0e..15c140ff0778 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -349,7 +349,7 @@ static void WriteDop( WW8Export& rWrt ) { WW8Dop& rDop = *rWrt.pDop; - // i#78951#, store the value of unknown compatability options + // i#78951#, store the value of unknown compatibility options rDop.SetCompatabilityOptions( rWrt.pDoc->Getn32DummyCompatabilityOptions1()); rDop.SetCompatabilityOptions2( rWrt.pDoc->Getn32DummyCompatabilityOptions2()); @@ -2868,7 +2868,7 @@ void WW8Export::WriteFkpPlcUsw() if (pEscher || pDoc->ContainsMSVBasic()) { /* - #82587# Everytime MS 2000 creates an escher stream there is always + #82587# Every time MS 2000 creates an escher stream there is always an ObjectPool dir (even if empty). It turns out that if a copy of MS 2000 is used to open a document that contains escher graphics exported from StarOffice without this empty dir then *if* that @@ -2884,7 +2884,7 @@ void WW8Export::WriteFkpPlcUsw() some magic. cmc */ /* - #10570# Similiarly having msvbasic storage seems to also trigger + #10570# Similarly having msvbasic storage seems to also trigger creating this stream */ GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool), diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index a62146fc17a3..a545e7cf0e75 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1106,7 +1106,7 @@ public: SwTwips CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const; - /// Nasty swap for bidi if neccessary + /// Nasty swap for bidi if necessary bool MiserableRTLFrmFmtHack(SwTwips &rLeft, SwTwips &rRight, const sw::Frame &rFrmFmt); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 2a18540387fa..deb3269a399a 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -124,7 +124,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, switch (pItem->Which()) { /* - For an inline object these properties are irrelevent because they + For an inline object these properties are irrelevant because they will be the same as the defaults that msword applies in their absence, so if that is all that there is for these inline objects then if there turns out to be enough information in the object diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 53e86032106d..bd228594fdc3 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1128,7 +1128,7 @@ void WW8AttributeOutput::CharFontCJK( const SvxFontItem& rFont ) void WW8AttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight ) { - //Can only export in 8+, in 7- export as normal varient and expect that + //Can only export in 8+, in 7- export as normal variant and expect that //upperlevel code has blocked exporting clobbering attributes if (m_rWW8Export.bWrtWW8) { @@ -1142,7 +1142,7 @@ void WW8AttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight ) void WW8AttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture ) { - // Can only export in 8+, in 7- export as normal varient and expect that + // Can only export in 8+, in 7- export as normal variant and expect that // upperlevel code has blocked exporting clobbering attributes if (m_rWW8Export.bWrtWW8) { @@ -3325,7 +3325,7 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) sal_Unicode cEnd = rTwoLines.GetEndBracket(); /* - As per usual we have problems. We can have seperate left and right brackets + As per usual we have problems. We can have separate left and right brackets in OOo, it doesn't appear that you can in word. Also in word there appear to only be a limited number of possibilities, we can use pretty much anything. diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 3e1920156241..4adc469bf468 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -611,7 +611,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, Save and create new plcxman for this drawing object, of the type that will include the para end mark inside a paragraph property range, as drawing boxes have real paragraph marks as part of their text, while - normal writer has seperate nodes for each paragraph and so has no actual + normal writer has separate nodes for each paragraph and so has no actual paragraph mark as part of the paragraph text. */ WW8ReaderSave aSave(this); @@ -1878,7 +1878,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, bool bBrushItemOk = false; sal_uInt8 nTrans = 0; - //Seperate transparency + //Separate transparency eState = rOldSet.GetItemState(XATTR_FILLTRANSPARENCE, true, &pItem); if (eState == SFX_ITEM_SET) { @@ -2068,7 +2068,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, So given that the size of the values remains pretty much the same despite the size of the graphic, we can tell that the - polygon is measured in units that are independant of the + polygon is measured in units that are independent of the graphic. But why does the left corner move a different value to the left each time, and why does the bottom move upwards each time, when the right and top remain at the same value ? @@ -2110,7 +2110,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, aPoly.Scale(aMapPolyX, aMapPolyY); // --> OD 2005-05-19 #i47277# - contour is already in unit of the - // graphic prefered unit. Thus, call method <SetContour(..)> + // graphic preferred unit. Thus, call method <SetContour(..)> pNd->SetContour(&aPoly); // <-- } diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index dec60c9bc74e..792893c0f7ab 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -84,8 +84,8 @@ public: const SvxMSDffShapeOrders *pShapeOrders); void InsertTextLayerObject(SdrObject* pObject); /* - cmc: We should have have seperate ZOrder classes for 95- and 97+ and - instantiate the appropiate one at run time. + cmc: We should have have separate ZOrder classes for 95- and 97+ and + instantiate the appropriate one at run time. */ void InsertDrawingObject(SdrObject* pObj, short nWwHeight); // --> OD 2004-12-13 #117915# - new parameter <_bInHeaderFooter>, indicating diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index b98c8c1e3da5..66e94dfc9b8d 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -570,7 +570,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, ##835## Disable use of main stream as fallback stream for inline direct blips as it is known that they are directly after the record - header, testing for existance in main stream may lead to an + header, testing for existence in main stream may lead to an incorrect fallback graphic being found if other escher graphics have been inserted in the document */ diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index b215c722751a..690a06600f91 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1685,7 +1685,7 @@ void SwWW8ImplReader::ImportDop() // COMPATIBILITY FLAGS START // - // #i78951# - remember the unknown compatability options + // #i78951# - remember the unknown compatibility options // so as to export them out rDoc.Setn32DummyCompatabilityOptions1( pWDop->GetCompatabilityOptions()); rDoc.Setn32DummyCompatabilityOptions2( pWDop->GetCompatabilityOptions2()); @@ -3035,7 +3035,7 @@ bool SwWW8ImplReader::HandlePageBreakChar() /* If its a 0x0c without a paragraph end before it, act like a paragraph end, but nevertheless, numbering (and perhaps other - similiar constructs) do not exist on the para. + similar constructs) do not exist on the para. */ //xushanchuan add for issue106569 if (!bWasParaEnd && IsTemp) @@ -4108,10 +4108,10 @@ void wwSectionManager::InsertSegments() //End getting the bounds of this section, quite a job eh ? SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); - //The last section if continous is always unbalanced + //The last section if continuous is always unbalanced if (pRet) { - //Set the columns to be UnBalanced if that compatability option + //Set the columns to be UnBalanced if that compatibility option //is set if (mrReader.pWDop->fNoColumnBalance) pRet->SetFmtAttr(SwFmtNoBalancedColumns(true)); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 93bc4a7d2c49..bc04b2891d99 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -886,8 +886,8 @@ struct ApoTestResults struct ANLDRuleMap { - SwNumRule* mpOutlineNumRule; // WinWord 6 numbering, varient 1 - SwNumRule* mpNumberingNumRule; // WinWord 6 numbering, varient 2 + SwNumRule* mpOutlineNumRule; // WinWord 6 numbering, variant 1 + SwNumRule* mpNumberingNumRule; // WinWord 6 numbering, variant 2 SwNumRule* GetNumRule(sal_uInt8 nNumType); void SetNumRule(SwNumRule*, sal_uInt8 nNumType); ANLDRuleMap() : mpOutlineNumRule(0), mpNumberingNumRule(0) {} diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c25ec260c2a3..05e24e4e2142 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -402,7 +402,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn() bFtnEdn = bOld; ASSERT(sChar.Len()==1 && ((rDesc.mbAutoNum == (sChar.GetChar(0) == 2))), - "footnote autonumbering must be 0x02, and everthing else must not be"); + "footnote autonumbering must be 0x02, and everything else must not be"); // If no automatic numbering use the following char from the main text // as the footnote number @@ -540,7 +540,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, /* #i1140# If I have a table and apply a style to one of its frames that should cause - a paragraph that its applied to it to only exist as a seperate floating + a paragraph that its applied to it to only exist as a separate floating frame, then the behavour depends on which cell that it has been applied to. If its the first cell of a row then the whole table row jumps into the new frame, if its not then then the paragraph attributes are applied @@ -2088,7 +2088,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : ApoTestResults aApo = pIo->TestApo(pIo->nInTable + 1, false, pTabPos); /* - ##513##, #79474# If this is not sufficent, then we should look at + ##513##, #79474# If this is not sufficient, then we should look at sprmPD{y|x}aAbs as our indicator that the following set of rows is not part of this table, but instead is an absolutely positioned table outside of this one @@ -2266,7 +2266,7 @@ void WW8TabDesc::CalcDefaults() } } /* - Similiar to graphics and other elements word does not totally + Similar to graphics and other elements word does not totally factor the width of the border into its calculations of size, we do so we must adjust out widths and other dimensions to fit. It appears that what occurs is that the last cell's right margin if @@ -2336,7 +2336,7 @@ void WW8TabDesc::CalcDefaults() #96345# If the last cell was "false" then there is no valid cell following it, so the default mapping forward wont't work. So map it (and - contigious invalid cells backwards to the last valid cell instead. + contiguous invalid cells backwards to the last valid cell instead. */ if (i && pR->bExist[i-1] == false) { diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index afdc94032fc0..a7e0855f6aae 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -155,7 +155,7 @@ public: //been explicitly set, it's set to the value //of pFmt->GetItemState(RES_LR_SPACE, false) //if it was possible to get the ItemState - //for L of the LR space independantly + //for L of the LR space independently bool bParaAutoBefore; // For Auto spacing before a paragraph bool bParaAutoAfter; // For Auto Spacing after a paragraph diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 8f417a4a52c1..498be3cfe564 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1219,7 +1219,7 @@ WW8ListManager::WW8ListManager( i.e. create a simple list in 2000 and open it in 97 and 97 will claim (correctly) that it is an outline list. We can set our - continous flag in these lists to store this information. + continuous flag in these lists to store this information. */ SwNumRule* pMyNumRule = CreateNextRule( aLST.bSimpleList || (aBits1 & 0x10)); @@ -1639,7 +1639,7 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition, #i1869# If this list has had its bits set in word 2000 to pretend that it is a simple list from the point of view of the user, then it is almost - certainly a simple continous list, and we will try to keep it like that. + certainly a simple continuous list, and we will try to keep it like that. Otherwise when we save again it will be shown as the true outline list that it is, confusing the user that just wanted what they thought was a simple list. On the otherhand it is possible that some of the other levels diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index a67d92426f0f..60f01e021a22 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -507,7 +507,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType, #101578# It is possible to have a number of date stamps for the created time of the change, (possibly a word bug) so we must use the "get a full - list" varient of HasCharSprm and take the last one as the true one. + list" variant of HasCharSprm and take the last one as the true one. */ std::vector<const sal_uInt8 *> aResult; bool bIns = (nsRedlineType_t::REDLINE_INSERT == eType); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 9316895f7cd6..8bffc4b7089f 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -406,7 +406,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) } //e.g. inserting bookmark around field result, so we need to put - //it around the entire writer field, as we don't have the seperation + //it around the entire writer field, as we don't have the separation //of field and field result of word, see #i16941# SwPosition aStart(*pPaM->GetPoint()); if (!maFieldStack.empty()) @@ -1271,7 +1271,7 @@ bookmarks were set with SET or ASK. (See SwWW8FltRefStack) The other piece of the puzzle is that refs that point to the "location" of the bookmark will in word actually point to the last location where the bookmark -was set with SET or ASK, not the actual bookmark. This is only noticable when +was set with SET or ASK, not the actual bookmark. This is only noticeable when a document sets the bookmark more than once. This is because word places the true bookmark at the location of the last set, but the refs will display the position of the first set before the ref. @@ -1298,7 +1298,7 @@ the field, which gives the same effect and meaning, to do so we must get any bookmarks in the field range, and begin them immediately before the set/ask field, and end them directly afterwards. MapBookmarkVariables returns an identifier of the bookmark attribute to close after inserting -the appropiate set/ask field. +the appropriate set/ask field. */ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF, String &rOrigName, const String &rData) @@ -3369,7 +3369,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { case TOX_CONTENT: { - //If we would be created from outlines, either explictly or by default + //If we would be created from outlines, either explicitly or by default //then see if we need extra styles added to the outlines sal_uInt16 eEffectivelyFrom = eCreateFrom ? eCreateFrom : nsSwTOXElement::TOX_OUTLINELEVEL; if (eEffectivelyFrom & nsSwTOXElement::TOX_OUTLINELEVEL) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 50073fbf2776..9ef115fd0be5 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1578,7 +1578,7 @@ bool SwWW8ImplReader::SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, nSetBorders has a bit set for each location that a sprm set a border, so with a sprm set, but no border, then disable the - appropiate border + appropriate border */ rBox.SetLine( 0, aIdArr[ i+1 ] ); } @@ -1955,7 +1955,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM, /* #95905#, #83307# seems to have gone away now, so reenable parallel wrapping support for frames in headers/footers. I don't know if we truly - have an explictly specified behaviour for these circumstances. + have an explicitly specified behaviour for these circumstances. */ nHeight = rWW.nSp45; @@ -2609,12 +2609,12 @@ void SwWW8ImplReader::StopApo() stack of attributes normally only places them into the document when the current insertion point has passed them by. Otherwise the end point of the attribute gets pushed along with the insertion point. The - insertion point is moved and the properties commited during + insertion point is moved and the properties committed during MoveOutsideFly. We also may want to remove the final paragraph in the frame, but we need to wait until the properties for that frame text - have been commited otherwise they will be lost. So we first get a + have been committed otherwise they will be lost. So we first get a handle to the last the filter inserted. After the attributes are - commited, if that paragraph exists we join it with the para after it + committed, if that paragraph exists we join it with the para after it that comes with the frame by default so that as normal we don't end up with one more paragraph than we wanted. */ @@ -2949,7 +2949,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor nI = nContigiousWestern; // The out of sequence western id else { - // The contigious western ids + // The contiguous western ids if (eVersion <= ww::eWW2) nI = static_cast< sal_uInt8 >(nId - 60); else if (eVersion < ww::eWW8) @@ -3440,7 +3440,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen ) { - //Has newer colour varient, ignore this old varient + //Has newer colour variant, ignore this old variant if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0x6870)) return; @@ -3946,7 +3946,7 @@ void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* , short nLen ) void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, short nLen ) { - //Has newer colour varient, ignore this old varient + //Has newer colour variant, ignore this old variant if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0xCA71)) return; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 12052d8bf316..72c77f0273a3 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -5001,7 +5001,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) settings its end to the current start, then store the starting position of the current range to clipstart. The pPcd sprms will end as normal (albeit earlier than originally expected), - and the existance of a clipstart will force the pPcd iterater + and the existence of a clipstart will force the pPcd iterater to reread the current set of sprms instead of advancing to its next set. Then the clipstart will be set as the starting position which will force them to be applied directly after @@ -5033,7 +5033,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) { /* For the case of a piece table we slave the piece table attribute iterator - to the piece table and access it through that only. They are two seperate + to the piece table and access it through that only. They are two separate structures, but act together as one logical one. The attributes only go to the next entry when the piece changes */ @@ -6457,7 +6457,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) break; nMax++; nLeft -= nNextSiz; - if( nLeft < 1 ) // can we read the given ammount of bytes ? + if( nLeft < 1 ) // can we read the given amount of bytes ? break; // increase p by nNextSiz Bytes p = (WW8_FFN *)( ( (sal_uInt8*)p ) + nNextSiz ); @@ -6626,9 +6626,9 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) footnote *and endnote!!* seperator,continuation seperator, and continuation notice entry, the documentation does not mention the endnote seperators, the documentation also gets the index numbers - backwards when specifiying which bits to test. The bottom six bits + backwards when specifying which bits to test. The bottom six bits of this value must be tested and skipped over. Each section's - grpfIhdt is then tested for the existence of the appropiate headers + grpfIhdt is then tested for the existence of the appropriate headers and footers, at the end of each section the nIdxOffset must be updated to point to the beginning of the next section's group of headers and footers in this PLCF, UpdateIndex does that task. @@ -7461,7 +7461,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) nL = static_cast< sal_uInt16 >(SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1); break; default: - ASSERT(!this, "Unknown sprm varient"); + ASSERT(!this, "Unknown sprm variant"); break; } break; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 2ca49778aa62..23538d34e910 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -73,7 +73,7 @@ namespace SL } /** - winword strings are typically Belt and Braces strings preceeded with a + winword strings are typically Belt and Braces strings preceded with a pascal style count, and ending with a c style 0 terminator. 16bit chars and count for ww8+ and 8bit chars and count for ww7-. The count and 0 can be checked for integrity to catch errors (e.g. lotus created documents) @@ -483,7 +483,7 @@ public: sal_uInt8* mpData; sal_uInt16 mnLen; - sal_uInt16 mnIStd; // only for Fkp.Papx (actualy Style-Nr) + sal_uInt16 mnIStd; // only for Fkp.Papx (actually Style-Nr) bool mbMustDelete; explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0), @@ -1564,15 +1564,15 @@ public: sal_uInt16 fWriteReservation : 1; sal_uInt16 fLockRev : 1; // when 1, the current revision marking state is locked sal_uInt16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts - // compatability options + // compatibility options sal_uInt16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent sal_uInt16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters - sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break + sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, suppress the paragraph Space Before and Space After options after a page break sal_uInt16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line sal_uInt16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers sal_uInt16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts sal_uInt16 copts_fConvMailMergeEsc : 1; - sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page + sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, suppress extra line spacing at top of page sal_uInt16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh sal_uInt16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures sal_uInt16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames @@ -1625,7 +1625,7 @@ public: /* bei nFib >= 103 gehts weiter: */ - sal_uInt32 fNoTabForInd :1; // see above in compatability options + sal_uInt32 fNoTabForInd :1; // see above in compatibility options sal_uInt32 fNoSpaceRaiseLower :1; // see above sal_uInt32 fSupressSpbfAfterPageBreak :1; // see above sal_uInt32 fWrapTrailSpaces :1; // see above diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 0f3b5a11ab7c..743cc901bf1c 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -817,7 +817,7 @@ struct WW8_PCD // properties of the piece. }; -// AnnoTation Refernce Descriptor (ATRD) +// AnnoTation References Descriptor (ATRD) struct WW8_ATRD // fuer die 8-Version { SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 85a5352d438d..1f33ff7fe792 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -336,7 +336,7 @@ sal_Int32 ReadThroughComponent( if (!bContainsStream ) { // stream name not found! Then try the compatibility name. - // if no stream can be opened, return immediatly with OK signal + // if no stream can be opened, return immediately with OK signal // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 9f2982d682be..7ad8ea82756f 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1422,7 +1422,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC // SO8. Unfortunately, only part of it and by using the same compatibility option // like in SO8. Therefore documents generated with SO7pp4, containing // numbered paragraphs with first line indent differ between SO7pp4 and - // SO8. In order to fix this for SO8pp1, I introduce a new compatiblity + // SO8. In order to fix this for SO8pp1, I introduce a new compatibility // flag 'bIgnoreFirstLineIndentInNumbering'. This flag has to be set for all // documents < SO8, but not for SO8. So if the property is not present, the // flag will be set to 'true'. SO8 documents surely have the diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 843f8723cf0c..4bc737e11345 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -48,14 +48,14 @@ namespace rtl { class OUString; } struct SvXMLItemMapEntry { - sal_uInt16 nNameSpace; // declares the Namespace in wich this item + sal_uInt16 nNameSpace; // declares the Namespace in which this item // exists enum ::xmloff::token::XMLTokenEnum eLocalName; // the local name for the item inside // the Namespace (as an XMLTokenEnum) sal_uInt16 nWhichId; // the WichId to identify the item // in the pool - sal_uInt32 nMemberId; // the memberid specifies wich part + sal_uInt32 nMemberId; // the memberid specifies which part // of the item should be imported or // exported with this Namespace // and localName diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index c86b7cd66bc9..40f110f6847e 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2531,7 +2531,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) sal_Int32 nExtraRel = nRelWidth - (nRelCols * nMinRelColWidth); // The absolute space that may be distributed in addition to - // minumum widthed columns. + // minimum widthed columns. sal_Int32 nMinAbs = nRelCols * MINLAY; sal_Int32 nExtraAbs = nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 7b3dd1cc0df3..e6002d6d46c9 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1809,7 +1809,7 @@ void SwInsertDBColAutoPilot::Load() rtl::OUString sColumn; pSubProps[0] >>= sColumn; - //check for existance of the loaded column name + //check for existence of the loaded column name sal_Bool bFound = sal_False; for(sal_Int32 nRealColumn = 0; nRealColumn < aDBColumns.Count(); nRealColumn++) { diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx index e9061b9ff06b..7a7f23a81f50 100644 --- a/sw/source/ui/dbui/maildispatcher.cxx +++ b/sw/source/ui/dbui/maildispatcher.cxx @@ -112,7 +112,7 @@ MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) : throw uno::RuntimeException(); // wait until the mail dispatcher thread is really alive - // and has aquired a reference to this instance of the + // and has acquired a reference to this instance of the // class mail_dispatcher_active_.wait(); } @@ -242,7 +242,7 @@ void MailDispatcher::sendMailMessageNotifyListener(uno::Reference<mail::XMailMes void MailDispatcher::run() { - // aquire a self reference in order to avoid race + // acquire a self reference in order to avoid race // conditions. The last client of this class must // call shutdown before releasing his last reference // to this class in order to shutdown this thread diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index 9035985a2c7f..6248f9618815 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -159,7 +159,7 @@ void SwDbtoolsClient::getFactory() if (pDBTFactory) { m_xDataAccessFactory = pDBTFactory; - // by definition, the factory was aquired once + // by definition, the factory was acquired once m_xDataAccessFactory->release(); } } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 4317410817b7..20c650a3c6dd 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -3865,7 +3865,7 @@ void SwTrnsfrDdeLink::Disconnect( sal_Bool bRemoveDataAdvise ) sal_Bool bIsModified = pDoc->IsModified(); IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); - // check, if DdeBookmark is already in its desctruction + // check, if DdeBookmark is already in its destruction IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->findMark(sName); if ( ppMark != pMarkAccess->getAllMarksEnd() ) { diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 85469069bd17..892512848b75 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -127,7 +127,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView) SW_MOD()->GetRedlineAuthor(); // collect all PostIts and redline comments that exist after loading the document - // don't check for existance for any of them, don't focus them + // don't check for existence for any of them, don't focus them AddPostIts(false,false); /* this code can be used once we want redline comments in the Sidebar AddRedlineComments(false,false); @@ -609,9 +609,9 @@ void SwPostItMgr::LayoutPostIts() mbLayouting = true; //loop over all pages and do the layout - // - create SwPostIt if neccessary + // - create SwPostIt if necessary // - place SwPostIts on their initial position - // - calculate neccessary height for all PostIts together + // - calculate necessary height for all PostIts together bool bUpdate = false; for (unsigned long n=0;n<mPages.size();n++) { @@ -855,7 +855,7 @@ bool SwPostItMgr::BorderOverPageBorder(unsigned long aPage) const void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage) { DBG_ASSERT((lScroll % GetScrollSize() )==0,"SwPostItMgr::Scroll: scrolling by wrong value"); - // do not scroll more than neccessary up or down + // do not scroll more than necessary up or down if ( ((mPages[aPage-1]->lOffset == 0) && (lScroll>0)) || ( BorderOverPageBorder(aPage) && (lScroll<0)) ) return; @@ -1002,7 +1002,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons bool bDone = false; bool bScrollbars = false; - // do all neccessary resizings + // do all necessary resizings if (lVisibleHeight < lNeededHeight) { // ok, now we have to really resize and adding scrollbars @@ -1212,7 +1212,7 @@ void SwPostItMgr::RemoveSidebarWin() } // copy to new vector, otherwise RemoveItem would operate and delete stuff on mvPostItFlds as well -// RemoveItem will clean up the core field and visible postit if neccessary +// RemoveItem will clean up the core field and visible postit if necessary // we cannot just delete everything as before, as postits could move into change tracking void SwPostItMgr::Delete(String aAuthor) { diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 6ab8561db998..3af6c58c8c45 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -1448,7 +1448,7 @@ void SwRedComment::MouseButtonDown( const MouseEvent& rMEvt ) void SwRedComment::Delete() { SwSidebarWin::Delete(); - // we are not neccessarily on our redline, so let's move there + // we are not necessarily on our redline, so let's move there GotoPos(); DocView()->GetWrtShell().SetRedlineComment(EMPTYSTRING); DocView()->GetWrtShell().ClearMark(); diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 7764701557b8..6836fb982392 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -5506,7 +5506,7 @@ void SwEditWin::SetChainMode( sal_Bool bOn ) uno::Reference< ::com::sun::star::accessibility::XAccessible > SwEditWin::CreateAccessible() { vos::OGuard aGuard(Application::GetSolarMutex()); // this should have - // happend already!!! + // happened already!!! SwWrtShell *pSh = rView.GetWrtShellPtr(); ASSERT( pSh, "no writer shell, no accessible object" ); uno::Reference< diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index ffb3ff365b3f..694ac9da099a 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -208,7 +208,7 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames() { static const char* aLabelPropNames[] = { - "Medium/Continous", // 0 + "Medium/Continuous", // 0 "Medium/Brand", // 1 "Medium/Type", // 2 "Format/Column", // 3 @@ -302,7 +302,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : bNoConfigValues = sal_False; switch(nProperty) { - case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continous", + case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continuous", case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand", case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type", case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column", @@ -419,7 +419,7 @@ void SwLabCfgItem::Commit() nProperty += 3; switch(nProperty) { - case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continous", + case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continuous", case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand", case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type", case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column", diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx index 4ebeea506f42..44e95bccc7df 100644 --- a/sw/source/ui/inc/tablemgr.hxx +++ b/sw/source/ui/inc/tablemgr.hxx @@ -76,7 +76,7 @@ public: // @deprecated void UpdateChart(); - /// @return the XModel of the newly inserted chart if successfull + /// @return the XModel of the newly inserted chart if successful ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 ); }; diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index 766079ab2f0d..9c2b4851df70 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -81,7 +81,7 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent, String GetAppLangDateTimeString( const DateTime& ); -// search for a command string withing the menu structure and execute it +// search for a command string within the menu structure and execute it // at the dispatcher if there is one, if executed return true bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId ); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index ce800f3bcefa..855d5f3c5d03 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -740,7 +740,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) String aTmp( aSuggestions[ nAltIdx ] ); String aOrig( bGrammarResults ? OUString() : xSpellAlt->getWord() ); - // if orginal word has a trailing . (likely the end of a sentence) + // if original word has a trailing . (likely the end of a sentence) // and the replacement text hasn't, then add it to the replacement if (aTmp.Len() && aOrig.Len() && '.' == aOrig.GetChar( aOrig.Len() - 1) && /* !IsAlphaNumeric ??*/ diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 63657ef9903d..fb62ee957e66 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -656,7 +656,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale )) rSet.DisableItem( SID_THES ); - //! avoid puting the same item as SfxBoolItem at the end of this function + //! avoid putting the same item as SfxBoolItem at the end of this function nSlotId = 0; break; } diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.hxx b/sw/source/ui/sidebar/WrapPropertyPanel.hxx index 292cb1e22d6b..cac77ade11ce 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.hxx @@ -72,7 +72,7 @@ namespace sw { namespace sidebar { ImageList aWrapIL; ImageList aWrapILH; - //Controler Items================================== + //Controller Items================================== ::sfx2::sidebar::ControllerItem maSwNoWrapControl; ::sfx2::sidebar::ControllerItem maSwWrapLeftControl; ::sfx2::sidebar::ControllerItem maSwWrapRightControl; diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 30b44467bfc8..a4953543353f 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -2131,7 +2131,7 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > SwPagePreViewWin::CreateAccessible() { vos::OGuard aGuard(Application::GetSolarMutex()); // this should have - // happend already!!! + // happened already!!! DBG_ASSERT( GetViewShell() != NULL, "We need a view shell" ); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( sal_False ); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 9d7caaf13348..72299b59c59d 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1013,7 +1013,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) //GetViewFrame()->ShowChildWindow(nSlot, bShow && bInMailMerge); if((bShow && bInMailMerge) != GetViewFrame()->HasChildWindow(nSlot)) GetViewFrame()->ToggleChildWindow(nSlot); - //if fields have been succesfully inserted call the "real" + //if fields have been successfully inserted call the "real" //mail merge dialog SwWrtShell &rSh = GetWrtShell(); if(bInMailMerge && rSh.IsAnyDatabaseFieldInDoc()) diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 90b4e674dbf1..417f71c161ad 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -714,7 +714,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) { //Hier wieder auskommentieren wenn das mitscrollen nicht gewuenscht ist. // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE, - // so we dont must do it agin. + // so we dont must do it again. EndScrollHdl(pScrollbar); if ( Help::IsQuickHelpEnabled() && @@ -730,7 +730,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) if(pWrtShell->GetPageNumber( aPos.Y(), sal_False, nPhNum, nVirtNum, sDisplay )) { // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE, - // so we dont must do it agin. + // so we dont must do it again. // if(!GetViewFrame()->GetFrame().IsInPlace()) // S F X_BINDINGS().Update(FN_STAT_PAGE); diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index 732f32ddc5e4..6f2b765d5f54 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -60,7 +60,7 @@ SwXDispatchProviderInterceptor::SwXDispatchProviderInterceptor(SwView& rVw) : m_refCount++; m_xIntercepted->registerDispatchProviderInterceptor((frame::XDispatchProviderInterceptor*)this); // this should make us the top-level dispatch-provider for the component, via a call to our - // setDispatchProvider we should have got an fallback for requests we (i.e. our master) cannot fullfill + // setDispatchProvider we should have got an fallback for requests we (i.e. our master) cannot fulfill uno::Reference< lang::XComponent> xInterceptedComponent(m_xIntercepted, uno::UNO_QUERY); if (xInterceptedComponent.is()) xInterceptedComponent->addEventListener((lang::XEventListener*)this); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index fa5fdf3c72d8..8e842a90ad67 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -111,7 +111,7 @@ osl::Mutex & GetMailMergeMutex() enum CloseResult { eSuccess, // successfully closed - eVetoed, // vetoed, ownership transfered to the vetoing instance + eVetoed, // vetoed, ownership transferred to the vetoing instance eFailed // failed for some unknown reason }; static CloseResult CloseModelAndDocSh( @@ -279,7 +279,7 @@ namespace try { sal_Bool bDeliverOwnership = ( 0 == m_nPendingDeleteAttempts ); - // if this is our last attemt, then anybody which vetoes this has to take the consequences + // if this is our last attempt, then anybody which vetoes this has to take the consequences // (means take the ownership) m_xDocument->close( bDeliverOwnership ); bSuccess = sal_True; @@ -448,7 +448,7 @@ SwXMailMerge::~SwXMailMerge() //! because there is no automatism that will do that later. //! #120086# if ( eVetoed == CloseModelAndDocSh( xModel, xDocSh ) ) - DBG_WARNING( "owner ship transfered to vetoing object!" ); + DBG_WARNING( "owner ship transferred to vetoing object!" ); xModel = 0; xDocSh = 0; // destroy doc shell diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 9f9da57b2305..29b9752b59cb 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1253,7 +1253,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption OUString sFileURL; if ( (rProp.Value >>= sFileURL ) ) { - // Convert the File URL into a system dependant path, as the SalPrinter expects + // Convert the File URL into a system dependent path, as the SalPrinter expects OUString sSystemPath; FileBase::getSystemPathFromFileURL ( sFileURL, sSystemPath ); aReq.AppendItem(SfxStringItem( SID_FILE_NAME, sSystemPath ) ); diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 03739865dd08..baee177a2753 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -65,7 +65,7 @@ static sal_Bool bStartDrag = sal_False; void SwWrtShell::Invalidate() { - // to avoid making the slot volatile, invalidate it everytime if something could have been changed + // to avoid making the slot volatile, invalidate it every time if something could have been changed // this is still much cheaper than asking for the state every 200 ms (and avoid background processing) GetView().GetViewFrame()->GetBindings().Invalidate( FN_STAT_SELMODE ); } |