diff options
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 23 | ||||
| -rw-r--r-- | xmloff/source/transform/Oasis2OOo.cxx | 11 |
2 files changed, 15 insertions, 19 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 33d53347c605..26ae76bfe086 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1579,7 +1579,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) if ( IsAgain() ) return false; - // for savety reasons: + // for safety reasons: // check page number before formatting lowers. if ( pOldPage->GetPhyPageNum() > (pTab->FindPageFrame()->GetPhyPageNum() + 1) ) SetNextCycle( true ); @@ -1608,7 +1608,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) while ( pContent && pPage->IsAnLower( pContent ) ) { - // If the Content didn't change, we can use a few shortcuts. + // If the content didn't change, we can use a few shortcuts. const bool bFull = !pContent->IsValid() || pContent->IsCompletePaint() || pContent->IsRetouche() || pContent->GetDrawObjs(); if ( bFull ) @@ -1676,7 +1676,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) if ( nCurNum < pPage->GetPhyPageNum() ) m_nPreInvaPage = nCurNum; - // If the Frame flowed backwards more than one page, we need to + // If the frame flowed backwards more than one page, we need to // start over again from the beginning, so nothing gets left out. if ( !IsCalcLayout() && pPage->GetPhyPageNum() > nCurNum+1 ) { @@ -1688,7 +1688,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) } } } - // If the Frame moved forwards to the next page, we re-run through + // If the frame moved forwards to the next page, we re-run through // the predecessor. // This way, we catch predecessors which are now responsible for // retouching, but the footers will be touched also. @@ -1742,7 +1742,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage ) m_pImp->GetShell()->AddPaintRect( pContent->Frame() ); } - // Do this if the Frame has been formatted before. + // Do this if the frame has been formatted before. if ( pContent->IsTextFrame() && static_cast<const SwTextFrame*>(pContent)->HasRepaint() && IsPaint() ) PaintContent( pContent, pPage, pContent->Frame(), pContent->Frame().Bottom()); @@ -1811,8 +1811,8 @@ void SwLayAction::FormatContent_( const SwContentFrame *pContent, } } -/// Returns true if all Contents of the Fly have been processed completely. -/// Returns false if processing has been interrupted prematurely. +// Returns true if all Contents of the Fly have been processed completely. +// Returns false if processing has been interrupted prematurely. bool SwLayAction::FormatFlyContent( const SwFlyFrame *pFly ) { const SwContentFrame *pContent = pFly->ContainsContent(); @@ -1821,10 +1821,8 @@ bool SwLayAction::FormatFlyContent( const SwFlyFrame *pFly ) { FormatContent_( pContent, pContent->FindPageFrame() ); - // format floating screen objects - // at content text frame - // pass correct page frame - // to the object formatter. + // format floating screen objects at content text frame + // pass correct page frame to the object formatter. if ( pContent->IsTextFrame() && !SwObjectFormatter::FormatObjsAtFrame( *(const_cast<SwContentFrame*>(pContent)), @@ -1851,7 +1849,7 @@ bool SwLayAction::FormatFlyContent( const SwFlyFrame *pFly ) if ( !pFly->IsFlyInContentFrame() ) { CheckIdleEnd(); - // OD 14.04.2003 #106346# - consider interrupt formatting. + // consider interrupt formatting. if ( IsInterrupt() && !mbFormatContentOnInterrupt ) return false; } @@ -2191,7 +2189,6 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) : // If there are accrued paints, it's best to simply invalidate // the whole window. Otherwise there would arise paint problems whose // solution would be disproportionally expensive. - //fix(18176): SwViewShellImp *pViewImp = rSh.Imp(); bool bUnlock = false; if ( pViewImp->GetRegion() ) diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index b5784f520344..6363735e27c2 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -94,7 +94,7 @@ enum XMLUserDefinedTransformerAction #define ENTRY0( n, l, a ) \ ENTRY3( n, l, a, 0, 0, 0 ) -// BM: a macro to put two tokens into one sal_Int32 for the action +// a macro to put two tokens into one sal_Int32 for the action // XML_ATACTION_RENAME_ATTRIBUTE #define RENAME_ENTRY( f, s ) \ (static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16)) @@ -369,9 +369,8 @@ static XMLTransformerActionInit aActionTable[] = OASIS_TEXT_STYLE_REF_ACTIONS ), /* generated entry */ ENTRY1( DRAW, PAGE, XML_ETACTION_PROC_ATTRS, OASIS_MASTER_PAGE_REF_ACTIONS ), /* generated entry */ - /* Conversion of attribute <table:style-name> for <table:table-row> and - <table:table-column> (#i40011#, #i40015#) - */ + // Conversion of attribute <table:style-name> for <table:table-row> and + // <table:table-column> (#i40011#, #i40015#) ENTRY1( TABLE, TABLE_ROW, XML_ETACTION_PROC_ATTRS, OASIS_TABLE_STYLE_REF_ACTIONS ), ENTRY1( TABLE, TABLE_COLUMN, XML_ETACTION_PROC_ATTRS, @@ -748,7 +747,7 @@ static XMLTransformerActionInit aShapeActionTable[] = XML_NAMESPACE_FORM, XML_ID ), ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(true) ), - // BM: needed by chart:legend. The legend needs also the draw actions. As + // needed by chart:legend. The legend needs also the draw actions. As // there is no merge mechanism, all actions have to be in the same table ENTRY2( CHART, LEGEND_POSITION, XML_ATACTION_RENAME_ATTRIBUTE, RENAME_ENTRY( XML_START, XML_LEFT ), @@ -1196,7 +1195,7 @@ void XMLTableTransformerContext_Impl::StartElement( } pMutableAttrList->RemoveAttributeByIndex( i ); } - // OD 2005-07-05 #i50521# - no break here for savety reason. + // #i50521# - no break here for safety reason. } // Convert attribute table:style-name for <table:table> (#i40011#, #i40015#) else if ( IsXMLToken( aLocalName, XML_STYLE_NAME ) ) |