diff options
Diffstat (limited to 'sw/source/core/layout')
| -rw-r--r-- | sw/source/core/layout/dbg_lay.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 612555369e92..8c61c12ddd91 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -294,7 +294,7 @@ void SwImplProtocol::CheckLine( OString& rLine ) rLine = rLine.replace( '\t', ' ' ); if( '#' == rLine[0] ) // comments start with '#' return; - if( '[' == rLine[0] ) // section: FrameIds, type or funciton + if( '[' == rLine[0] ) // section: FrameIds, type or function { OString aTmp = rLine.getToken(0, ']'); if (aTmp == "[frmid") // section FrameIds diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 986f7bb239e8..874c77cd7bea 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -387,7 +387,7 @@ SwFrameNotify::~SwFrameNotify() // This could be optimized. Basically the fly frame only has to // be invalidated, if the first line of pFrame (if pFrame is a content - // frame, for other frame types its the print area) has changed its + // frame, for other frame types it's the print area) has changed its // size and pFrame was responsible for the current width of pFly. On // the other hand, this is only rarely used and re-calculation of // the fly frame does not cause too much trouble. So we keep it this diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 0465936332ec..ecab038e80da 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -374,7 +374,7 @@ void SwFrame::DestroyImpl() SwFrame::~SwFrame() { assert(m_isInDestroy); // check that only DestroySwFrame does "delete" - assert(!IsDeleteForbidden()); // check that its not deleted while deletes are forbidden + assert(!IsDeleteForbidden()); // check that it's not deleted while deletes are forbidden #if OSL_DEBUG_LEVEL > 0 // JP 15.10.2001: for detection of access to deleted frames mpDrawObjs = reinterpret_cast<SwSortedObjs*>(0x33333333); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index d7788ff95859..93d01cf671fc 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -267,7 +267,7 @@ static void lcl_InvalidateLowerObjs( SwLayoutFrame& _rLayoutFrame, if ( _bMoveObjsOutOfRange ) { // indicate, that positioning is progress to avoid - // modification of the anchored object resp. its attributes + // modification of the anchored object resp. it's attributes // due to the movement SwObjPositioningInProgress aObjPosInProgress( *pAnchoredObj ); pAnchoredObj->SetObjLeft( _pPageFrame->Frame().Right() ); @@ -2428,7 +2428,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) if ( pNxt ) { // #i18103# - no formatting of found next - // frame, if its a follow section of the + // frame, if it's a follow section of the // 'ColLocked' section, the follow table is // in. bool bCalcNxt = true; @@ -2587,7 +2587,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper, // #i26945# - correction of conditions, // if Writer fly frame has to be considered: // - no need to check, if top of Writer fly frame differs - // from FAR_AWAY, because its also check, if the Writer + // from FAR_AWAY, because it's also checked, if the Writer // fly frame rectangle overlaps with <aRect> // - no check, if bottom of anchor frame is prior the top of // the table, because Writer fly frames can be negative positioned. |