diff options
Diffstat (limited to 'sw/source')
29 files changed, 38 insertions, 38 deletions
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 75a2f1b74198..19590a968e4b 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -285,7 +285,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 = m_pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode(); diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index c0836b0c24c1..18d8a4cff1d1 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1422,7 +1422,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const bFnd = true; } - // Not found or no dependecies? + // Not found or no dependencies? if( bFnd && pNewFmt->GetDepends() ) { // Check if we have dependent ContentNodes in the Nodes array diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 6696c1dc3d1c..f83f2deb669c 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -209,7 +209,7 @@ void SwNode::dumpAsXml( xmlTextWriterPtr w ) break; case ND_STARTNODE: case ND_TEXTNODE: - abort(); // overriden + abort(); // overridden case ND_TABLENODE: name = "table"; break; diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx index 364f2b8dbc9b..bbcf16976fc3 100644 --- a/sw/source/core/fields/ddetbl.cxx +++ b/sw/source/core/fields/ddetbl.cxx @@ -67,7 +67,7 @@ SwDDETable::~SwDDETable() GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() ) pFldTyp->DecRefCnt(); - // If it is the last dependant of the "deleted field" than delete it finally + // If it is the last dependent of the "deleted field" than delete it finally if( pFldTyp->IsDeleted() && pFldTyp->IsLastDepend() ) { pFldTyp->Remove( &aDepend ); diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 6f17a43b7935..c46c58f70b1b 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -424,7 +424,7 @@ public: SvxShadowLocation GetShadowLocation() const { return m_aShadowLocation; } /** - * Get the absolute shadow location dependant from orientation. + * Get the absolute shadow location dependent from orientation. * * @param[in] bVertLayout true, if the container layout is vertical * false, otherwise @@ -433,7 +433,7 @@ public: SvxShadowLocation GetAbsShadowLocation( const bool bVertLayout ) const; /** - * Calculate the shadow space on the specified side dependant from + * Calculate the shadow space on the specified side dependent from * the orientation and connection with neightbours. * @see shaditem.hxx for integer constants of sides * diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index d5ae1c877d22..d8e0de48d2de 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3832,7 +3832,7 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) if ( 0 == ( pUserCall = GetUserCall(pObj) ) ) return sal_True; - //Attribute dependant, don't paint for printer or Preview + //Attribute dependent, don't paint for printer or Preview sal_Bool bPaint = pFlyOnlyDraw || ((SwContact*)pUserCall)->GetFmt()->GetPrint().GetValue(); if ( !bPaint ) diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 5d33091c645a..bc71e1344a25 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2613,7 +2613,7 @@ 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()) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 6e94f608551d..de9ab9db93d4 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1465,7 +1465,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ sal_Int32 nLangBegin = nBegin; sal_Int32 nLangEnd = nEnd; - // smart tag recognization has to be done for each language portion: + // smart tag recognition has to be done for each language portion: SwLanguageIterator aIter( *pNode, nLangBegin ); do diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index c498db93e372..a2f399b3a976 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -127,10 +127,10 @@ CSS1Token CSS1Parser::GetNextToken() // COMMENT cNextCh = GetNextChar(); - sal_Bool bAsterix = sal_False; - while( !(bAsterix && '/'==cNextCh) && !IsEOF() ) + sal_Bool bAsterisk = sal_False; + while( !(bAsterisk && '/'==cNextCh) && !IsEOF() ) { - bAsterix = ('*'==cNextCh); + bAsterisk = ('*'==cNextCh); cNextCh = GetNextChar(); } } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c8aa7a0d1250..924aa1b759a9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2123,7 +2123,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; - // Cell prefered width + // Cell preferred width SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )->at( pTableTextNodeInfoInner->getCell() ); if ( pTableTextNodeInfoInner->getCell() ) nWidth = nWidth - GetGridCols( pTableTextNodeInfoInner )->at( pTableTextNodeInfoInner->getCell() - 1 ); @@ -2351,7 +2351,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // Create the SwWriteTable instance to use col spans (and maybe other infos) GetTablePageSize( pTableTextNodeInfoInner.get(), 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::number( nPageSize ).getStr( ), diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 10f2f8de7beb..eb7f8044a882 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -159,7 +159,7 @@ public: void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); protected: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl(); /// Output page/section breaks diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index cfcabb8ccf7a..992793200049 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.hxx @@ -38,7 +38,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/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 20b4c0147590..9e30cf3465bd 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -104,7 +104,7 @@ public: virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); protected: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl(); virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {} diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 750bdb457900..2a1f0529f920 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -752,7 +752,7 @@ public: int GetGrfIndex(const SvxBrushItem& rBrush); protected: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl() = 0; /// Get the next position in the text node to output @@ -940,7 +940,7 @@ public: virtual bool SupportsUnicode() const { return bWrtWW8; } private: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl(); void PrepareStorage(); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 6b6ffdf95236..c59897f6543e 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1984,7 +1984,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, aPoly.Scale(aMapPolyX, aMapPolyY); // #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/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 651800ba1756..8c91d5203838 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -686,7 +686,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, case 0x0394: // And this is really just a guess, but a mere presence of this // flag makes a horizontal rule be as wide as the page (unless - // overriden by something), so it probably matches o:hr from .docx. + // overridden by something), so it probably matches o:hr from .docx. pImpRec->isHorizontalRule = true; break; } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index e04d00a56439..e7f7e4d6667a 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -255,7 +255,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/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 4d454e14c0d6..d09db9762626 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1101,7 +1101,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS) delete[] pNewSHDs, pNewSHDs = 0; } - short nFileCols = nLen / ( bVer67 ? 10 : 20 ); // realy saved + short nFileCols = nLen / ( bVer67 ? 10 : 20 ); // really saved if (!pTCs && nCols) { diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 82962db1ab52..c0caa3bb042d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -387,7 +387,7 @@ struct WW8LFOLVL // (siehe Kommentar unten bei struct WW8LFOInfo) sal_uInt8 bStartAt :1; // true if the start-at value is overridden - sal_uInt8 bFormat :1; // true if the formatting is overriden + sal_uInt8 bFormat :1; // true if the formatting is overridden WW8LFOLVL() : nStartAt(1), nLevel(0), bStartAt(1), bFormat(0) {} diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index b1d3767c2474..6cd7fc4b9818 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -206,7 +206,7 @@ void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt ) } } if (bDone) - mrSidebarWin.ResizeIfNeccessary( aOldHeight, mrSidebarWin.GetPostItTextHeight() ); + mrSidebarWin.ResizeIfNecessary( aOldHeight, mrSidebarWin.GetPostItTextHeight() ); else { // write back data first when showing navigator diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 4cf128a85d0d..1362a83ff094 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -671,7 +671,7 @@ void SwSidebarWin::SetScrollbar() mpVScrollbar->SetThumbPos( mpOutlinerView->GetVisArea().Top()+ mpOutlinerView->GetEditView().GetCursor()->GetOffsetY()); } -void SwSidebarWin::ResizeIfNeccessary(long aOldHeight, long aNewHeight) +void SwSidebarWin::ResizeIfNecessary(long aOldHeight, long aNewHeight) { if (aOldHeight != aNewHeight) { diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 688edfe69030..93607fb044d6 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -532,7 +532,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) if (m_rView.GetDrawFuncPtr() && m_rView.GetDrawFuncPtr()->IsInsertForm() && !bHitHandle) SetPointer( POINTER_DRAW_RECT ); else - SetPointer( pSdrView->GetPreferedPointer( rLPt, rSh.GetOut() ) ); + SetPointer( pSdrView->GetPreferredPointer( rLPt, rSh.GetOut() ) ); } } else diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx index ba20764b1306..e0242db41504 100644 --- a/sw/source/ui/docvw/romenu.hxx +++ b/sw/source/ui/docvw/romenu.hxx @@ -57,7 +57,7 @@ public: void Execute( Window* pWin, sal_uInt16 nId ); }; -void GetPreferedExtension( OUString &rExt, const Graphic &rGrf ); +void GetPreferredExtension( OUString &rExt, const Graphic &rGrf ); #endif diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index a5b29cd4e752..50d319d24348 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -195,7 +195,7 @@ Sequence<OUString> SwLabCfgItem::GetPropertyNames() { static const char* aLabelPropNames[] = { - "Medium/Continous", // 0 + "Medium/Continuous", // 0 "Medium/Brand", // 1 "Medium/Type", // 2 "Format/Column", // 3 @@ -289,7 +289,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : bNoConfigValues = 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", @@ -412,7 +412,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/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 693a8e58f5ca..3d77891ef2dd 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -674,7 +674,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) OUString aTmp( m_aSuggestions[ nAltIdx ] ); OUString aOrig( m_bGrammarResults ? OUString() : m_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.isEmpty() && !aOrig.isEmpty() && aOrig.endsWith(".") && /* !IsAlphaNumeric ??*/ diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index 0064e9e1dfd1..2ae8b03f0e6c 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -555,7 +555,7 @@ void SwDrawBase::SetDrawPointer() SdrView *pSdrView = m_pSh->GetDrawView(); Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); aPnt = m_pWin->PixelToLogic(m_pWin->ScreenToOutputPixel(aPnt)); - const Pointer aPointTyp = pSdrView->GetPreferedPointer(aPnt, m_pSh->GetOut()); + const Pointer aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut()); const Pointer aDrawPt(aPointTyp); m_pWin->SetPointer(aDrawPt); } diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 1106013b376e..6f1b45d548d6 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -932,7 +932,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) break; } } - pPostItMgr->GetActiveSidebarWin()->ResizeIfNeccessary(aOldHeight,pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight()); + pPostItMgr->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight()); } void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet) @@ -1506,7 +1506,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq) rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False); if (rView.GetPostItMgr()->HasActiveSidebarWin()) - rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNeccessary(aOldHeight,rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()); + rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()); } void SwAnnotationShell::StateUndo(SfxItemSet &rSet) diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 4fbdc9a7d5c1..67086b3275cb 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1154,7 +1154,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 ) ); @@ -2764,7 +2764,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( { // we just state what output size we would need // which may cause vcl to set that page size on the printer - // (if available and not overriden by the user) + // (if available and not overridden by the user) aTmpSize = pVwSh->GetPageSize( nPage, bIsSkipEmptyPages ); aPreferredPageSize = awt::Size ( TWIP_TO_MM100( 2 * aTmpSize.Width() ), TWIP_TO_MM100( aTmpSize.Height() )); diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 68df58e95b88..e60cfa0fa884 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -124,7 +124,7 @@ void SwWebView::SelectShell() { rDispatcher.Flush(); // really delete all cached shells - //Additonal to the old selection remember which toolbar was visible. + //Additional to the old selection remember which toolbar was visible. sal_Int32 nId = rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT ); if ( nId ) pBarCfg->SetTopToolbar( _nSelectionType, nId ); |