diff options
Diffstat (limited to 'sw/source/core/doc/docedt.cxx')
| -rw-r--r-- | sw/source/core/doc/docedt.cxx | 274 |
1 files changed, 137 insertions, 137 deletions
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index a83eb030d0fd..8bc9e088da7f 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -60,7 +60,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx, { // create new anchor _SaveFly& rSave = rArr[n]; - SwFrmFmt* pFmt = rSave.pFrmFmt; + SwFrameFormat* pFormat = rSave.pFrameFormat; if( rSave.bInsertPosition ) { @@ -73,34 +73,34 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx, aPos.nNode = rSttIdx.GetIndex() + rSave.nNdDiff; aPos.nContent.Assign( 0, 0 ); - SwFmtAnchor aAnchor( pFmt->GetAnchor() ); + SwFormatAnchor aAnchor( pFormat->GetAnchor() ); aAnchor.SetAnchor( &aPos ); - pFmt->GetDoc()->GetSpzFrmFmts()->push_back( pFmt ); - pFmt->SetFmtAttr( aAnchor ); - SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode(); - if( pCNd && pCNd->getLayoutFrm( pFmt->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) ) - pFmt->MakeFrms(); + pFormat->GetDoc()->GetSpzFrameFormats()->push_back( pFormat ); + pFormat->SetFormatAttr( aAnchor ); + SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode(); + if( pCNd && pCNd->getLayoutFrm( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) ) + pFormat->MakeFrms(); } } void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr ) { - SwFrmFmts& rFmts = *rRg.aStart.GetNode().GetDoc()->GetSpzFrmFmts(); - for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n ) + SwFrameFormats& rFormats = *rRg.aStart.GetNode().GetDoc()->GetSpzFrameFormats(); + for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n ) { - SwFrmFmt *const pFmt = rFmts[n]; - SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor(); - SwPosition const*const pAPos = pAnchor->GetCntntAnchor(); + SwFrameFormat *const pFormat = rFormats[n]; + SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor(); + SwPosition const*const pAPos = pAnchor->GetContentAnchor(); if (pAPos && ((FLY_AT_PARA == pAnchor->GetAnchorId()) || (FLY_AT_CHAR == pAnchor->GetAnchorId())) && rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd ) { _SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(), - pFmt, false ); + pFormat, false ); rArr.push_back( aSave ); - pFmt->DelFrms(); - rFmts.erase( rFmts.begin() + n-- ); + pFormat->DelFrms(); + rFormats.erase( rFormats.begin() + n-- ); } } } @@ -108,35 +108,35 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr ) void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, _SaveFlyArr& rArr, bool bMoveAllFlys ) { - SwFrmFmts& rFmts = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrmFmts(); - SwFrmFmt* pFmt; - const SwFmtAnchor* pAnchor; + SwFrameFormats& rFormats = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrameFormats(); + SwFrameFormat* pFormat; + const SwFormatAnchor* pAnchor; const SwPosition* pPos = rPam.Start(); const SwNodeIndex& rSttNdIdx = pPos->nNode; - short nSttOff = (!bMoveAllFlys && rSttNdIdx.GetNode().IsCntntNode() && + short nSttOff = (!bMoveAllFlys && rSttNdIdx.GetNode().IsContentNode() && pPos->nContent.GetIndex()) ? 1 : 0; pPos = rPam.GetPoint() == pPos ? rPam.GetMark() : rPam.GetPoint(); const SwNodeIndex& rEndNdIdx = pPos->nNode; - short nOff = ( bMoveAllFlys || ( rEndNdIdx.GetNode().IsCntntNode() && - pPos->nContent == rEndNdIdx.GetNode().GetCntntNode()->Len() )) + short nOff = ( bMoveAllFlys || ( rEndNdIdx.GetNode().IsContentNode() && + pPos->nContent == rEndNdIdx.GetNode().GetContentNode()->Len() )) ? 0 : 1; - const SwNodeIndex* pCntntIdx; + const SwNodeIndex* pContentIdx; - for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n ) + for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n ) { - pFmt = (SwFrmFmt*)rFmts[n]; - pAnchor = &pFmt->GetAnchor(); - const SwPosition* pAPos = pAnchor->GetCntntAnchor(); + pFormat = (SwFrameFormat*)rFormats[n]; + pAnchor = &pFormat->GetAnchor(); + const SwPosition* pAPos = pAnchor->GetContentAnchor(); if (pAPos && ((FLY_AT_PARA == pAnchor->GetAnchorId()) || (FLY_AT_CHAR == pAnchor->GetAnchorId())) && - // do not move if the InsPos is in the CntntArea of the Fly - ( 0 == ( pCntntIdx = pFmt->GetCntnt().GetCntntIdx() ) || - !( *pCntntIdx < rInsPos && - rInsPos < pCntntIdx->GetNode().EndOfSectionIndex() )) ) + // do not move if the InsPos is in the ContentArea of the Fly + ( 0 == ( pContentIdx = pFormat->GetContent().GetContentIdx() ) || + !( *pContentIdx < rInsPos && + rInsPos < pContentIdx->GetNode().EndOfSectionIndex() )) ) { bool bInsPos = false; @@ -148,9 +148,9 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, { // Only attach an anchor to the beginning or end SwPosition aPos( rSttNdIdx ); - SwFmtAnchor aAnchor( *pAnchor ); + SwFormatAnchor aAnchor( *pAnchor ); aAnchor.SetAnchor( &aPos ); - pFmt->SetFmtAttr( aAnchor ); + pFormat->SetFormatAttr( aAnchor ); } } else if( ( rSttNdIdx.GetIndex() + nSttOff <= pAPos->nNode.GetIndex() @@ -159,10 +159,10 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos, { _SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(), - pFmt, bInsPos ); + pFormat, bInsPos ); rArr.push_back( aSave ); - pFmt->DelFrms(); - rFmts.erase( rFmts.begin() + n-- ); + pFormat->DelFrms(); + rFormats.erase( rFormats.begin() + n-- ); } } } @@ -176,12 +176,12 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx, const bool bDelFwrd = rMkNdIdx.GetIndex() <= rPtNdIdx.GetIndex(); SwDoc* pDoc = rMkNdIdx.GetNode().GetDoc(); - SwFrmFmts& rTbl = *pDoc->GetSpzFrmFmts(); - for ( auto i = rTbl.size(); i; ) + SwFrameFormats& rTable = *pDoc->GetSpzFrameFormats(); + for ( auto i = rTable.size(); i; ) { - SwFrmFmt *pFmt = rTbl[--i]; - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); - SwPosition const*const pAPos = rAnch.GetCntntAnchor(); + SwFrameFormat *pFormat = rTable[--i]; + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); + SwPosition const*const pAPos = rAnch.GetContentAnchor(); if (pAPos && ((rAnch.GetAnchorId() == FLY_AT_PARA) || (rAnch.GetAnchorId() == FLY_AT_CHAR)) && @@ -192,32 +192,32 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx, // Only move the Anchor?? if( rPtNdIdx == pAPos->nNode ) { - SwFmtAnchor aAnch( pFmt->GetAnchor() ); + SwFormatAnchor aAnch( pFormat->GetAnchor() ); SwPosition aPos( rMkNdIdx ); aAnch.SetAnchor( &aPos ); - pFmt->SetFmtAttr( aAnch ); + pFormat->SetFormatAttr( aAnch ); } else { // If the Fly is deleted, all Flys in it's content have to be deleted too. - const SwFmtCntnt &rCntnt = pFmt->GetCntnt(); - if( rCntnt.GetCntntIdx() ) + const SwFormatContent &rContent = pFormat->GetContent(); + if( rContent.GetContentIdx() ) { - DelFlyInRange( *rCntnt.GetCntntIdx(), - SwNodeIndex( *rCntnt.GetCntntIdx()-> + DelFlyInRange( *rContent.GetContentIdx(), + SwNodeIndex( *rContent.GetContentIdx()-> GetNode().EndOfSectionNode() )); // Position could have been moved! - if( i > rTbl.size() ) - i = rTbl.size(); - else if( pFmt != rTbl[i] ) - i = rTbl.GetPos( pFmt ); + if( i > rTable.size() ) + i = rTable.size(); + else if( pFormat != rTable[i] ) + i = rTable.GetPos( pFormat ); } - pDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFmt ); + pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFormat ); - // DelLayoutFmt can also trigger the deletion of objects. - if( i > rTbl.size() ) - i = rTbl.size(); + // DelLayoutFormat can also trigger the deletion of objects. + if( i > rTable.size() ) + i = rTable.size(); } } } @@ -228,19 +228,19 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx, // From now on this class saves the redline positions of all redlines which ends exact at the // insert position (node _and_ content index) _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCnt ) - : pSavArr( 0 ), pSavIdx( 0 ), nSavCntnt( nCnt ) + : pSavArr( 0 ), pSavIdx( 0 ), nSavContent( nCnt ) { SwNode& rNd = rInsIdx.GetNode(); SwDoc* pDest = rNd.GetDoc(); - if( !pDest->getIDocumentRedlineAccess().GetRedlineTbl().empty() ) + if( !pDest->getIDocumentRedlineAccess().GetRedlineTable().empty() ) { sal_uInt16 nFndPos; const SwPosition* pEnd; - SwPosition aSrcPos( rInsIdx, SwIndex( rNd.GetCntntNode(), nCnt )); + SwPosition aSrcPos( rInsIdx, SwIndex( rNd.GetContentNode(), nCnt )); pDest->getIDocumentRedlineAccess().GetRedline( aSrcPos, &nFndPos ); const SwRangeRedline* pRedl; while( nFndPos-- - && *( pEnd = ( pRedl = pDest->getIDocumentRedlineAccess().GetRedlineTbl()[ nFndPos ] )->End() ) == aSrcPos + && *( pEnd = ( pRedl = pDest->getIDocumentRedlineAccess().GetRedlineTable()[ nFndPos ] )->End() ) == aSrcPos && *pRedl->Start() < aSrcPos ) { if( !pSavArr ) @@ -262,12 +262,12 @@ _SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore() void _SaveRedlEndPosForRestore::_Restore() { ++(*pSavIdx); - SwCntntNode* pNode = pSavIdx->GetNode().GetCntntNode(); + SwContentNode* pNode = pSavIdx->GetNode().GetContentNode(); // If there's no content node at the remembered position, we will not restore the old position // This may happen if a table (or section?) will be inserted. if( pNode ) { - SwPosition aPos( *pSavIdx, SwIndex( pNode, nSavCntnt )); + SwPosition aPos( *pSavIdx, SwIndex( pNode, nSavContent )); for( auto n = pSavArr->size(); n; ) *(*pSavArr)[ --n ] = aPos; } @@ -292,29 +292,29 @@ static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges) return pResult; } -void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev ) +void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev ) { - rJoinTxt = false; + rJoinText = false; rJoinPrev = false; if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode ) { const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End(); - SwTxtNode *pSttNd = pStt->nNode.GetNode().GetTxtNode(); + SwTextNode *pSttNd = pStt->nNode.GetNode().GetTextNode(); if( pSttNd ) { - SwTxtNode *pEndNd = pEnd->nNode.GetNode().GetTxtNode(); - rJoinTxt = 0 != pEndNd; - if( rJoinTxt ) + SwTextNode *pEndNd = pEnd->nNode.GetNode().GetTextNode(); + rJoinText = 0 != pEndNd; + if( rJoinText ) { bool bExchange = pStt == rPam.GetPoint(); if( !pStt->nContent.GetIndex() && - pEndNd->GetTxt().getLength() != pEnd->nContent.GetIndex()) + pEndNd->GetText().getLength() != pEnd->nContent.GetIndex()) bExchange = !bExchange; if( bExchange ) rPam.Exchange(); rJoinPrev = rPam.GetPoint() == pStt; OSL_ENSURE( !pStt->nContent.GetIndex() && - pEndNd->GetTxt().getLength() != pEnd->nContent.GetIndex() + pEndNd->GetText().getLength() != pEnd->nContent.GetIndex() ? rPam.GetPoint()->nNode < rPam.GetMark()->nNode : rPam.GetPoint()->nNode > rPam.GetMark()->nNode, "sw_GetJoinFlags"); @@ -326,11 +326,11 @@ void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev ) bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) { SwNodeIndex aIdx( rPam.GetPoint()->nNode ); - SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode(); + SwTextNode *pTextNd = aIdx.GetNode().GetTextNode(); SwNodeIndex aOldIdx( aIdx ); - SwTxtNode *pOldTxtNd = pTxtNd; + SwTextNode *pOldTextNd = pTextNd; - if( pTxtNd && pTxtNd->CanJoinNext( &aIdx ) ) + if( pTextNd && pTextNd->CanJoinNext( &aIdx ) ) { SwDoc* pDoc = rPam.GetDoc(); if( bJoinPrev ) @@ -349,24 +349,24 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) // There, we copy the AUTO PageBreak from the GetMarkNode! /* The GetMarkNode */ - if( ( pTxtNd = aIdx.GetNode().GetTxtNode())->HasSwAttrSet() ) + if( ( pTextNd = aIdx.GetNode().GetTextNode())->HasSwAttrSet() ) { const SfxPoolItem* pItem; - if( SfxItemState::SET == pTxtNd->GetpSwAttrSet()->GetItemState( + if( SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState( RES_BREAK, false, &pItem ) ) - pTxtNd->ResetAttr( RES_BREAK ); - if( pTxtNd->HasSwAttrSet() && - SfxItemState::SET == pTxtNd->GetpSwAttrSet()->GetItemState( + pTextNd->ResetAttr( RES_BREAK ); + if( pTextNd->HasSwAttrSet() && + SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState( RES_PAGEDESC, false, &pItem ) ) - pTxtNd->ResetAttr( RES_PAGEDESC ); + pTextNd->ResetAttr( RES_PAGEDESC ); } /* The PointNode */ - if( pOldTxtNd->HasSwAttrSet() ) + if( pOldTextNd->HasSwAttrSet() ) { const SfxPoolItem* pItem; SfxItemSet aSet( pDoc->GetAttrPool(), aBreakSetRange ); - const SfxItemSet* pSet = pOldTxtNd->GetpSwAttrSet(); + const SfxItemSet* pSet = pOldTextNd->GetpSwAttrSet(); if( SfxItemState::SET == pSet->GetItemState( RES_BREAK, false, &pItem ) ) aSet.Put( *pItem ); @@ -374,28 +374,28 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) false, &pItem ) ) aSet.Put( *pItem ); if( aSet.Count() ) - pTxtNd->SetAttr( aSet ); + pTextNd->SetAttr( aSet ); } - pOldTxtNd->FmtToTxtAttr( pTxtNd ); + pOldTextNd->FormatToTextAttr( pTextNd ); - const std::shared_ptr< sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create()); - pCntntStore->Save( pDoc, aOldIdx.GetIndex(), pOldTxtNd->Len() ); + const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create()); + pContentStore->Save( pDoc, aOldIdx.GetIndex(), pOldTextNd->Len() ); - SwIndex aAlphaIdx(pTxtNd); - pOldTxtNd->CutText( pTxtNd, aAlphaIdx, SwIndex(pOldTxtNd), - pOldTxtNd->Len() ); + SwIndex aAlphaIdx(pTextNd); + pOldTextNd->CutText( pTextNd, aAlphaIdx, SwIndex(pOldTextNd), + pOldTextNd->Len() ); SwPosition aAlphaPos( aIdx, aAlphaIdx ); pDoc->CorrRel( rPam.GetPoint()->nNode, aAlphaPos, 0, true ); // move all Bookmarks/TOXMarks - if( !pCntntStore->Empty() ) - pCntntStore->Restore( pDoc, aIdx.GetIndex() ); + if( !pContentStore->Empty() ) + pContentStore->Restore( pDoc, aIdx.GetIndex() ); // If the passed PaM is not in the Crsr ring, // treat it separately (e.g. when it's being called from AutoFormat) - if( pOldTxtNd == rPam.GetBound( true ).nContent.GetIdxReg() ) + if( pOldTextNd == rPam.GetBound( true ).nContent.GetIdxReg() ) rPam.GetBound( true ) = aAlphaPos; - if( pOldTxtNd == rPam.GetBound( false ).nContent.GetIdxReg() ) + if( pOldTextNd == rPam.GetBound( false ).nContent.GetIdxReg() ) rPam.GetBound( false ) = aAlphaPos; } // delete the Node, at last! @@ -403,33 +403,33 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) } else { - SwTxtNode* pDelNd = aIdx.GetNode().GetTxtNode(); - if( pTxtNd->Len() ) - pDelNd->FmtToTxtAttr( pTxtNd ); + SwTextNode* pDelNd = aIdx.GetNode().GetTextNode(); + if( pTextNd->Len() ) + pDelNd->FormatToTextAttr( pTextNd ); else { /* This case was missed: - <something></something> <-- pTxtNd + <something></something> <-- pTextNd <other>ccc</other> <-- pDelNd <something> and <other> are paragraph attributes. The attribute <something> stayed if not overwritten by an attribute in "ccc". Fixed by first resetting all character attributes in first - paragraph (pTxtNd). + paragraph (pTextNd). */ std::vector<sal_uInt16> * pShorts = - lcl_RangesToVector(aCharFmtSetRange); - pTxtNd->ResetAttr(*pShorts); + lcl_RangesToVector(aCharFormatSetRange); + pTextNd->ResetAttr(*pShorts); delete pShorts; if( pDelNd->HasSwAttrSet() ) { // only copy the character attributes - SfxItemSet aTmpSet( pDoc->GetAttrPool(), aCharFmtSetRange ); + SfxItemSet aTmpSet( pDoc->GetAttrPool(), aCharFormatSetRange ); aTmpSet.Put( *pDelNd->GetpSwAttrSet() ); - pTxtNd->SetAttr( aTmpSet ); + pTextNd->SetAttr( aTmpSet ); } } @@ -437,25 +437,25 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) // #i100466# adjust given <rPam>, if it does not belong to the cursors if ( pDelNd == rPam.GetBound( true ).nContent.GetIdxReg() ) { - rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) ); + rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) ); } if( pDelNd == rPam.GetBound( false ).nContent.GetIdxReg() ) { - rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) ); + rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) ); } - pTxtNd->JoinNext(); + pTextNd->JoinNext(); } return true; } else return false; } -static void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult& rResult, +static void lcl_syncGrammarError( SwTextNode &rTextNode, linguistic2::ProofreadingResult& rResult, const ModelToViewHelper &rConversionMap ) { - if( rTxtNode.IsGrammarCheckDirty() ) + if( rTextNode.IsGrammarCheckDirty() ) return; - SwGrammarMarkUp* pWrong = rTxtNode.GetGrammarCheck(); + SwGrammarMarkUp* pWrong = rTextNode.GetGrammarCheck(); linguistic2::SingleProofreadingError* pArray = rResult.aErrors.getArray(); sal_uInt16 j = 0; if( pWrong ) @@ -486,13 +486,13 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, SwSpellArgs *pSpellArgs = 0; if (pConvArgs) { - pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent); - pConvArgs->SetEnd( pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent ); + pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent); + pConvArgs->SetEnd( pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent ); } else pSpellArgs = new SwSpellArgs( xSpeller, - pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent, - pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent, + pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent, + pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent, bGrammarCheck ); sal_uLong nCurrNd = pSttPos->nNode.GetIndex(); @@ -501,7 +501,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, uno::Any aRet; if( nCurrNd <= nEndNd ) { - SwCntntFrm* pCntFrm; + SwContentFrm* pCntFrm; bool bGoOn = true; while( bGoOn ) { @@ -509,14 +509,14 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, switch( pNd->GetNodeType() ) { case ND_TEXTNODE: - if( 0 != ( pCntFrm = pNd->GetTxtNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) ) + if( 0 != ( pCntFrm = pNd->GetTextNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) ) { // skip protected and hidden Cells and Flys if( pCntFrm->IsProtected() ) { nCurrNd = pNd->EndOfSectionIndex(); } - else if( !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() ) + else if( !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() ) { if( pPageCnt && *pPageCnt && pPageSt ) { @@ -543,7 +543,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, // if grammar checking starts inside of a sentence the start position has to be adjusted if( nBeginGrammarCheck ) { - SwIndex aStartIndex( dynamic_cast< SwTxtNode* >( pNd ), nBeginGrammarCheck ); + SwIndex aStartIndex( dynamic_cast< SwTextNode* >( pNd ), nBeginGrammarCheck ); SwPosition aStart( *pNd, aStartIndex ); SwCursor aCrsr(aStart, 0, false); SwPosition aOrigPos = *aCrsr.GetPoint(); @@ -555,13 +555,13 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, } nEndGrammarCheck = (pSpellArgs->pEndNode == pNd) ? pSpellArgs->pEndIdx->GetIndex() - : pNd->GetTxtNode() - ->GetTxt().getLength(); + : pNd->GetTextNode() + ->GetText().getLength(); } - sal_Int32 nSpellErrorPosition = pNd->GetTxtNode()->GetTxt().getLength(); - if( (!pConvArgs && pNd->GetTxtNode()->Spell( pSpellArgs )) || - ( pConvArgs && pNd->GetTxtNode()->Convert( *pConvArgs ))) + sal_Int32 nSpellErrorPosition = pNd->GetTextNode()->GetText().getLength(); + if( (!pConvArgs && pNd->GetTextNode()->Spell( pSpellArgs )) || + ( pConvArgs && pNd->GetTextNode()->Convert( *pConvArgs ))) { // Cancel and remember position pSttPos->nNode = nCurrNd; @@ -580,11 +580,11 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, { uno::Reference< lang::XComponent > xDoc( GetDocShell()->GetBaseModel(), uno::UNO_QUERY ); // Expand the string: - const ModelToViewHelper aConversionMap(*pNd->GetTxtNode()); + const ModelToViewHelper aConversionMap(*pNd->GetTextNode()); OUString aExpandText = aConversionMap.getViewText(); // get XFlatParagraph to use... - uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNd->GetTxtNode(), aExpandText, aConversionMap ); + uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNd->GetTextNode(), aExpandText, aConversionMap ); // get error position of cursor in XFlatParagraph linguistic2::ProofreadingResult aResult; @@ -595,7 +595,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, aResult = xGCIterator->checkSentenceAtPosition( xDoc, xFlatPara, aExpandText, lang::Locale(), nBeginGrammarCheck, -1, -1 ); - lcl_syncGrammarError( *pNd->GetTxtNode(), aResult, aConversionMap ); + lcl_syncGrammarError( *pNd->GetTextNode(), aResult, aConversionMap ); // get suggestions to use for the specific error position nGrammarErrors = aResult.aErrors.getLength(); @@ -615,10 +615,10 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, nCurrNd = pNd->GetIndex(); pSttPos->nNode = nCurrNd; pEndPos->nNode = nCurrNd; - pSpellArgs->pStartNode = pNd->GetTxtNode(); - pSpellArgs->pEndNode = pNd->GetTxtNode(); - pSpellArgs->pStartIdx->Assign(pNd->GetTxtNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart ).mnPos ); - pSpellArgs->pEndIdx->Assign(pNd->GetTxtNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart + rError.nErrorLength ).mnPos ); + pSpellArgs->pStartNode = pNd->GetTextNode(); + pSpellArgs->pEndNode = pNd->GetTextNode(); + pSpellArgs->pStartIdx->Assign(pNd->GetTextNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart ).mnPos ); + pSpellArgs->pEndIdx->Assign(pNd->GetTextNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart + rError.nErrorLength ).mnPos ); nCurrNd = nEndNd; } } @@ -693,12 +693,12 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCrsrPos, nNode = pPoint->nNode.GetIndex(); // Set start - pStart = pPoint->nNode.GetNode().GetTxtNode(); + pStart = pPoint->nNode.GetNode().GetTextNode(); nPamStart = pPoint->nContent.GetIndex(); // Set End and Length const SwPosition *pMark = pPam->GetMark(); - pEnd = pMark->nNode.GetNode().GetTxtNode(); + pEnd = pMark->nNode.GetNode().GetTextNode(); nPamLen = pMark->nContent.GetIndex(); if( pPoint->nNode == pMark->nNode ) nPamLen = nPamLen - pPoint->nContent.GetIndex(); @@ -717,9 +717,9 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const else { pPam->GetPoint()->nNode = nNode; - pPam->GetPoint()->nContent.Assign( pNode->GetCntntNode(), nWordStart ); + pPam->GetPoint()->nContent.Assign( pNode->GetContentNode(), nWordStart ); pPam->GetMark()->nNode = nNode; - pPam->GetMark()->nContent.Assign( pNode->GetCntntNode(), + pPam->GetMark()->nContent.Assign( pNode->GetContentNode(), nWordStart + nWordLen ); OSL_ENSURE( nNode == pNode->GetIndex(), "SwHyphArgs::SetPam: Pam disaster" ); @@ -730,12 +730,12 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs ) { // Hyphenate returns true if there is a hyphenation point and sets pPam - SwTxtNode *pNode = rpNd->GetTxtNode(); + SwTextNode *pNode = rpNd->GetTextNode(); SwHyphArgs *pHyphArgs = static_cast<SwHyphArgs*>(pArgs); if( pNode ) { - SwCntntFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ); - if( pCntFrm && !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() ) + SwContentFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ); + if( pCntFrm && !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() ) { sal_uInt16 *pPageSt = pHyphArgs->GetPageSt(); sal_uInt16 *pPageCnt = pHyphArgs->GetPageCnt(); @@ -808,7 +808,7 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const sal_Int32 nSttCnt = pStt->nContent.GetIndex(); const sal_Int32 nEndCnt = pEnd->nContent.GetIndex(); - const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode(); + const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode(); if( pStt == pEnd && pTNd ) // no region ? { // do nothing @@ -822,14 +822,14 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat ) { ++aIdx; if( pTNd ) - pTNd->CountWords( rStat, nSttCnt, pTNd->GetTxt().getLength() ); + pTNd->CountWords( rStat, nSttCnt, pTNd->GetText().getLength() ); } for( ; aIdx.GetIndex() < nEndNd; ++aIdx ) - if( 0 != ( pTNd = aIdx.GetNode().GetTxtNode() )) - pTNd->CountWords( rStat, 0, pTNd->GetTxt().getLength() ); + if( 0 != ( pTNd = aIdx.GetNode().GetTextNode() )) + pTNd->CountWords( rStat, 0, pTNd->GetText().getLength() ); - if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode() )) + if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTextNode() )) pTNd->CountWords( rStat, 0, nEndCnt ); } else if( pTNd && nSttCnt < nEndCnt ) |