diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-03 17:37:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-03 17:59:22 +0100 |
| commit | 093d54326f94467bc1601c14a38454efcc888017 (patch) | |
| tree | d4ec8827733b43b05a7107db07c1348a82a25095 | |
| parent | 9aa43559eafd93d0ec99399c3e5d22ac8d806feb (diff) | |
sw: s/m_rSwdoc/m_rDoc/g
... because i can type m_rDoc but "m_rSwdoc" always comes out m_rSwDoc.
Change-Id: Id50888012da6cf3cf7aebc52e8c70fc359c6e073
28 files changed, 712 insertions, 712 deletions
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx index c243eb37b1dc..cd8d0e3352d1 100644 --- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx +++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star::uno; namespace sw { -DocumentChartDataProviderManager::DocumentChartDataProviderManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), +DocumentChartDataProviderManager::DocumentChartDataProviderManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), maChartDataProviderImplRef(), mpChartControllerHelper( 0 ) { @@ -49,7 +49,7 @@ SwChartDataProvider * DocumentChartDataProviderManager::GetChartDataProvider( bo if (bCreate && !maChartDataProviderImplRef.is()) { - maChartDataProviderImplRef = new SwChartDataProvider( & m_rSwdoc ); + maChartDataProviderImplRef = new SwChartDataProvider( & m_rDoc ); } return maChartDataProviderImplRef.get(); } @@ -61,13 +61,13 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S OUString aName( pTable->GetFrmFmt()->GetName() ); SwOLENode *pONd; SwStartNode *pStNd; - SwNodeIndex aIdx( *m_rSwdoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); + SwNodeIndex aIdx( *m_rDoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); while (0 != (pStNd = aIdx.GetNode().GetStartNode())) { ++aIdx; if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) && aName == pONd->GetChartTblName() /* OLE node is chart? */ && - 0 != (pONd->getLayoutFrm( m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not hidden */ ) + 0 != (pONd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not hidden */ ) { uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef(); if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) ) @@ -88,7 +88,7 @@ SwChartLockController_Helper & DocumentChartDataProviderManager::GetChartControl { if (!mpChartControllerHelper) { - mpChartControllerHelper = new SwChartLockController_Helper( & m_rSwdoc ); + mpChartControllerHelper = new SwChartLockController_Helper( & m_rDoc ); } return *mpChartControllerHelper; } diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 0ae2356b9928..7a6319b630c4 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1572,7 +1572,7 @@ namespace //local functions originally from docfmt.cxx namespace sw { -DocumentContentOperationsManager::DocumentContentOperationsManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ) +DocumentContentOperationsManager::DocumentContentOperationsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ) { } @@ -1590,16 +1590,16 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons return false; // Prevent copying in Flys that are anchored in the area - if( pDoc == &m_rSwdoc ) + if( pDoc == &m_rDoc ) { // Correct the Start-/EndNode sal_uLong nStt = pStt->nNode.GetIndex(), nEnd = pEnd->nNode.GetIndex(), nDiff = nEnd - nStt +1; - SwNode* pNd = m_rSwdoc.GetNodes()[ nStt ]; + SwNode* pNd = m_rDoc.GetNodes()[ nStt ]; if( pNd->IsCntntNode() && pStt->nContent.GetIndex() ) ++nStt, --nDiff; - if( (pNd = m_rSwdoc.GetNodes()[ nEnd ])->IsCntntNode() && + if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsCntntNode() && ((SwCntntNode*)pNd)->Len() != pEnd->nContent.GetIndex() ) --nEnd, --nDiff; if( nDiff && @@ -1618,7 +1618,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons bool bRet = false; - if( pDoc != &m_rSwdoc ) + if( pDoc != &m_rDoc ) { // ordinary copy bRet = CopyImpl( rPam, rPos, true, bCopyAll, pRedlineRange ); } @@ -1635,7 +1635,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons // Copy the area in itself // Special case for handling an area with several nodes, // or a single node that is not a TextNode - OSL_ENSURE( &m_rSwdoc == pDoc, " invalid copy branch!" ); + OSL_ENSURE( &m_rDoc == pDoc, " invalid copy branch!" ); OSL_FAIL("mst: i thought this could be dead code;" "please tell me what you did to get here!"); pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); @@ -1656,7 +1656,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons { ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection( - SwNodeIndex( m_rSwdoc.GetNodes().GetEndOfAutotext() )); + SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() )); aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode(); // copy without Frames pDoc->GetDocumentContentOperationsManager().CopyImpl( rPam, *aPam.GetPoint(), false, bCopyAll, 0 ); @@ -1723,16 +1723,16 @@ void DocumentContentOperationsManager::DeleteSection( SwNode *pNode ) // delete all Flys, Bookmarks, ... DelFlyInRange( aSttIdx, aEndIdx ); - m_rSwdoc.getIDocumentRedlineAccess().DeleteRedline( *pSttNd, true, USHRT_MAX ); + m_rDoc.getIDocumentRedlineAccess().DeleteRedline( *pSttNd, true, USHRT_MAX ); _DelBookmarks(aSttIdx, aEndIdx); { // move all Crsr/StkCrsr/UnoCrsr out of the to-be-deleted area SwNodeIndex aMvStt( aSttIdx, 1 ); - m_rSwdoc.CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true ); + m_rDoc.CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true ); } - m_rSwdoc.GetNodes().DelNodes( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() + 1 ); + m_rDoc.GetNodes().DelNodes( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() + 1 ); } bool DocumentContentOperationsManager::DeleteRange( SwPaM & rPam ) @@ -1748,9 +1748,9 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) pNd->StartOfSectionIndex(); sal_uInt32 nNodeDiff = rEnd.nNode.GetIndex() - rStt.nNode.GetIndex(); - if ( nSectDiff-2 <= nNodeDiff || m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() || + if ( nSectDiff-2 <= nNodeDiff || m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || /* #i9185# Prevent getting the node after the end node (see below) */ - rEnd.nNode.GetIndex() + 1 == m_rSwdoc.GetNodes().Count() ) + rEnd.nNode.GetIndex() + 1 == m_rDoc.GetNodes().Count() ) { return false; } @@ -1760,7 +1760,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) /* #i9185# This whould lead to a segmentation fault if not caught above. */ sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1; - SwTableNode *const pTblNd = m_rSwdoc.GetNodes()[ nNextNd ]->GetTableNode(); + SwTableNode *const pTblNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode(); if( pTblNd && pNd->IsCntntNode() ) { @@ -1785,7 +1785,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) } } - bool const bDoesUndo = m_rSwdoc.GetIDocumentUndoRedo().DoesUndo(); + bool const bDoesUndo = m_rDoc.GetIDocumentUndoRedo().DoesUndo(); if( bDoesUndo ) { if( !rPam.HasMark() ) @@ -1800,14 +1800,14 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) pTmpNode = rPam.GetMark()->nNode.GetNode().GetCntntNode(); rPam.GetMark()->nContent.Assign( pTmpNode, 0 ); - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); SwPaM aDelPam( *rPam.GetMark(), *rPam.GetPoint() ); { SwPosition aTmpPos( *aDelPam.GetPoint() ); if( bGoNext ) { - pTmpNode = m_rSwdoc.GetNodes().GoNext( &aTmpPos.nNode ); + pTmpNode = m_rDoc.GetNodes().GoNext( &aTmpPos.nNode ); aTmpPos.nContent.Assign( pTmpNode, 0 ); } ::PaMCorrAbs( aDelPam, aTmpPos ); @@ -1817,7 +1817,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) *rPam.GetPoint() = *aDelPam.GetPoint(); pUndo->SetPgBrkFlags( bSavePageBreak, bSavePageDesc ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } else { @@ -1839,19 +1839,19 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) // move bookmarks, redlines etc. if (aRg.aStart == aRg.aEnd) // only first CorrAbs variant handles this { - m_rSwdoc.CorrAbs( aRg.aStart, *rPam.GetPoint(), 0, true ); + m_rDoc.CorrAbs( aRg.aStart, *rPam.GetPoint(), 0, true ); } else { - m_rSwdoc.CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true ); + m_rDoc.CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true ); } // What's with Flys? { // If there are FlyFrames left, delete these too - for( size_t n = 0; n < m_rSwdoc.GetSpzFrmFmts()->size(); ++n ) + for( size_t n = 0; n < m_rDoc.GetSpzFrmFmts()->size(); ++n ) { - SwFrmFmt* pFly = (*m_rSwdoc.GetSpzFrmFmts())[n]; + SwFrmFmt* pFly = (*m_rDoc.GetSpzFrmFmts())[n]; const SwFmtAnchor* pAnchor = &pFly->GetAnchor(); SwPosition const*const pAPos = pAnchor->GetCntntAnchor(); if (pAPos && @@ -1859,7 +1859,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) (FLY_AT_CHAR == pAnchor->GetAnchorId())) && aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd ) { - m_rSwdoc.getIDocumentLayoutAccess().DelLayoutFmt( pFly ); + m_rDoc.getIDocumentLayoutAccess().DelLayoutFmt( pFly ); --n; } } @@ -1869,10 +1869,10 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam ) rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 ); pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetCntntNode(); rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 ); - m_rSwdoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 ); + m_rDoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 ); } rPam.DeleteMark(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -1884,7 +1884,7 @@ bool DocumentContentOperationsManager::DeleteAndJoin( SwPaM & rPam, if ( lcl_StrLenOverflow( rPam ) ) return false; - return lcl_DoWithBreaks( *this, rPam, (m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn()) + return lcl_DoWithBreaks( *this, rPam, (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn()) ? &DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl : &DocumentContentOperationsManager::DeleteAndJoinImpl, bForceJoinNext ); @@ -1906,7 +1906,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // save redlines (if DOC_MOVEREDLINES is used) _SaveRedlines aSaveRedl; - if( DOC_MOVEREDLINES & eMvFlags && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) + if( DOC_MOVEREDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) { lcl_SaveRedlines( rPaM, aSaveRedl ); @@ -1914,7 +1914,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // in a particular order, and presence of bookmarks // will change this order. Hence, we delete bookmarks // here without undo. - ::sw::UndoGuard const undoGuard(m_rSwdoc.GetIDocumentUndoRedo()); + ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo()); _DelBookmarks( pStt->nNode, pEnd->nNode, @@ -1927,16 +1927,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwFtnIdxs aTmpFntIdx; SwUndoMove * pUndoMove = 0; - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); pUndoMove = new SwUndoMove( rPaM, rPos ); pUndoMove->SetMoveRedlines( eMvFlags == DOC_MOVEREDLINES ); } else { bUpdateFtn = lcl_SaveFtn( pStt->nNode, pEnd->nNode, rPos.nNode, - m_rSwdoc.GetFtnIdxs(), aTmpFntIdx, + m_rDoc.GetFtnIdxs(), aTmpFntIdx, &pStt->nContent, &pEnd->nContent ); } @@ -1962,12 +1962,12 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, const sal_Int32 nMkCntnt = rPaM.GetMark()->nContent.GetIndex(); const boost::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create()); - pCntntStore->Save( &m_rSwdoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true ); + pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true ); pTNd = static_cast<SwTxtNode*>(pTNd->SplitCntntNode( rPos )); if( !pCntntStore->Empty() ) - pCntntStore->Restore( &m_rSwdoc, rPos.nNode.GetIndex()-1, 0, true ); + pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true ); // correct the PaM! if( rPos.nNode == rPaM.GetMark()->nNode ) @@ -2002,7 +2002,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, if( *rPaM.GetPoint() != *rPaM.GetMark() ) { // now do the actual move - m_rSwdoc.GetNodes().MoveRange( rPaM, rPos, m_rSwdoc.GetNodes() ); + m_rDoc.GetNodes().MoveRange( rPaM, rPos, m_rDoc.GetNodes() ); // after a MoveRange() the Mark is deleted if ( rPaM.HasMark() ) // => no Move occurred! @@ -2021,7 +2021,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, rPaM.SetMark(); // create a Sel. around the new range pTNd = aSavePam.GetNode().GetTxtNode(); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { // correct the SavePam's Content first if( bNullCntnt ) @@ -2064,7 +2064,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // The newly inserted range is now inbetween SPoint and GetMark. pUndoMove->SetDestRange( aSavePam, *rPaM.GetPoint(), bJoin, bCorrSavePam ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( pUndoMove ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndoMove ); } else { @@ -2098,7 +2098,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, pBkmk != aSaveBkmks.end(); ++pBkmk) pBkmk->SetInDoc( - &m_rSwdoc, + &m_rDoc, rPaM.GetMark()->nNode, &rPaM.GetMark()->nContent); *rPaM.GetPoint() = *aSavePam.End(); @@ -2109,21 +2109,21 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // restore redlines (if DOC_MOVEREDLINES is used) if( !aSaveRedl.empty() ) { - lcl_RestoreRedlines( &m_rSwdoc, *aSavePam.Start(), aSaveRedl ); + lcl_RestoreRedlines( &m_rDoc, *aSavePam.Start(), aSaveRedl ); } if( bUpdateFtn ) { if( !aTmpFntIdx.empty() ) { - m_rSwdoc.GetFtnIdxs().insert( aTmpFntIdx ); + m_rDoc.GetFtnIdxs().insert( aTmpFntIdx ); aTmpFntIdx.clear(); } - m_rSwdoc.GetFtnIdxs().UpdateAllFtn(); + m_rDoc.GetFtnIdxs().UpdateAllFtn(); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -2142,37 +2142,37 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod SwFtnIdxs aTmpFntIdx; SwUndoMove* pUndo = 0; - if ((DOC_CREATEUNDOOBJ & eMvFlags ) && m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if ((DOC_CREATEUNDOOBJ & eMvFlags ) && m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - pUndo = new SwUndoMove( &m_rSwdoc, rRange, rPos ); + pUndo = new SwUndoMove( &m_rDoc, rRange, rPos ); } else { bUpdateFtn = lcl_SaveFtn( rRange.aStart, rRange.aEnd, rPos, - m_rSwdoc.GetFtnIdxs(), aTmpFntIdx ); + m_rDoc.GetFtnIdxs(), aTmpFntIdx ); } _SaveRedlines aSaveRedl; std::vector<SwRangeRedline*> aSavRedlInsPosArr; - if( DOC_MOVEREDLINES & eMvFlags && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) + if( DOC_MOVEREDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) { lcl_SaveRedlines( rRange, aSaveRedl ); // Find all RedLines that end at the InsPos. // These have to be moved back to the "old" position after the Move. - sal_uInt16 nRedlPos = m_rSwdoc.getIDocumentRedlineAccess().GetRedlinePos( rPos.GetNode(), USHRT_MAX ); + sal_uInt16 nRedlPos = m_rDoc.getIDocumentRedlineAccess().GetRedlinePos( rPos.GetNode(), USHRT_MAX ); if( USHRT_MAX != nRedlPos ) { const SwPosition *pRStt, *pREnd; do { - SwRangeRedline* pTmp = m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ]; + SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ]; pRStt = pTmp->Start(); pREnd = pTmp->End(); if( pREnd->nNode == rPos && pRStt->nNode < rPos ) { aSavRedlInsPosArr.push_back( pTmp ); } - } while( pRStt->nNode < rPos && ++nRedlPos < m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().size()); + } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size()); } } @@ -2184,7 +2184,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // Save the paragraph-bound Flys, so that they can be moved. _SaveFlyArr aSaveFlyArr; - if( !m_rSwdoc.GetSpzFrmFmts()->empty() ) + if( !m_rDoc.GetSpzFrmFmts()->empty() ) _SaveFlyInRange( rRange, aSaveFlyArr ); // Set it to before the Position, so that it cannot be moved further. @@ -2196,7 +2196,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // move the Nodes bool bNoDelFrms = 0 != (DOC_NO_DELFRMS & eMvFlags); - if( m_rSwdoc.GetNodes()._MoveNodes( rRange, m_rSwdoc.GetNodes(), rPos, !bNoDelFrms ) ) + if( m_rDoc.GetNodes()._MoveNodes( rRange, m_rDoc.GetNodes(), rPos, !bNoDelFrms ) ) { ++aIdx; // again back to old position if( pSaveInsPos ) @@ -2217,7 +2217,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod ::std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin(); pBkmk != aSaveBkmks.end(); ++pBkmk) - pBkmk->SetInDoc(&m_rSwdoc, aIdx); + pBkmk->SetInDoc(&m_rDoc, aIdx); if( !aSavRedlInsPosArr.empty() ) { @@ -2225,7 +2225,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod for( size_t n = 0; n < aSavRedlInsPosArr.size(); ++n ) { SwRangeRedline* pTmp = aSavRedlInsPosArr[ n ]; - if( m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().Contains( pTmp ) ) + if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().Contains( pTmp ) ) { SwPosition* pEnd = pTmp->End(); pEnd->nNode = aIdx; @@ -2235,12 +2235,12 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod } if( !aSaveRedl.empty() ) - lcl_RestoreRedlines( &m_rSwdoc, aIdx.GetIndex(), aSaveRedl ); + lcl_RestoreRedlines( &m_rDoc, aIdx.GetIndex(), aSaveRedl ); if( pUndo ) { pUndo->SetDestRange( aIdx, rPos, *pSaveInsPos ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } delete pSaveInsPos; @@ -2249,14 +2249,14 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod { if( !aTmpFntIdx.empty() ) { - m_rSwdoc.GetFtnIdxs().insert( aTmpFntIdx ); + m_rDoc.GetFtnIdxs().insert( aTmpFntIdx ); aTmpFntIdx.clear(); } - m_rSwdoc.GetFtnIdxs().UpdateAllFtn(); + m_rDoc.GetFtnIdxs().UpdateAllFtn(); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -2277,7 +2277,7 @@ bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPo if( pTxtNd && pTxtNd->CanJoinNext( &aNxtIdx ) ) { { // Block so SwIndex into node is deleted before Join - m_rSwdoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTxtNd, + m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTxtNd, pTxtNd->GetTxt().getLength()) ), 0, true ); } pTxtNd->JoinNext(); @@ -2289,11 +2289,11 @@ bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPo bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUString &rStr ) { SwPosition& rPt = *(SwPosition*)rRg.GetPoint(); - if( m_rSwdoc.GetAutoCorrExceptWord() ) // Add to AutoCorrect + if( m_rDoc.GetAutoCorrExceptWord() ) // Add to AutoCorrect { if( 1 == rStr.getLength() ) - m_rSwdoc.GetAutoCorrExceptWord()->CheckChar( rPt, rStr[ 0 ] ); - m_rSwdoc.DeleteAutoCorrExceptWord(); + m_rDoc.GetAutoCorrExceptWord()->CheckChar( rPt, rStr[ 0 ] ); + m_rDoc.DeleteAutoCorrExceptWord(); } SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode(); @@ -2302,9 +2302,9 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri return false; } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); // AppendUndo not always called + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); // AppendUndo not always called } const size_t nOldAttrCnt = pNode->GetpSwpHints() @@ -2325,24 +2325,24 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri lcl_SkipAttr( pNode, rIdx, nStart ); } sal_Unicode c = rStr[ nCnt ]; - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { bool bMerged(false); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesGroupUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo()) { - SwUndo *const pUndo = m_rSwdoc.GetUndoManager().GetLastUndo(); + SwUndo *const pUndo = m_rDoc.GetUndoManager().GetLastUndo(); SwUndoOverwrite *const pUndoOW( dynamic_cast<SwUndoOverwrite *>(pUndo) ); if (pUndoOW) { // if CanGrouping() returns true it's already merged - bMerged = pUndoOW->CanGrouping( &m_rSwdoc, rPt, c ); + bMerged = pUndoOW->CanGrouping( &m_rDoc, rPt, c ); } } if (!bMerged) { - SwUndo *const pUndoOW( new SwUndoOverwrite(&m_rSwdoc, rPt, c) ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndoOW); + SwUndo *const pUndoOW( new SwUndoOverwrite(&m_rDoc, rPt, c) ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndoOW); } } else @@ -2373,21 +2373,21 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri pNode->ModifyBroadcast( 0, &aHint, TYPE( SwCrsrShell ) ); } - if (!m_rSwdoc.GetIDocumentUndoRedo().DoesUndo() && - !m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty()) + if (!m_rDoc.GetIDocumentUndoRedo().DoesUndo() && + !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty()) { SwPaM aPam( rPt.nNode, nStart, rPt.nNode, rPt.nContent.GetIndex() ); - m_rSwdoc.getIDocumentRedlineAccess().DeleteRedline( aPam, true, USHRT_MAX ); + m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aPam, true, USHRT_MAX ); } - else if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() ) + else if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) { // FIXME: this redline is WRONG: there is no DELETE, and the skipped // characters are also included in aPam SwPaM aPam( rPt.nNode, nStart, rPt.nNode, rPt.nContent.GetIndex() ); - m_rSwdoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); + m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -2395,19 +2395,19 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS const enum InsertFlags nInsertMode ) { // fetching DoesUndo is surprisingly expensive - bool bDoesUndo = m_rSwdoc.GetIDocumentUndoRedo().DoesUndo(); + bool bDoesUndo = m_rDoc.GetIDocumentUndoRedo().DoesUndo(); if (bDoesUndo) - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); // AppendUndo not always called! + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); // AppendUndo not always called! const SwPosition& rPos = *rRg.GetPoint(); - if( m_rSwdoc.GetAutoCorrExceptWord() ) // add to auto correction + if( m_rDoc.GetAutoCorrExceptWord() ) // add to auto correction { - if( 1 == rStr.getLength() && m_rSwdoc.GetAutoCorrExceptWord()->IsDeleted() ) + if( 1 == rStr.getLength() && m_rDoc.GetAutoCorrExceptWord()->IsDeleted() ) { - m_rSwdoc.GetAutoCorrExceptWord()->CheckChar( rPos, rStr[ 0 ] ); + m_rDoc.GetAutoCorrExceptWord()->CheckChar( rPos, rStr[ 0 ] ); } - m_rSwdoc.DeleteAutoCorrExceptWord(); + m_rDoc.DeleteAutoCorrExceptWord(); } SwTxtNode *const pNode = rPos.nNode.GetNode().GetTxtNode(); @@ -2416,14 +2416,14 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS SwDataChanged aTmp( rRg ); - if (!bDoesUndo || !m_rSwdoc.GetIDocumentUndoRedo().DoesGroupUndo()) + if (!bDoesUndo || !m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo()) { OUString const ins(pNode->InsertText(rStr, rPos.nContent, nInsertMode)); if (bDoesUndo) { SwUndoInsert * const pUndo( new SwUndoInsert(rPos.nNode, rPos.nContent.GetIndex(), ins.getLength(), nInsertMode)); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } } else @@ -2433,7 +2433,7 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS // don't group the start if hints at the start should be expanded if (!(nInsertMode & IDocumentContentOperations::INS_FORCEHINTEXPAND)) { - SwUndo *const pLastUndo = m_rSwdoc.GetUndoManager().GetLastUndo(); + SwUndo *const pLastUndo = m_rDoc.GetUndoManager().GetLastUndo(); SwUndoInsert *const pUndoInsert( dynamic_cast<SwUndoInsert *>(pLastUndo) ); if (pUndoInsert && pUndoInsert->CanGrouping(rPos)) @@ -2449,7 +2449,7 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS { pUndo = new SwUndoInsert( rPos.nNode, nInsPos, 0, nInsertMode, !rCC.isLetterNumeric( rStr, 0 ) ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( pUndo ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndo ); } OUString const ins(pNode->InsertText(rStr, rPos.nContent, nInsertMode)); @@ -2462,28 +2462,28 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS { pUndo = new SwUndoInsert(rPos.nNode, nInsPos, 1, nInsertMode, !rCC.isLetterNumeric(ins, i)); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( pUndo ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndo ); } } } // To-Do - add 'SwExtraRedlineTbl' also ? - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )) + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )) { SwPaM aPam( rPos.nNode, aTmp.GetCntnt(), rPos.nNode, rPos.nContent.GetIndex()); - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() ) + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) { - m_rSwdoc.getIDocumentRedlineAccess().AppendRedline( + m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); } else { - m_rSwdoc.getIDocumentRedlineAccess().SplitRedline( aPam ); + m_rDoc.getIDocumentRedlineAccess().SplitRedline( aPam ); } } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -2491,7 +2491,7 @@ void DocumentContentOperationsManager::TransliterateText( const SwPaM& rPaM, utl::TransliterationWrapper& rTrans ) { - SwUndoTransliterate *const pUndo = (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + SwUndoTransliterate *const pUndo = (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) ? new SwUndoTransliterate( rPaM, rTrans ) : 0; @@ -2556,12 +2556,12 @@ void DocumentContentOperationsManager::TransliterateText( { if( pUndo->HasData() ) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } else delete pUndo; } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, @@ -2573,11 +2573,11 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, SwFrmFmt* pFrmFmt ) { if( !pFrmFmt ) - pFrmFmt = m_rSwdoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC ); - SwGrfNode* pSwGrfNode = m_rSwdoc.GetNodes().MakeGrfNode( - SwNodeIndex( m_rSwdoc.GetNodes().GetEndOfAutotext() ), + pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC ); + SwGrfNode* pSwGrfNode = m_rDoc.GetNodes().MakeGrfNode( + SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), rGrfName, rFltName, pGraphic, - m_rSwdoc.GetDfltGrfFmtColl() ); + m_rDoc.GetDfltGrfFmtColl() ); SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode, pFlyAttrSet, pGrfAttrSet, pFrmFmt ); return pSwFlyFrmFmt; @@ -2589,10 +2589,10 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const G SwFrmFmt* pFrmFmt ) { if( !pFrmFmt ) - pFrmFmt = m_rSwdoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC ); - SwGrfNode* pSwGrfNode = m_rSwdoc.GetNodes().MakeGrfNode( - SwNodeIndex( m_rSwdoc.GetNodes().GetEndOfAutotext() ), - rGrfObj, m_rSwdoc.GetDfltGrfFmtColl() ); + pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC ); + SwGrfNode* pSwGrfNode = m_rDoc.GetNodes().MakeGrfNode( + SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), + rGrfObj, m_rDoc.GetDfltGrfFmtColl() ); SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode, pFlyAttrSet, pGrfAttrSet, pFrmFmt ); return pSwFlyFrmFmt; @@ -2610,12 +2610,12 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const sv if (SotExchange::IsMath(aClassName)) nId = RES_POOLFRM_FORMEL; - pFrmFmt = m_rSwdoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( nId ); + pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( nId ); } - return _InsNoTxtNode( *rRg.GetPoint(), m_rSwdoc.GetNodes().MakeOLENode( - SwNodeIndex( m_rSwdoc.GetNodes().GetEndOfAutotext() ), + return _InsNoTxtNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode( + SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), xObj, - m_rSwdoc.GetDfltGrfFmtColl() ), + m_rDoc.GetDfltGrfFmtColl() ), pFlyAttrSet, pGrfAttrSet, pFrmFmt ); } @@ -2627,14 +2627,14 @@ SwFlyFrmFmt* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const SwFrmFmt* pFrmFmt ) { if( !pFrmFmt ) - pFrmFmt = m_rSwdoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_OLE ); + pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_OLE ); return _InsNoTxtNode( *rRg.GetPoint(), - m_rSwdoc.GetNodes().MakeOLENode( - SwNodeIndex( m_rSwdoc.GetNodes().GetEndOfAutotext() ), + m_rDoc.GetNodes().MakeOLENode( + SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ), rObjName, nAspect, - m_rSwdoc.GetDfltGrfFmtColl(), + m_rDoc.GetDfltGrfFmtColl(), 0 ), pFlyAttrSet, pGrfAttrSet, pFrmFmt ); @@ -2649,9 +2649,9 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf || rPam.GetPoint()->nNode.GetIndex() == rPam.GetMark()->nNode.GetIndex() ) && 0 != ( pGrfNd = rPam.GetPoint()->nNode.GetNode().GetGrfNode() ) ) { - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoReRead(rPam, *pGrfNd)); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoReRead(rPam, *pGrfNd)); } // Because we don't know if we can mirror the graphic, the mirror attribute is always reset @@ -2660,7 +2660,7 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf pGrfNd->SetAttr( SwMirrorGrf() ); pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, true ); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } } @@ -2670,7 +2670,7 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj( SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) { - SwDrawFrmFmt* pFmt = m_rSwdoc.MakeDrawFrmFmt( OUString(), m_rSwdoc.GetDfltFrmFmt() ); + SwDrawFrmFmt* pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() ); const SwFmtAnchor* pAnchor = 0; rFlyAttrSet.GetItemState( RES_ANCHOR, false, (const SfxPoolItem**) &pAnchor ); @@ -2695,7 +2695,7 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj( // allow drawing objects in header/footer, but control objects aren't allowed in header/footer. if( pChkIdx != NULL && ::CheckControlLayer( &rDrawObj ) - && m_rSwdoc.IsInHeaderFooter( *pChkIdx ) ) + && m_rDoc.IsInHeaderFooter( *pChkIdx ) ) { // apply at-page anchor format eAnchorId = FLY_AT_PAGE; @@ -2753,7 +2753,7 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj( SwDrawContact* pContact = new SwDrawContact( pFmt, &rDrawObj ); // Create Frames if necessary - if( m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell() ) + if( m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() ) { // create layout representation pFmt->MakeFrms(); @@ -2766,12 +2766,12 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj( } } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFmt(pFmt, 0, 0) ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFmt(pFmt, 0, 0) ); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return pFmt; } @@ -2784,18 +2784,18 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b { // BUG 26675: Send DataChanged before deleting, so that we notice which objects are in scope. // After that they can be before/after the position. - SwDataChanged aTmp( &m_rSwdoc, rPos ); + SwDataChanged aTmp( &m_rDoc, rPos ); } SwUndoSplitNode* pUndo = 0; - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); // insert the Undo object (currently only for TextNode) if( pNode->IsTxtNode() ) { - pUndo = new SwUndoSplitNode( &m_rSwdoc, rPos, bChkTableStart ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + pUndo = new SwUndoSplitNode( &m_rDoc, rPos, bChkTableStart ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } } @@ -2805,7 +2805,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b const sal_Int32 nPos = rPos.nContent.GetIndex(); if( pTxtNode && nPos && nPos != pTxtNode->Len() ) { - m_rSwdoc.UpdateParRsid( pTxtNode ); + m_rDoc.UpdateParRsid( pTxtNode ); } //JP 28.01.97: Special case for SplitNode at table start: @@ -2815,11 +2815,11 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b { sal_uLong nPrevPos = rPos.nNode.GetIndex() - 1; const SwTableNode* pTblNd; - const SwNode* pNd = m_rSwdoc.GetNodes()[ nPrevPos ]; + const SwNode* pNd = m_rDoc.GetNodes()[ nPrevPos ]; if( pNd->IsStartNode() && SwTableBoxStartNode == ((SwStartNode*)pNd)->GetStartNodeType() && - 0 != ( pTblNd = m_rSwdoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) && - ((( pNd = m_rSwdoc.GetNodes()[ --nPrevPos ])->IsStartNode() && + 0 != ( pTblNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) && + ((( pNd = m_rDoc.GetNodes()[ --nPrevPos ])->IsStartNode() && SwTableBoxStartNode != ((SwStartNode*)pNd)->GetStartNodeType() ) || ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsTableNode() ) || pNd->IsCntntNode() )) @@ -2829,7 +2829,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b //JP 30.04.99 Bug 65660: // There are no page breaks outside of the normal body area, // so this is not a valid condition to insert a paragraph. - if( nPrevPos < m_rSwdoc.GetNodes().GetEndOfExtras().GetIndex() ) + if( nPrevPos < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() ) pNd = 0; else { @@ -2843,16 +2843,16 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b if( pNd ) { - SwTxtNode* pTxtNd = m_rSwdoc.GetNodes().MakeTxtNode( + SwTxtNode* pTxtNd = m_rDoc.GetNodes().MakeTxtNode( SwNodeIndex( *pTblNd ), - m_rSwdoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT )); + m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT )); if( pTxtNd ) { ((SwPosition&)rPos).nNode = pTblNd->GetIndex()-1; ((SwPosition&)rPos).nContent.Assign( pTxtNd, 0 ); // only add page breaks/styles to the body area - if( nPrevPos > m_rSwdoc.GetNodes().GetEndOfExtras().GetIndex() ) + if( nPrevPos > m_rDoc.GetNodes().GetEndOfExtras().GetIndex() ) { SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt(); const SfxPoolItem *pItem; @@ -2872,7 +2872,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b if( pUndo ) pUndo->SetTblFlag(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } } @@ -2880,7 +2880,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b } const boost::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create()); - pCntntStore->Save( &m_rSwdoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true ); + pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true ); // FIXME: only SwTxtNode has a valid implementation of SplitCntntNode! OSL_ENSURE(pNode->IsTxtNode(), "splitting non-text node?"); pNode = pNode->SplitCntntNode( rPos ); @@ -2888,22 +2888,22 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b { // move all bookmarks, TOXMarks, FlyAtCnt if( !pCntntStore->Empty() ) - pCntntStore->Restore( &m_rSwdoc, rPos.nNode.GetIndex()-1, 0, true ); + pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true ); // To-Do - add 'SwExtraRedlineTbl' also ? - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )) + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )) { SwPaM aPam( rPos ); aPam.SetMark(); aPam.Move( fnMoveBackward ); - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() ) - m_rSwdoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) + m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); else - m_rSwdoc.getIDocumentRedlineAccess().SplitRedline( aPam ); + m_rDoc.getIDocumentRedlineAccess().SplitRedline( aPam ); } } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -2915,8 +2915,8 @@ bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos ) { // so then one can be created! SwNodeIndex aIdx( rPos.nNode, 1 ); - pCurNode = m_rSwdoc.GetNodes().MakeTxtNode( aIdx, - m_rSwdoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD )); + pCurNode = m_rDoc.GetNodes().MakeTxtNode( aIdx, + m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD )); } else pCurNode = (SwTxtNode*)pCurNode->AppendNode( rPos ); @@ -2924,24 +2924,24 @@ bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos ) rPos.nNode++; rPos.nContent.Assign( pCurNode, 0 ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) ); } // To-Do - add 'SwExtraRedlineTbl' also ? - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )) + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )) { SwPaM aPam( rPos ); aPam.SetMark(); aPam.Move( fnMoveBackward ); - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() ) - m_rSwdoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) + m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true); else - m_rSwdoc.getIDocumentRedlineAccess().SplitRedline( aPam ); + m_rDoc.getIDocumentRedlineAccess().SplitRedline( aPam ); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -2976,7 +2976,7 @@ bool DocumentContentOperationsManager::ReplaceRange( SwPaM& rPam, const OUString { // park aPam somewhere so it does not point to node that is deleted aPam.DeleteMark(); - *aPam.GetPoint() = SwPosition(m_rSwdoc.GetNodes().GetEndOfContent()); + *aPam.GetPoint() = SwPosition(m_rDoc.GetNodes().GetEndOfContent()); return ReplaceRangeImpl(rPam, rStr, bRegExReplace); // original pam! } @@ -3001,7 +3001,7 @@ bool DocumentContentOperationsManager::ReplaceRange( SwPaM& rPam, const OUString rStart.nContent = *iter + 1; if (rEnd.nContent != rStart.nContent) // check if part is empty { - bRet &= (m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn()) + bRet &= (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn()) ? DeleteAndJoinWithRedlineImpl(aPam) : DeleteAndJoinImpl(aPam, false); } @@ -3030,24 +3030,24 @@ bool DocumentContentOperationsManager::InsertPoolItem( { SwDataChanged aTmp( rRg ); SwUndoAttr* pUndoAttr = 0; - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); pUndoAttr = new SwUndoAttr( rRg, rHt, nFlags ); } - SfxItemSet aSet( m_rSwdoc.GetAttrPool(), rHt.Which(), rHt.Which() ); + SfxItemSet aSet( m_rDoc.GetAttrPool(), rHt.Which(), rHt.Which() ); aSet.Put( rHt ); - const bool bRet = lcl_InsAttr( &m_rSwdoc, rRg, aSet, nFlags, pUndoAttr, bExpandCharToPara ); + const bool bRet = lcl_InsAttr( &m_rDoc, rRg, aSet, nFlags, pUndoAttr, bExpandCharToPara ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( pUndoAttr ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndoAttr ); } if( bRet ) { - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } return bRet; } @@ -3057,21 +3057,21 @@ bool DocumentContentOperationsManager::InsertItemSet ( const SwPaM &rRg, const S { SwDataChanged aTmp( rRg ); SwUndoAttr* pUndoAttr = 0; - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); pUndoAttr = new SwUndoAttr( rRg, rSet, nFlags ); } - bool bRet = lcl_InsAttr( &m_rSwdoc, rRg, rSet, nFlags, pUndoAttr ); + bool bRet = lcl_InsAttr( &m_rDoc, rRg, rSet, nFlags, pUndoAttr ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( pUndoAttr ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndoAttr ); } if( bRet ) - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return bRet; } @@ -3124,7 +3124,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly( if ( bMergedFirstNode ) aRg.aStart++; if ( aRg.aStart <= aRg.aEnd ) - m_rSwdoc.GetNodes()._CopyNodes( aRg, rInsPos, bMakeNewFrms, true ); + m_rDoc.GetNodes()._CopyNodes( aRg, rInsPos, bMakeNewFrms, true ); if ( !bMergedFirstNode ) ++aSavePos; if ( bEndIsEqualEndPos ) @@ -3160,7 +3160,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly( SwNodeRange aCpyRange( aSavePos, rInsPos ); // Also copy all bookmarks - if( m_rSwdoc.getIDocumentMarkAccess()->getAllMarksCount() ) + if( m_rDoc.getIDocumentMarkAccess()->getAllMarksCount() ) { SwPaM aRgTmp( rRg.aStart, rRg.aEnd ); SwPaM aCpyTmp( aCpyRange.aStart, aCpyRange.aEnd ); @@ -3188,15 +3188,15 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // managed in the DrawModel). SwDoc *const pDest = rStartIdx.GetNode().GetDoc(); ::std::set< _ZSortFly > aSet; - const size_t nArrLen = m_rSwdoc.GetSpzFrmFmts()->size(); + const size_t nArrLen = m_rDoc.GetSpzFrmFmts()->size(); SwTextBoxHelper::SavedLink aOldTextBoxes; - SwTextBoxHelper::saveLinks(*m_rSwdoc.GetSpzFrmFmts(), aOldTextBoxes); + SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrmFmts(), aOldTextBoxes); SwTextBoxHelper::SavedContent aOldContent; for ( size_t n = 0; n < nArrLen; ++n ) { - SwFrmFmt* pFmt = (*m_rSwdoc.GetSpzFrmFmts())[n]; + SwFrmFmt* pFmt = (*m_rDoc.GetSpzFrmFmts())[n]; SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor(); SwPosition const*const pAPos = pAnchor->GetCntntAnchor(); bool bAtCntnt = (pAnchor->GetAnchorId() == FLY_AT_PARA); @@ -3206,7 +3206,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( (pAnchor->GetAnchorId() == FLY_AT_CHAR)) && (( bCopyFlyAtFly && FLY_AT_FLY == pAnchor->GetAnchorId() ) ? rRg.aStart <= pAPos->nNode.GetIndex() + 1 - : ( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineMove() + : ( m_rDoc.getIDocumentRedlineAccess().IsRedlineMove() ? rRg.aStart < pAPos->nNode : rRg.aStart <= pAPos->nNode )) && pAPos->nNode <= rRg.aEnd ) @@ -3219,7 +3219,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( bool bAdd = false; if( pAPos->nNode < rRg.aEnd ) bAdd = true; - if (!bAdd && !m_rSwdoc.getIDocumentRedlineAccess().IsRedlineMove()) // fdo#40599: not for redline move + if (!bAdd && !m_rDoc.getIDocumentRedlineAccess().IsRedlineMove()) // fdo#40599: not for redline move { bool bEmptyNode = false; bool bLastNode = false; @@ -3363,7 +3363,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // Check recursion: copy content in its own frame, then don't copy it. bool bMakeCpy = true; - if( pDest == &m_rSwdoc ) + if( pDest == &m_rDoc ) { const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt(); const SwStartNode* pSNd; @@ -3468,47 +3468,47 @@ DocumentContentOperationsManager::~DocumentContentOperationsManager() bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPam, const bool ) { - OSL_ENSURE( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn(), "DeleteAndJoinWithRedline: redline off" ); + OSL_ENSURE( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn(), "DeleteAndJoinWithRedline: redline off" ); { SwUndoRedlineDelete* pUndo = 0; - RedlineMode_t eOld = m_rSwdoc.getIDocumentRedlineAccess().GetRedlineMode(); - m_rSwdoc.GetDocumentRedlineManager().checkRedlining( eOld ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + RedlineMode_t eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineMode(); + m_rDoc.GetDocumentRedlineManager().checkRedlining( eOld ); + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { /* please don't translate -- for cultural reasons this comment is protected until the redline implementation is finally fixed some day */ //JP 06.01.98: MUSS noch optimiert werden!!! - m_rSwdoc.getIDocumentRedlineAccess().SetRedlineMode( + m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t) ( nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ) ); - m_rSwdoc.GetIDocumentUndoRedo().StartUndo( UNDO_DELETE, NULL ); + m_rDoc.GetIDocumentUndoRedo().StartUndo( UNDO_DELETE, NULL ); pUndo = new SwUndoRedlineDelete( rPam, UNDO_DELETE ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( pUndo ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndo ); } if ( *rPam.GetPoint() != *rPam.GetMark() ) - m_rSwdoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_DELETE, rPam ), true ); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_DELETE, rPam ), true ); + m_rDoc.getIDocumentState().SetModified(); if ( pUndo ) { - m_rSwdoc.GetIDocumentUndoRedo().EndUndo( UNDO_EMPTY, NULL ); + m_rDoc.GetIDocumentUndoRedo().EndUndo( UNDO_EMPTY, NULL ); // ??? why the hell is the AppendUndo not below the // CanGrouping, so this hideous cleanup wouldn't be necessary? // bah, this is redlining, probably changing this would break it... - if ( m_rSwdoc.GetIDocumentUndoRedo().DoesGroupUndo() ) + if ( m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo() ) { - SwUndo * const pLastUndo( m_rSwdoc.GetUndoManager().GetLastUndo() ); + SwUndo * const pLastUndo( m_rDoc.GetUndoManager().GetLastUndo() ); SwUndoRedlineDelete * const pUndoRedlineDel( dynamic_cast< SwUndoRedlineDelete* >( pLastUndo ) ); if ( pUndoRedlineDel ) { bool const bMerged = pUndoRedlineDel->CanGrouping( *pUndo ); if ( bMerged ) { - ::sw::UndoGuard const undoGuard( m_rSwdoc.GetIDocumentUndoRedo() ); - SwUndo const* const pDeleted = m_rSwdoc.GetUndoManager().RemoveLastUndo(); + ::sw::UndoGuard const undoGuard( m_rDoc.GetIDocumentUndoRedo() ); + SwUndo const* const pDeleted = m_rDoc.GetUndoManager().RemoveLastUndo(); OSL_ENSURE( pDeleted == pUndo, "DeleteAndJoinWithRedlineImpl: " "undo removed is not undo inserted?" ); delete pDeleted; @@ -3516,7 +3516,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa } } //JP 06.01.98: MUSS noch optimiert werden!!! - m_rSwdoc.getIDocumentRedlineAccess().SetRedlineMode( eOld ); + m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( eOld ); } return true; } @@ -3570,13 +3570,13 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam) if( !rPam.HasMark() || *pStt >= *pEnd ) return false; - if( m_rSwdoc.GetAutoCorrExceptWord() ) + if( m_rDoc.GetAutoCorrExceptWord() ) { // if necessary the saved Word for the exception - if( m_rSwdoc.GetAutoCorrExceptWord()->IsDeleted() || pStt->nNode != pEnd->nNode || + if( m_rDoc.GetAutoCorrExceptWord()->IsDeleted() || pStt->nNode != pEnd->nNode || pStt->nContent.GetIndex() + 1 != pEnd->nContent.GetIndex() || - !m_rSwdoc.GetAutoCorrExceptWord()->CheckDelChar( *pStt )) - { m_rSwdoc.DeleteAutoCorrExceptWord(); } + !m_rDoc.GetAutoCorrExceptWord()->CheckDelChar( *pStt )) + { m_rDoc.DeleteAutoCorrExceptWord(); } } { @@ -3608,33 +3608,33 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam) SwDataChanged aTmp( rPam ); } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); + m_rDoc.GetIDocumentUndoRedo().ClearRedo(); bool bMerged(false); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesGroupUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo()) { - SwUndo *const pLastUndo( m_rSwdoc.GetUndoManager().GetLastUndo() ); + SwUndo *const pLastUndo( m_rDoc.GetUndoManager().GetLastUndo() ); SwUndoDelete *const pUndoDelete( dynamic_cast<SwUndoDelete *>(pLastUndo) ); if (pUndoDelete) { - bMerged = pUndoDelete->CanGrouping( &m_rSwdoc, rPam ); + bMerged = pUndoDelete->CanGrouping( &m_rDoc, rPam ); // if CanGrouping() returns true it's already merged } } if (!bMerged) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelete( rPam ) ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelete( rPam ) ); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } - if( !m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) - m_rSwdoc.getIDocumentRedlineAccess().DeleteRedline( rPam, true, USHRT_MAX ); + if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) + m_rDoc.getIDocumentRedlineAccess().DeleteRedline( rPam, true, USHRT_MAX ); // Delete and move all "Flys at the paragraph", which are within the Selection DelFlyInRange(rPam.GetMark()->nNode, rPam.GetPoint()->nNode); @@ -3720,7 +3720,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam) if( aSttIdx != nEnde ) { // delete the Nodes into the NodesArary - m_rSwdoc.GetNodes().Delete( aSttIdx, nEnde - aSttIdx.GetIndex() ); + m_rDoc.GetNodes().Delete( aSttIdx, nEnde - aSttIdx.GetIndex() ); } // If the Node that contained the Cursor has been deleted, @@ -3736,9 +3736,9 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam) } while( false ); - if( !m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) - m_rSwdoc.getIDocumentRedlineAccess().CompressRedlines(); - m_rSwdoc.getIDocumentState().SetModified(); + if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ) + m_rDoc.getIDocumentRedlineAccess().CompressRedlines(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -3778,25 +3778,25 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt SwDataChanged aTmp( aDelPam ); - if( m_rSwdoc.getIDocumentRedlineAccess().IsRedlineOn() ) + if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) { - RedlineMode_t eOld = m_rSwdoc.getIDocumentRedlineAccess().GetRedlineMode(); - m_rSwdoc.GetDocumentRedlineManager().checkRedlining(eOld); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + RedlineMode_t eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineMode(); + m_rDoc.GetDocumentRedlineManager().checkRedlining(eOld); + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL); + m_rDoc.GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL); // If any Redline will change (split!) the node - const ::sw::mark::IMark* pBkmk = m_rSwdoc.getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + const ::sw::mark::IMark* pBkmk = m_rDoc.getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); //JP 06.01.98: MUSS noch optimiert werden!!! - m_rSwdoc.getIDocumentRedlineAccess().SetRedlineMode( + m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE )); *aDelPam.GetPoint() = pBkmk->GetMarkPos(); if(pBkmk->IsExpanded()) *aDelPam.GetMark() = pBkmk->GetOtherMarkPos(); - m_rSwdoc.getIDocumentMarkAccess()->deleteMark(pBkmk); + m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk); pStt = aDelPam.Start(); pTxtNd = pStt->nNode.GetNode().GetTxtNode(); nStt = pStt->nContent.GetIndex(); @@ -3805,7 +3805,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt if( !sRepl.isEmpty() ) { // Apply the first character's attributes to the ReplaceText - SfxItemSet aSet( m_rSwdoc.GetAttrPool(), + SfxItemSet aSet( m_rDoc.GetAttrPool(), RES_CHRATR_BEGIN, RES_TXTATR_WITHEND_END - 1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 ); @@ -3860,26 +3860,26 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt nPtCnt); *aTmpRange.GetMark() = *aDelPam.GetPoint(); - m_rSwdoc.RstTxtAttrs( aTmpRange ); + m_rDoc.RstTxtAttrs( aTmpRange ); InsertItemSet( aTmpRange, aSet, 0 ); } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwUndo *const pUndoRD = new SwUndoRedlineDelete( aDelPam, UNDO_REPLACE ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndoRD); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndoRD); } - m_rSwdoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_DELETE, aDelPam ), true); + m_rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_DELETE, aDelPam ), true); *rPam.GetMark() = *aDelPam.GetMark(); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { *aDelPam.GetPoint() = *rPam.GetPoint(); - m_rSwdoc.GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL); + m_rDoc.GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL); // If any Redline will change (split!) the node - const ::sw::mark::IMark* pBkmk = m_rSwdoc.getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + const ::sw::mark::IMark* pBkmk = m_rDoc.getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); SwIndex& rIdx = aDelPam.GetPoint()->nContent; rIdx.Assign( 0, 0 ); @@ -3888,28 +3888,28 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt rPam.GetPoint()->nContent = rIdx; *rPam.GetMark() = *rPam.GetPoint(); //JP 06.01.98: MUSS noch optimiert werden!!! - m_rSwdoc.getIDocumentRedlineAccess().SetRedlineMode( eOld ); + m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( eOld ); *rPam.GetPoint() = pBkmk->GetMarkPos(); if(pBkmk->IsExpanded()) *rPam.GetMark() = pBkmk->GetOtherMarkPos(); - m_rSwdoc.getIDocumentMarkAccess()->deleteMark(pBkmk); + m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk); } bJoinTxt = false; } else { - if( !m_rSwdoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().size() ) - m_rSwdoc.getIDocumentRedlineAccess().DeleteRedline( aDelPam, true, USHRT_MAX ); + if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size() ) + m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aDelPam, true, USHRT_MAX ); SwUndoReplace* pUndoRpl = 0; - bool const bDoesUndo = m_rSwdoc.GetIDocumentUndoRedo().DoesUndo(); + bool const bDoesUndo = m_rDoc.GetIDocumentUndoRedo().DoesUndo(); if (bDoesUndo) { pUndoRpl = new SwUndoReplace(aDelPam, sRepl, bRegExReplace); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndoRpl); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndoRpl); } - ::sw::UndoGuard const undoGuard(m_rSwdoc.GetIDocumentUndoRedo()); + ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo()); if( aDelPam.GetPoint() != pStt ) aDelPam.Exchange(); @@ -3978,7 +3978,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt if( bJoinTxt ) ::sw_JoinText( rPam, bJoinPrev ); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return true; } @@ -3990,7 +3990,7 @@ SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition& SwFlyFrmFmt *pFmt = 0; if( pNode ) { - pFmt = m_rSwdoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA, + pFmt = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA, pFlyAttrSet, pFrmFmt ); if( pGrfAttrSet ) pNode->SetAttr( *pGrfAttrSet ); @@ -4075,12 +4075,12 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, if( !rPam.HasMark() || ( *pStt > *pEnd && !bColumnSel ) || //JP 29.6.2001: 88963 - dont copy if inspos is in region of start to end //JP 15.11.2001: don't test inclusive the end, ever exclusive - ( pDoc == &m_rSwdoc && *pStt <= rPos && rPos < *pEnd )) + ( pDoc == &m_rDoc && *pStt <= rPos && rPos < *pEnd )) { return false; } - const bool bEndEqualIns = pDoc == &m_rSwdoc && rPos == *pEnd; + const bool bEndEqualIns = pDoc == &m_rDoc && rPos == *pEnd; // If Undo is enabled, create the UndoCopy object SwUndoCpyDoc* pUndo = 0; @@ -4088,7 +4088,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, // removing the redlines so use cursor that is corrected by PaMCorrAbs ::boost::scoped_ptr<SwUnoCrsr> const pCopyPam(pDoc->CreateUnoCrsr(rPos)); - SwTblNumFmtMerge aTNFM( m_rSwdoc, *pDoc ); + SwTblNumFmtMerge aTNFM( m_rDoc, *pDoc ); if (pDoc->GetIDocumentUndoRedo().DoesUndo()) { @@ -4130,9 +4130,9 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, bool bStartIsTxtNode = 0 != pSttTxtNd; // #i104585# copy outline num rule to clipboard (for ASCII filter) - if (pDoc->IsClipBoard() && m_rSwdoc.GetOutlineNumRule()) + if (pDoc->IsClipBoard() && m_rDoc.GetOutlineNumRule()) { - pDoc->SetOutlineNumRule(*m_rSwdoc.GetOutlineNumRule()); + pDoc->SetOutlineNumRule(*m_rDoc.GetOutlineNumRule()); } // #i86492# @@ -4414,7 +4414,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, pCopyPam->Exchange(); // Also copy all bookmarks - if( bCopyBookmarks && m_rSwdoc.getIDocumentMarkAccess()->getAllMarksCount() ) + if( bCopyBookmarks && m_rDoc.getIDocumentMarkAccess()->getAllMarksCount() ) lcl_CopyBookmarks( rPam, *pCopyPam ); if( nsRedlineMode_t::REDLINE_DELETE_REDLINES & eOld ) diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index dd574538046c..baf908647058 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -50,7 +50,7 @@ class SwWait; namespace sw { -DocumentDeviceManager::DocumentDeviceManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), mpPrt(0), mpVirDev(0), mpPrtData(0) {} +DocumentDeviceManager::DocumentDeviceManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), mpPrt(0), mpVirDev(0), mpPrtData(0) {} SfxPrinter* DocumentDeviceManager::getPrinter(/*[in]*/ bool bCreate ) const { @@ -81,14 +81,14 @@ void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDe mpPrt->SetMapMode( aMapMode ); } - if ( m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel() && !m_rSwdoc.GetDocumentSettingManager().get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( mpPrt ); + if ( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() && !m_rDoc.GetDocumentSettingManager().get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( mpPrt ); } if ( bCallPrtDataChanged && // #i41075# Do not call PrtDataChanged() if we do not // use the printer for formatting: - !m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) + !m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) PrtDataChanged(); } @@ -111,15 +111,15 @@ void DocumentDeviceManager::setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]* delete mpVirDev; mpVirDev = pVd; - if ( m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel() && m_rSwdoc.GetDocumentSettingManager().get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( mpVirDev ); + if ( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() && m_rDoc.GetDocumentSettingManager().get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( mpVirDev ); } } OutputDevice* DocumentDeviceManager::getReferenceDevice(/*[in]*/ bool bCreate ) const { OutputDevice* pRet = 0; - if ( !m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) + if ( !m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) { pRet = getPrinter( bCreate ); @@ -138,8 +138,8 @@ OutputDevice* DocumentDeviceManager::getReferenceDevice(/*[in]*/ bool bCreate ) void DocumentDeviceManager::setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) { - if ( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) != bNewVirtual || - m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) != bNewHiRes ) + if ( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) != bNewVirtual || + m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE) != bNewHiRes ) { if ( bNewVirtual ) { @@ -149,8 +149,8 @@ void DocumentDeviceManager::setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /* else pMyVirDev->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 ); - if( m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel() ) - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( pMyVirDev ); + if( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() ) + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( pMyVirDev ); } else { @@ -161,14 +161,14 @@ void DocumentDeviceManager::setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /* // getReferenceDevice()->getPrinter()->CreatePrinter_() // ->setPrinter()-> PrtDataChanged() SfxPrinter* pPrinter = getPrinter( true ); - if( m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel() ) - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( pPrinter ); + if( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() ) + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( pPrinter ); } - m_rSwdoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, bNewVirtual ); - m_rSwdoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, bNewHiRes ); + m_rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, bNewVirtual ); + m_rDoc.GetDocumentSettingManager().set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, bNewHiRes ); PrtDataChanged(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } } @@ -199,7 +199,7 @@ void DocumentDeviceManager::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) if( !mpPrt ) { //The ItemSet is deleted by Sfx! - SfxItemSet *pSet = new SfxItemSet( m_rSwdoc.GetAttrPool(), + SfxItemSet *pSet = new SfxItemSet( m_rDoc.GetAttrPool(), FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, SID_HTML_MODE, SID_HTML_MODE, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, @@ -214,7 +214,7 @@ void DocumentDeviceManager::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) bDataChanged = true; } } - if ( bDataChanged && !m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) + if ( bDataChanged && !m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) PrtDataChanged(); } @@ -228,7 +228,7 @@ const SwPrintData & DocumentDeviceManager::getPrintData() const // SwPrintData should be initialized from the configuration, // the respective config item is implemented by SwPrintOptions which // is also derived from SwPrintData - const SwDocShell *pDocSh = m_rSwdoc.GetDocShell(); + const SwDocShell *pDocSh = m_rDoc.GetDocShell(); OSL_ENSURE( pDocSh, "pDocSh is 0, can't determine if this is a WebDoc or not" ); bool bWeb = 0 != dynamic_cast< const SwWebDocShell * >(pDocSh); SwPrintOptions aPrintOptions( bWeb ); @@ -262,7 +262,7 @@ VirtualDevice& DocumentDeviceManager::CreateVirtualDevice_() const pNewVir->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 ); // #i60945# External leading compatibility for unix systems. - if ( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING ) ) + if ( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING ) ) pNewVir->Compat_ZeroExtleadBug(); MapMode aMapMode( pNewVir->GetMapMode() ); @@ -283,7 +283,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const // We create a default SfxPrinter. // The ItemSet is deleted by Sfx! - SfxItemSet *pSet = new SfxItemSet( m_rSwdoc.GetAttrPool(), + SfxItemSet *pSet = new SfxItemSet( m_rDoc.GetAttrPool(), FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, SID_HTML_MODE, SID_HTML_MODE, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, @@ -300,39 +300,39 @@ void DocumentDeviceManager::PrtDataChanged() // If you change this, also modify InJobSetup in Sw3io if appropriate. // #i41075# - OSL_ENSURE( m_rSwdoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) || + OSL_ENSURE( m_rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) || 0 != getPrinter( false ), "PrtDataChanged will be called recursively!" ); - SwRootFrm* pTmpRoot = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout(); + SwRootFrm* pTmpRoot = m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(); boost::scoped_ptr<SwWait> pWait; bool bEndAction = false; - if( m_rSwdoc.GetDocShell() ) - m_rSwdoc.GetDocShell()->UpdateFontList(); + if( m_rDoc.GetDocShell() ) + m_rDoc.GetDocShell()->UpdateFontList(); bool bDraw = true; if ( pTmpRoot ) { - SwViewShell *pSh = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell(); + SwViewShell *pSh = m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell(); if( pSh && (!pSh->GetViewOptions()->getBrowseMode() || pSh->GetViewOptions()->IsPrtFormat()) ) { - if ( m_rSwdoc.GetDocShell() ) - pWait.reset(new SwWait( *m_rSwdoc.GetDocShell(), true )); + if ( m_rDoc.GetDocShell() ) + pWait.reset(new SwWait( *m_rDoc.GetDocShell(), true )); pTmpRoot->StartAllAction(); bEndAction = true; bDraw = false; - if( m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel() ) + if( m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() ) { - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetAddExtLeading( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING) ); - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( getReferenceDevice( false ) ); + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetAddExtLeading( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING) ); + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( getReferenceDevice( false ) ); } pFntCache->Flush(); - std::set<SwRootFrm*> aAllLayouts = m_rSwdoc.GetAllLayouts(); + std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts(); std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE)); do @@ -340,21 +340,21 @@ void DocumentDeviceManager::PrtDataChanged() pSh->InitPrt( getPrinter(false) ); pSh = (SwViewShell*)pSh->GetNext(); } - while ( pSh != m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell() ); + while ( pSh != m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() ); } } - if ( bDraw && m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel() ) + if ( bDraw && m_rDoc.getIDocumentDrawModelAccess().GetDrawModel() ) { - const bool bTmpAddExtLeading = m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); - if ( bTmpAddExtLeading != m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->IsAddExtLeading() ) - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetAddExtLeading( bTmpAddExtLeading ); + const bool bTmpAddExtLeading = m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::ADD_EXT_LEADING); + if ( bTmpAddExtLeading != m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->IsAddExtLeading() ) + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetAddExtLeading( bTmpAddExtLeading ); OutputDevice* pOutDev = getReferenceDevice( false ); - if ( pOutDev != m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->GetRefDevice() ) - m_rSwdoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( pOutDev ); + if ( pOutDev != m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->GetRefDevice() ) + m_rDoc.getIDocumentDrawModelAccess().GetDrawModel()->SetRefDevice( pOutDev ); } - m_rSwdoc.PrtOLENotify( true ); + m_rDoc.PrtOLENotify( true ); if ( bEndAction ) pTmpRoot->EndAllAction(); diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index 95f7bfad4018..8771a1b390e6 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -48,7 +48,7 @@ namespace sw { DocumentDrawModelManager::DocumentDrawModelManager(SwDoc& i_rSwdoc) - : m_rSwdoc(i_rSwdoc) + : m_rDoc(i_rSwdoc) , mpDrawModel(0) , mnHeaven(0) , mnHell(0) @@ -97,13 +97,13 @@ void DocumentDrawModelManager::InitDrawModel() // pSdrPool->FreezeIdRanges(); // set FontHeight pool defaults without changing static SdrEngineDefaults - m_rSwdoc.GetAttrPool().SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT )); + m_rDoc.GetAttrPool().SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT )); SAL_INFO( "sw.doc", "before create DrawDocument" ); // The document owns the SwDrawModel. We always have two layers and one page. - mpDrawModel = new SwDrawModel( &m_rSwdoc ); + mpDrawModel = new SwDrawModel( &m_rDoc ); - mpDrawModel->EnableUndo( m_rSwdoc.GetIDocumentUndoRedo().DoesUndo() ); + mpDrawModel->EnableUndo( m_rDoc.GetIDocumentUndoRedo().DoesUndo() ); OUString sLayerNm; sLayerNm = "Hell"; @@ -137,22 +137,22 @@ void DocumentDrawModelManager::InitDrawModel() ::com::sun::star::uno::Reference< com::sun::star::linguistic2::XHyphenator > xHyphenator( ::GetHyphenator() ); rOutliner.SetHyphenator( xHyphenator ); SAL_INFO( "sw.doc", "after create Spellchecker/Hyphenator" ); - m_rSwdoc.SetCalcFieldValueHdl(&rOutliner); - m_rSwdoc.SetCalcFieldValueHdl(&mpDrawModel->GetHitTestOutliner()); + m_rDoc.SetCalcFieldValueHdl(&rOutliner); + m_rDoc.SetCalcFieldValueHdl(&mpDrawModel->GetHitTestOutliner()); // Set the LinkManager in the model so that linked graphics can be inserted. // The WinWord import needs it too. - mpDrawModel->SetLinkManager( & m_rSwdoc.getIDocumentLinksAdministration().GetLinkManager() ); - mpDrawModel->SetAddExtLeading( m_rSwdoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::ADD_EXT_LEADING) ); + mpDrawModel->SetLinkManager( & m_rDoc.getIDocumentLinksAdministration().GetLinkManager() ); + mpDrawModel->SetAddExtLeading( m_rDoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::ADD_EXT_LEADING) ); - OutputDevice* pRefDev = m_rSwdoc.getIDocumentDeviceAccess().getReferenceDevice( false ); + OutputDevice* pRefDev = m_rDoc.getIDocumentDeviceAccess().getReferenceDevice( false ); if ( pRefDev ) mpDrawModel->SetRefDevice( pRefDev ); - mpDrawModel->SetNotifyUndoActionHdl( LINK( &m_rSwdoc, SwDoc, AddDrawUndo )); - if ( m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell() ) + mpDrawModel->SetNotifyUndoActionHdl( LINK( &m_rDoc, SwDoc, AddDrawUndo )); + if ( m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() ) { - SwViewShell* pViewSh = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell(); + SwViewShell* pViewSh = m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell(); do { SwRootFrm* pRoot = pViewSh->GetLayout(); @@ -167,7 +167,7 @@ void DocumentDrawModelManager::InitDrawModel() pDrawPage->SetSize( pRoot->Frm().SSize() ); } pViewSh = (SwViewShell*)pViewSh->GetNext(); - }while( pViewSh != m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell() ); + }while( pViewSh != m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() ); } } @@ -212,20 +212,20 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel() { OSL_ENSURE( !mpDrawModel, "_MakeDrawModel: Why?" ); InitDrawModel(); - if ( m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell() ) + if ( m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() ) { - SwViewShell* pTmp = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell(); + SwViewShell* pTmp = m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell(); do { pTmp->MakeDrawView(); pTmp = (SwViewShell*) pTmp->GetNext(); - } while ( pTmp != m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell() ); + } while ( pTmp != m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() ); // Broadcast, so that the FormShell can be connected to the DrawView - if( m_rSwdoc.GetDocShell() ) + if( m_rDoc.GetDocShell() ) { SfxSimpleHint aHnt( SW_BROADCAST_DRAWVIEWS_CREATED ); - m_rSwdoc.GetDocShell()->Broadcast( aHnt ); + m_rDoc.GetDocShell()->Broadcast( aHnt ); } } return mpDrawModel; diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 8594f22b5408..bf617fca5970 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -10,7 +10,7 @@ * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed - * with &m_rSwdoc work for additional information regarding copyright + * with &m_rDoc work for additional information regarding copyright * ownership. The ASF licenses this file to you under the Apache * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of @@ -142,9 +142,9 @@ namespace namespace sw { -DocumentFieldsManager::DocumentFieldsManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), +DocumentFieldsManager::DocumentFieldsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), mbNewFldLst(true), - mpUpdtFlds( new SwDocUpdtFld( &m_rSwdoc ) ), + mpUpdtFlds( new SwDocUpdtFld( &m_rDoc ) ), mpFldTypes( new SwFldTypes() ), mnLockExpFld( 0 ) { @@ -172,7 +172,7 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp) case RES_SETEXPFLD: //JP 29.01.96: SequenceFields start at INIT_FLDTYPES - 3!! // Or we get doubble number circles!! - //MIB 14.03.95: From now on also the SW3-Reader relies on &m_rSwdoc, when + //MIB 14.03.95: From now on also the SW3-Reader relies on &m_rDoc, when //constructing string pools and when reading SetExp fields if( nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType&)rFldTyp).GetType() ) i -= INIT_SEQ_FLDTYPES; @@ -206,29 +206,29 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp) switch( nFldWhich ) { case RES_DDEFLD: - ((SwDDEFieldType*)pNew)->SetDoc( &m_rSwdoc ); + ((SwDDEFieldType*)pNew)->SetDoc( &m_rDoc ); break; case RES_DBFLD: case RES_TABLEFLD: case RES_DATETIMEFLD: case RES_GETEXPFLD: - ((SwValueFieldType*)pNew)->SetDoc( &m_rSwdoc ); + ((SwValueFieldType*)pNew)->SetDoc( &m_rDoc ); break; case RES_USERFLD: case RES_SETEXPFLD: - ((SwValueFieldType*)pNew)->SetDoc( &m_rSwdoc ); + ((SwValueFieldType*)pNew)->SetDoc( &m_rDoc ); // JP 29.07.96: Optionally prepare FieldList for Calculator: mpUpdtFlds->InsertFldType( *pNew ); break; case RES_AUTHORITY : - ((SwAuthorityFieldType*)pNew)->SetDoc( &m_rSwdoc ); + ((SwAuthorityFieldType*)pNew)->SetDoc( &m_rDoc ); break; } mpFldTypes->insert( mpFldTypes->begin() + nSize, pNew ); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return (*mpFldTypes)[ nSize ]; } @@ -257,7 +257,7 @@ SwFieldType* DocumentFieldsManager::GetFldType( case RES_SETEXPFLD: //JP 29.01.96: SequenceFields start at INIT_FLDTYPES - 3!! // Or we get doubble number circles!! - //MIB 14.03.95: From now on also the SW3-Reader relies on &m_rSwdoc, when + //MIB 14.03.95: From now on also the SW3-Reader relies on &m_rDoc, when //constructing string pools and when reading SetExp fields i = INIT_FLDTYPES - INIT_SEQ_FLDTYPES; break; @@ -310,7 +310,7 @@ void DocumentFieldsManager::RemoveFldType(sal_uInt16 nFld) mpUpdtFlds->RemoveFldType( *pTmp ); // no break; case RES_DDEFLD: - if( pTmp->GetDepends() && !m_rSwdoc.IsUsed( *pTmp ) ) + if( pTmp->GetDepends() && !m_rDoc.IsUsed( *pTmp ) ) { if( RES_SETEXPFLD == nWhich ) ((SwSetExpFieldType*)pTmp)->SetDeleted( true ); @@ -330,7 +330,7 @@ void DocumentFieldsManager::RemoveFldType(sal_uInt16 nFld) delete pTmp; } mpFldTypes->erase( mpFldTypes->begin() + nFld ); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } } @@ -387,17 +387,17 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) if( bCloseDB ) { #if HAVE_FEATURE_DBCONNECTIVITY - m_rSwdoc.GetDBManager()->CloseAll(); + m_rDoc.GetDBManager()->CloseAll(); #endif } // Only evaluate on full update - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp ) { // The FldType was marked as deleted and removed from the array. - // One has to look &m_rSwdoc up again, now. + // One has to look &m_rDoc up again, now. // - If it's not present, it can be re-inserted. // - If the same type is found, the deleted one has to be renamed. @@ -457,11 +457,11 @@ bool DocumentFieldsManager::PutValueToField(const SwPosition & rPos, Any aOldVal; SwField * pField = GetFieldAtPos(rPos); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo() && + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo() && pField->QueryValue(aOldVal, nWhich)) { SwUndo *const pUndo(new SwUndoFieldFromAPI(rPos, aOldVal, rVal, nWhich)); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } return pField->PutValue(rVal, nWhich); @@ -483,13 +483,13 @@ bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld, if (pDstFld->GetTyp()->Which() == rSrcFld.GetTyp()->Which()) { - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwPosition aPosition( pDstTxtFld->GetTxtNode() ); aPosition.nContent = pDstTxtFld->GetStart(); SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstFld, rSrcFld, pMsgHnt, bUpdateFlds) ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } SwField * pNewFld = rSrcFld.CopyField(); @@ -507,7 +507,7 @@ bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld, case RES_TABLEFLD: { const SwTableNode* pTblNd = - m_rSwdoc.IsIdxInTbl(aTblNdIdx); + m_rDoc.IsIdxInTbl(aTblNdIdx); if( pTblNd ) { SwTableFmlUpdate aTblUpdate( &pTblNd-> @@ -533,7 +533,7 @@ bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld, case RES_DBNEXTSETFLD: case RES_DBNUMSETFLD: case RES_DBSETNUMBERFLD: - m_rSwdoc.ChgDBData(((SwDBNameInfField*) pNewFld)->GetRealDBData()); + m_rDoc.ChgDBData(((SwDBNameInfField*) pNewFld)->GetRealDBData()); pNewFld->GetTyp()->UpdateFlds(); break; @@ -578,7 +578,7 @@ void DocumentFieldsManager::UpdateRefFlds( SfxPoolItem* pHt ) void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) { OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE == pHt->Which(), - "What MessageItem is &m_rSwdoc?" ); + "What MessageItem is &m_rDoc?" ); SwFieldType* pFldType(0); @@ -599,7 +599,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) if( pUpdtFld ) { - // table where &m_rSwdoc field is located + // table where &m_rDoc field is located const SwTableNode* pTblNd; const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode(); if( !rTxtNd.GetNodes().IsDocNodes() || @@ -618,7 +618,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) pFld->ChgValid( false ); break; case TBL_BOXNAME: - // is &m_rSwdoc the wanted table? + // is &m_rDoc the wanted table? if( &pTblNd->GetTable() == pUpdtFld->pTbl ) // to the external representation pFld->PtrToBoxNm( pUpdtFld->pTbl ); @@ -630,7 +630,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) pFld->BoxNmToPtr( pUpdtFld->pTbl ); break; case TBL_RELBOXNAME: - // is &m_rSwdoc the wanted table? + // is &m_rDoc the wanted table? if( &pTblNd->GetTable() == pUpdtFld->pTbl ) // to the relative representation pFld->ToRelBoxNm( pUpdtFld->pTbl ); @@ -652,10 +652,10 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) // process all table box formulas const SfxPoolItem* pItem; - sal_uInt32 nMaxItems = m_rSwdoc.GetAttrPool().GetItemCount2( RES_BOXATR_FORMULA ); + sal_uInt32 nMaxItems = m_rDoc.GetAttrPool().GetItemCount2( RES_BOXATR_FORMULA ); for (sal_uInt32 i = 0; i < nMaxItems; ++i) { - if( 0 != (pItem = m_rSwdoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) && + if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) && ((SwTblBoxFormula*)pItem)->GetDefinedIn() ) { ((SwTblBoxFormula*)pItem)->ChangeState( pHt ); @@ -677,7 +677,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) // start calculation at the end // new fields are inserted at the beginning of the modify chain // that gives faster calculation on import - // mba: do we really need &m_rSwdoc "optimization"? Is it still valid? + // mba: do we really need &m_rDoc "optimization"? Is it still valid? SwTblField* pFld; if( !pFmtFld->GetTxtFld() || (nsSwExtendedSubType::SUB_CMD & (pFld = (SwTblField*)pFmtFld->GetField())->GetSubType() )) @@ -686,7 +686,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) // needs to be recalculated if( !pFld->IsValid() ) { - // table where &m_rSwdoc field is located + // table where &m_rDoc field is located const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode(); if( !rTxtNd.GetNodes().IsDocNodes() ) continue; @@ -694,26 +694,26 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) if( !pTblNd ) continue; - // if &m_rSwdoc field is not in the to-be-updated table, skip it + // if &m_rDoc field is not in the to-be-updated table, skip it if( pHt && &pTblNd->GetTable() != ((SwTableFmlUpdate*)pHt)->pTbl ) continue; if( !pCalc ) - pCalc = new SwCalc( m_rSwdoc ); + pCalc = new SwCalc( m_rDoc ); // get the values of all SetExpression fields that are valid // until the table SwFrm* pFrm = 0; - if( pTblNd->GetIndex() < m_rSwdoc.GetNodes().GetEndOfExtras().GetIndex() ) + if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() ) { // is in the special section, that's expensive! Point aPt; // return the first frame of the layout - Tab.Headline!! - pFrm = rTxtNd.getLayoutFrm( m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt ); + pFrm = rTxtNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt ); if( pFrm ) { SwPosition aPos( *pTblNd ); - if( GetBodyTxtNode( m_rSwdoc, aPos, *pFrm ) ) + if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) ) FldsToCalc( *pCalc, _SetGetExpFld( aPos.nNode, pFmtFld->GetTxtFld(), &aPos.nContent )); @@ -750,7 +750,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) // calculate the formula at the boxes for (sal_uInt32 i = 0; i < nMaxItems; ++i ) { - if( 0 != (pItem = m_rSwdoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) && + if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) && ((SwTblBoxFormula*)pItem)->GetDefinedIn() && !((SwTblBoxFormula*)pItem)->IsValid() ) { @@ -765,24 +765,24 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) { double nValue; if( !pCalc ) - pCalc = new SwCalc( m_rSwdoc ); + pCalc = new SwCalc( m_rDoc ); // get the values of all SetExpression fields that are valid // until the table SwFrm* pFrm = 0; - if( pTblNd->GetIndex() < m_rSwdoc.GetNodes().GetEndOfExtras().GetIndex() ) + if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() ) { // is in the special section, that's expensive! Point aPt; // return the first frame of the layout - Tab.Headline!! SwNodeIndex aCNdIdx( *pTblNd, +2 ); SwCntntNode* pCNd = aCNdIdx.GetNode().GetCntntNode(); if( !pCNd ) - pCNd = m_rSwdoc.GetNodes().GoNext( &aCNdIdx ); + pCNd = m_rDoc.GetNodes().GoNext( &aCNdIdx ); - if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt )) ) + if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt )) ) { SwPosition aPos( *pCNd ); - if( GetBodyTxtNode( m_rSwdoc, aPos, *pFrm ) ) + if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) ) FldsToCalc( *pCalc, _SetGetExpFld( aPos.nNode )); else pFrm = 0; @@ -810,7 +810,7 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) } SwFrmFmt* pFmt = pBox->ClaimFrmFmt(); - SfxItemSet aTmp( m_rSwdoc.GetAttrPool(), + SfxItemSet aTmp( m_rDoc.GetAttrPool(), RES_BOXATR_BEGIN,RES_BOXATR_END-1 ); if( pCalc->IsCalcError() ) @@ -831,13 +831,13 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt ) void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds ) { - if( IsExpFldsLocked() || m_rSwdoc.IsInReading() ) + if( IsExpFldsLocked() || m_rDoc.IsInReading() ) return; bool bOldInUpdateFlds = mpUpdtFlds->IsInUpdateFlds(); mpUpdtFlds->SetInUpdateFlds( true ); - mpUpdtFlds->MakeFldList( m_rSwdoc, true, GETFLD_ALL ); + mpUpdtFlds->MakeFldList( m_rDoc, true, GETFLD_ALL ); mbNewFldLst = false; if( mpUpdtFlds->GetSortLst()->empty() ) @@ -887,19 +887,19 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds } // The array is filled with all fields; start calculation. - SwCalc aCalc( m_rSwdoc ); + SwCalc aCalc( m_rDoc ); #if HAVE_FEATURE_DBCONNECTIVITY OUString sDBNumNm( SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ); // already set the current record number - SwDBManager* pMgr = m_rSwdoc.GetDBManager(); + SwDBManager* pMgr = m_rDoc.GetDBManager(); pMgr->CloseAll( false ); SvtSysLocale aSysLocale; const LocaleDataWrapper* pLclData = aSysLocale.GetLocaleDataPtr(); const long nLang = pLclData->getLanguageTag().getLanguageType(); - bool bCanFill = pMgr->FillCalcWithMergeData( m_rSwdoc.GetNumberFormatter(), nLang, true, aCalc ); + bool bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc ); #endif // Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have. @@ -930,7 +930,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds if (nShownSections == 1) { // Is the last node part of a section? - SwPaM aPam(m_rSwdoc.GetNodes()); + SwPaM aPam(m_rDoc.GetNodes()); aPam.Move(fnMoveForward, fnGoDoc); if (aPam.Start()->nNode.GetNode().StartOfSectionNode()->IsSectionNode()) { @@ -968,7 +968,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds { pHFld->SetValue( bValue ); // evaluate field - pHFld->Evaluate(&m_rSwdoc); + pHFld->Evaluate(&m_rDoc); } } break; @@ -984,7 +984,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds case RES_DBSETNUMBERFLD: #if HAVE_FEATURE_DBCONNECTIVITY { - ((SwDBSetNumberField*)pFld)->Evaluate(&m_rSwdoc); + ((SwDBSetNumberField*)pFld)->Evaluate(&m_rDoc); aCalc.VarChange( sDBNumNm, ((SwDBSetNumberField*)pFld)->GetSetNumber()); } #endif @@ -995,7 +995,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds { UpdateDBNumFlds( *(SwDBNameInfField*)pFld, aCalc ); if( bCanFill ) - bCanFill = pMgr->FillCalcWithMergeData( m_rSwdoc.GetNumberFormatter(), nLang, true, aCalc ); + bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc ); } #endif break; @@ -1016,7 +1016,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds // Entry present? sal_uInt16 nPos; SwHash* pFnd = Find( rName, pHashStrTbl, nStrFmtCnt, &nPos ); - OUString const value(pFld->ExpandField(m_rSwdoc.IsClipBoard())); + OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard())); if( pFnd ) { // Modify entry in the hash table @@ -1111,7 +1111,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds if( MAXLEVEL > nLvl ) { // test if the Number needs to be updated - pSeqNd = m_rSwdoc.GetNodes()[ (*it)->GetNode() ]; + pSeqNd = m_rDoc.GetNodes()[ (*it)->GetNode() ]; const SwTxtNode* pOutlNd = pSeqNd-> FindOutlineNodeOfLevel( nLvl ); @@ -1143,7 +1143,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds pFmtFld->ModifyNotification( 0, 0 ); // trigger formatting - if( pUpdtFld == pTxtFld ) // if only &m_rSwdoc one is updated + if( pUpdtFld == pTxtFld ) // if only &m_rDoc one is updated { if( RES_GETEXPFLD == nWhich || // only GetField or RES_HIDDENTXTFLD == nWhich || // HiddenTxt? @@ -1176,14 +1176,14 @@ void DocumentFieldsManager::UpdateUsrFlds() if( RES_USERFLD == ( pFldType = (*mpFldTypes)[i] )->Which() ) { if( !pCalc ) - pCalc = new SwCalc( m_rSwdoc ); + pCalc = new SwCalc( m_rDoc ); ((SwUserFieldType*)pFldType)->GetValue( *pCalc ); } if( pCalc ) { delete pCalc; - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } } @@ -1233,7 +1233,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon // See if the supplied nodes actually contain fields. // If they don't, the flag doesn't need to be changed. bool bFldsFnd = false; - if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !m_rSwdoc.IsInDtor() + if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !m_rDoc.IsInDtor() // ?? what's up with Undo, this is also wanted there! /*&& &pChk->GetNodes() == &GetNodes()*/ ) { @@ -1276,7 +1276,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime ) { - bool bIsModified = m_rSwdoc.getIDocumentState().IsModified(); + bool bIsModified = m_rDoc.getIDocumentState().IsModified(); sal_Int32 nDate; sal_Int64 nTime; @@ -1378,19 +1378,19 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN } if( !bIsModified ) - m_rSwdoc.getIDocumentState().ResetModified(); + m_rDoc.getIDocumentState().ResetModified(); } void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld ) { // create the sorted list of all SetFields - mpUpdtFlds->MakeFldList( m_rSwdoc, mbNewFldLst, GETFLD_CALC ); + mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC ); mbNewFldLst = false; #if !HAVE_FEATURE_DBCONNECTIVITY SwDBManager* pMgr = NULL; #else - SwDBManager* pMgr = m_rSwdoc.GetDBManager(); + SwDBManager* pMgr = m_rDoc.GetDBManager(); pMgr->CloseAll(false); #endif @@ -1400,7 +1400,7 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToT mpUpdtFlds->GetSortLst()->upper_bound( const_cast<_SetGetExpFld*>(&rToThisFld)); for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it ) - lcl_CalcFld( m_rSwdoc, rCalc, **it, pMgr ); + lcl_CalcFld( m_rDoc, rCalc, **it, pMgr ); } #if HAVE_FEATURE_DBCONNECTIVITY pMgr->CloseAll(false); @@ -1410,13 +1410,13 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToT void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt ) { // create the sorted list of all SetFields - mpUpdtFlds->MakeFldList( m_rSwdoc, mbNewFldLst, GETFLD_CALC ); + mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC ); mbNewFldLst = false; #if !HAVE_FEATURE_DBCONNECTIVITY SwDBManager* pMgr = NULL; #else - SwDBManager* pMgr = m_rSwdoc.GetDBManager(); + SwDBManager* pMgr = m_rDoc.GetDBManager(); pMgr->CloseAll(false); #endif @@ -1427,7 +1427,7 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI ); ++it ) { - lcl_CalcFld( m_rSwdoc, rCalc, **it, pMgr ); + lcl_CalcFld( m_rDoc, rCalc, **it, pMgr ); } #if HAVE_FEATURE_DBCONNECTIVITY @@ -1439,7 +1439,7 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS const _SetGetExpFld& rToThisFld ) { // create the sorted list of all SetFields - mpUpdtFlds->MakeFldList( m_rSwdoc, mbNewFldLst, GETFLD_EXPAND ); + mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_EXPAND ); mbNewFldLst = false; // Hash table for all string replacements is filled on-the-fly. @@ -1498,7 +1498,7 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS // Entry present? sal_uInt16 nPos; SwHash* pFnd = Find( rName, ppHashTbl, rTblSize, &nPos ); - OUString const value(pFld->ExpandField(m_rSwdoc.IsClipBoard())); + OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard())); if( pFnd ) { // modify entry in the hash table @@ -1529,7 +1529,7 @@ void DocumentFieldsManager::SetNewFldLst(bool bFlag) void DocumentFieldsManager::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld ) { - if( !mbNewFldLst || !m_rSwdoc.IsInDtor() ) + if( !mbNewFldLst || !m_rDoc.IsInDtor() ) mpUpdtFlds->InsDelFldInFldLst( bIns, rFld ); } @@ -1574,46 +1574,46 @@ void DocumentFieldsManager::GCFieldTypes() void DocumentFieldsManager::_InitFieldTypes() // is being called by the CTOR { // Field types - mpFldTypes->push_back( new SwDateTimeFieldType(&m_rSwdoc) ); + mpFldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) ); mpFldTypes->push_back( new SwChapterFieldType ); mpFldTypes->push_back( new SwPageNumberFieldType ); mpFldTypes->push_back( new SwAuthorFieldType ); - mpFldTypes->push_back( new SwFileNameFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwDBNameFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwGetExpFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwGetRefFieldType( &m_rSwdoc ) ); + mpFldTypes->push_back( new SwFileNameFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwDBNameFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwGetExpFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) ); mpFldTypes->push_back( new SwHiddenTxtFieldType ); - mpFldTypes->push_back( new SwPostItFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwDocStatFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwDocInfoFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwInputFieldType( &m_rSwdoc ) ); - mpFldTypes->push_back( new SwTblFieldType( &m_rSwdoc ) ); - mpFldTypes->push_back( new SwMacroFieldType(&m_rSwdoc) ); + mpFldTypes->push_back( new SwPostItFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwDocStatFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwInputFieldType( &m_rDoc ) ); + mpFldTypes->push_back( new SwTblFieldType( &m_rDoc ) ); + mpFldTypes->push_back( new SwMacroFieldType(&m_rDoc) ); mpFldTypes->push_back( new SwHiddenParaFieldType ); mpFldTypes->push_back( new SwDBNextSetFieldType ); mpFldTypes->push_back( new SwDBNumSetFieldType ); mpFldTypes->push_back( new SwDBSetNumberFieldType ); - mpFldTypes->push_back( new SwTemplNameFieldType(&m_rSwdoc) ); - mpFldTypes->push_back( new SwTemplNameFieldType(&m_rSwdoc) ); + mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) ); + mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) ); mpFldTypes->push_back( new SwExtUserFieldType ); mpFldTypes->push_back( new SwRefPageSetFieldType ); - mpFldTypes->push_back( new SwRefPageGetFieldType( &m_rSwdoc ) ); - mpFldTypes->push_back( new SwJumpEditFieldType( &m_rSwdoc ) ); - mpFldTypes->push_back( new SwScriptFieldType( &m_rSwdoc ) ); + mpFldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) ); + mpFldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) ); + mpFldTypes->push_back( new SwScriptFieldType( &m_rDoc ) ); mpFldTypes->push_back( new SwCombinedCharFieldType ); mpFldTypes->push_back( new SwDropDownFieldType ); // Types have to be at the end! - // We expect &m_rSwdoc in the InsertFldType! + // We expect &m_rDoc in the InsertFldType! // MIB 14.04.95: In Sw3StringPool::Setup (sw3imp.cxx) and // lcl_sw3io_InSetExpField (sw3field.cxx) now also - mpFldTypes->push_back( new SwSetExpFieldType(&m_rSwdoc, + mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc, SW_RESSTR(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ) ); - mpFldTypes->push_back( new SwSetExpFieldType(&m_rSwdoc, + mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc, SW_RESSTR(STR_POOLCOLL_LABEL_TABLE), nsSwGetSetExpType::GSE_SEQ) ); - mpFldTypes->push_back( new SwSetExpFieldType(&m_rSwdoc, + mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc, SW_RESSTR(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) ); - mpFldTypes->push_back( new SwSetExpFieldType(&m_rSwdoc, + mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc, SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) ); assert( mpFldTypes->size() == INIT_FLDTYPES ); @@ -1633,7 +1633,7 @@ void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& r (void) rDBFld; (void) rCalc; #else - SwDBManager* pMgr = m_rSwdoc.GetDBManager(); + SwDBManager* pMgr = m_rDoc.GetDBManager(); sal_uInt16 nFldType = rDBFld.Which(); @@ -1648,14 +1648,14 @@ void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& r { // Edit a certain database if( RES_DBNEXTSETFLD == nFldType ) - ((SwDBNextSetField&)rDBFld).Evaluate(&m_rSwdoc); + ((SwDBNextSetField&)rDBFld).Evaluate(&m_rDoc); else - ((SwDBNumSetField&)rDBFld).Evaluate(&m_rSwdoc); + ((SwDBNumSetField&)rDBFld).Evaluate(&m_rDoc); - SwDBData aTmpDBData( rDBFld.GetDBData(&m_rSwdoc) ); + SwDBData aTmpDBData( rDBFld.GetDBData(&m_rDoc) ); if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1, false )) - rCalc.VarChange( lcl_GetDBVarName( m_rSwdoc, rDBFld), + rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBFld), pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType) ); } else diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index d99c71496997..e1499f1ff891 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -46,7 +46,7 @@ namespace sw { DocumentLayoutManager::DocumentLayoutManager( SwDoc& i_rSwdoc ) : - m_rSwdoc( i_rSwdoc ), + m_rDoc( i_rSwdoc ), mpCurrentView( 0 ), mpLayouter( 0 ) { @@ -110,7 +110,7 @@ void DocumentLayoutManager::SetLayouter( SwLayouter* pNew ) SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) { SwFrmFmt *pFmt = 0; - const bool bMod = m_rSwdoc.getIDocumentState().IsModified(); + const bool bMod = m_rDoc.getIDocumentState().IsModified(); bool bHeader = false; switch ( eRequest ) @@ -126,16 +126,16 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte case RND_STD_FOOTERL: case RND_STD_FOOTERR: { - pFmt = new SwFrmFmt( m_rSwdoc.GetAttrPool(), + pFmt = new SwFrmFmt( m_rDoc.GetAttrPool(), (bHeader ? "Right header" : "Right footer"), - m_rSwdoc.GetDfltFrmFmt() ); + m_rDoc.GetDfltFrmFmt() ); - SwNodeIndex aTmpIdx( m_rSwdoc.GetNodes().GetEndOfAutotext() ); + SwNodeIndex aTmpIdx( m_rDoc.GetNodes().GetEndOfAutotext() ); SwStartNode* pSttNd = - m_rSwdoc.GetNodes().MakeTextSection + m_rDoc.GetNodes().MakeTextSection ( aTmpIdx, bHeader ? SwHeaderStartNode : SwFooterStartNode, - m_rSwdoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>( bHeader + m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>( bHeader ? ( eRequest == RND_STD_HEADERL ? RES_POOLCOLL_HEADERL : eRequest == RND_STD_HEADERR @@ -155,19 +155,19 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte // Why set it back? Doc has changed, or not? // In any case, wrong for the FlyFrames! if ( !bMod ) - m_rSwdoc.getIDocumentState().ResetModified(); + m_rDoc.getIDocumentState().ResetModified(); } break; case RND_DRAW_OBJECT: { - pFmt = m_rSwdoc.MakeDrawFrmFmt( OUString(), m_rSwdoc.GetDfltFrmFmt() ); + pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() ); if( pSet ) // Set a few more attributes pFmt->SetFmtAttr( *pSet ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFmt(pFmt, 0, 0)); } } @@ -201,23 +201,23 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt ) { SwFmtChain aChain( rChain.GetPrev()->GetChain() ); aChain.SetNext( rChain.GetNext() ); - m_rSwdoc.SetAttr( aChain, *rChain.GetPrev() ); + m_rDoc.SetAttr( aChain, *rChain.GetPrev() ); } if ( rChain.GetNext() ) { SwFmtChain aChain( rChain.GetNext()->GetChain() ); aChain.SetPrev( rChain.GetPrev() ); - m_rSwdoc.SetAttr( aChain, *rChain.GetNext() ); + m_rDoc.SetAttr( aChain, *rChain.GetNext() ); } const SwNodeIndex* pCntIdx = 0; // The draw format doesn't own its content, it just has a pointer to it. if (pFmt->Which() != RES_DRAWFRMFMT) pCntIdx = pFmt->GetCntnt().GetCntntIdx(); - if (pCntIdx && !m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (pCntIdx && !m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { // Disconnect if it's an OLE object - SwOLENode* pOLENd = m_rSwdoc.GetNodes()[ pCntIdx->GetIndex()+1 ]->GetOLENode(); + SwOLENode* pOLENd = m_rDoc.GetNodes()[ pCntIdx->GetIndex()+1 ]->GetOLENode(); if( pOLENd && pOLENd->GetOLEObj().IsOleRef() ) { @@ -243,10 +243,10 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt ) // Only FlyFrames are undoable at first const sal_uInt16 nWh = pFmt->Which(); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo() && + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo() && (RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh)) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFmt( pFmt )); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFmt( pFmt )); } else { @@ -293,7 +293,7 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt ) { SwNode *pNode = &pCntIdx->GetNode(); ((SwFmtCntnt&)pFmt->GetFmtAttr( RES_CNTNT )).SetNewCntntIdx( 0 ); - m_rSwdoc.getIDocumentContentOperations().DeleteSection( pNode ); + m_rDoc.getIDocumentContentOperations().DeleteSection( pNode ); } // Delete the character for FlyFrames anchored as char (if necessary) @@ -319,9 +319,9 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt ) } } - m_rSwdoc.DelFrmFmt( pFmt ); + m_rDoc.DelFrmFmt( pFmt ); } - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } /** Copies the stated format (pSrc) to pDest and returns pDest. @@ -357,7 +357,7 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( (FLY_AT_FLY == rNewAnchor.GetAnchorId()) || (FLY_AT_CHAR == rNewAnchor.GetAnchorId())) && rNewAnchor.GetCntntAnchor() && - m_rSwdoc.IsInHeaderFooter( rNewAnchor.GetCntntAnchor()->nNode ) && + m_rDoc.IsInHeaderFooter( rNewAnchor.GetCntntAnchor()->nNode ) && pDrawContact != NULL && pDrawContact->GetMaster() != NULL && CheckControlLayer( pDrawContact->GetMaster() ); @@ -367,9 +367,9 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( if( bMayNotCopy ) return NULL; - SwFrmFmt* pDest = m_rSwdoc.GetDfltFrmFmt(); + SwFrmFmt* pDest = m_rDoc.GetDfltFrmFmt(); if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrmFmt() ) - pDest = m_rSwdoc.CopyFrmFmt( *(SwFrmFmt*)rSource.GetRegisteredIn() ); + pDest = m_rDoc.CopyFrmFmt( *(SwFrmFmt*)rSource.GetRegisteredIn() ); if( bFly ) { // #i11176# @@ -378,13 +378,13 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( // These are then added to the DrawingLayer (which needs to exist). // Together with correct sorting of all drawinglayer based objects // before cloning ZOrder transfer works correctly then. - SwFlyFrmFmt *pFormat = m_rSwdoc.MakeFlyFrmFmt( rSource.GetName(), pDest ); + SwFlyFrmFmt *pFormat = m_rDoc.MakeFlyFrmFmt( rSource.GetName(), pDest ); pDest = pFormat; SwXFrame::GetOrCreateSdrObject(*pFormat); } else - pDest = m_rSwdoc.MakeDrawFrmFmt( OUString(), pDest ); + pDest = m_rDoc.MakeDrawFrmFmt( OUString(), pDest ); // Copy all other or new attributes pDest->CopyAttrs( rSource ); @@ -398,8 +398,8 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( const SwNode& rCSttNd = rSource.GetCntnt().GetCntntIdx()->GetNode(); SwNodeRange aRg( rCSttNd, 1, *rCSttNd.EndOfSectionNode() ); - SwNodeIndex aIdx( m_rSwdoc.GetNodes().GetEndOfAutotext() ); - SwStartNode* pSttNd = m_rSwdoc.GetNodes().MakeEmptySection( aIdx, SwFlyStartNode ); + SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfAutotext() ); + SwStartNode* pSttNd = m_rDoc.GetNodes().MakeEmptySection( aIdx, SwFlyStartNode ); // Set the Anchor/CntntIndex first. // Within the copying part, we can access the values (DrawFmt in Headers and Footers) @@ -409,9 +409,9 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( pDest->SetFmtAttr( aAttr ); pDest->SetFmtAttr( rNewAnchor ); - if( !m_rSwdoc.IsCopyIsMove() || &m_rSwdoc != pSrcDoc ) + if( !m_rDoc.IsCopyIsMove() || &m_rDoc != pSrcDoc ) { - if( m_rSwdoc.IsInReading() || m_rSwdoc.IsInMailMerge() ) + if( m_rDoc.IsInReading() || m_rDoc.IsInMailMerge() ) pDest->SetName( OUString() ); else { @@ -420,21 +420,21 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( OUString sOld( pDest->GetName() ); pDest->SetName( OUString() ); - if( m_rSwdoc.FindFlyByName( sOld, nNdTyp ) ) // found one + if( m_rDoc.FindFlyByName( sOld, nNdTyp ) ) // found one switch( nNdTyp ) { - case ND_GRFNODE: sOld = m_rSwdoc.GetUniqueGrfName(); break; - case ND_OLENODE: sOld = m_rSwdoc.GetUniqueOLEName(); break; - default: sOld = m_rSwdoc.GetUniqueFrameName(); break; + case ND_GRFNODE: sOld = m_rDoc.GetUniqueGrfName(); break; + case ND_OLENODE: sOld = m_rDoc.GetUniqueOLEName(); break; + default: sOld = m_rDoc.GetUniqueFrameName(); break; } pDest->SetName( sOld ); } } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0)); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0)); } // Make sure that FlyFrames in FlyFrames are copied @@ -442,7 +442,7 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( //fdo#36631 disable (scoped) any undo operations associated with the //contact object itself. They should be managed by SwUndoInsLayFmt. - const ::sw::DrawUndoGuard drawUndoGuard(m_rSwdoc.GetIDocumentUndoRedo()); + const ::sw::DrawUndoGuard drawUndoGuard(m_rDoc.GetIDocumentUndoRedo()); pSrcDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aIdx, NULL, false, true, true ); } @@ -453,8 +453,8 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( SwDrawContact* pSourceContact = (SwDrawContact *)rSource.FindContactObj(); SwDrawContact* pContact = new SwDrawContact( (SwDrawFrmFmt*)pDest, - m_rSwdoc.CloneSdrObj( *pSourceContact->GetMaster(), - m_rSwdoc.IsCopyIsMove() && &m_rSwdoc == pSrcDoc ) ); + m_rDoc.CloneSdrObj( *pSourceContact->GetMaster(), + m_rDoc.IsCopyIsMove() && &m_rDoc == pSrcDoc ) ); // #i49730# - notify draw frame format that position attributes are // already set, if the position attributes are already set at the // source draw frame format. @@ -476,9 +476,9 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( else pDest->SetFmtAttr( rNewAnchor ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0)); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0)); } } @@ -512,10 +512,10 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt( //by the SwLayouter void DocumentLayoutManager::ClearSwLayouterEntries() { - SwLayouter::ClearMovedFwdFrms( m_rSwdoc ); - SwLayouter::ClearObjsTmpConsiderWrapInfluence( m_rSwdoc ); + SwLayouter::ClearMovedFwdFrms( m_rDoc ); + SwLayouter::ClearObjsTmpConsiderWrapInfluence( m_rDoc ); // #i65250# - SwLayouter::ClearMoveBwdLayoutInfo( m_rSwdoc ); + SwLayouter::ClearMoveBwdLayoutInfo( m_rDoc ); } DocumentLayoutManager::~DocumentLayoutManager() diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 19e1a5f172bc..ebb8c04feb1b 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -176,7 +176,7 @@ namespace sw DocumentLinksAdministrationManager::DocumentLinksAdministrationManager( SwDoc& i_rSwdoc ) : mbVisibleLinks(true), mbLinksUpdated( false ), //#i38810# mpLinkMgr( new sfx2::LinkManager( 0 ) ), - m_rSwdoc( i_rSwdoc ) + m_rDoc( i_rSwdoc ) { } @@ -205,16 +205,16 @@ const sfx2::LinkManager& DocumentLinksAdministrationManager::GetLinkManager() co void DocumentLinksAdministrationManager::UpdateLinks( bool bUI ) { SfxObjectCreateMode eMode; - sal_uInt16 nLinkMode = m_rSwdoc.GetDocumentSettingManager().getLinkUpdateMode( true ); - if ( m_rSwdoc.GetDocShell()) { - sal_uInt16 nUpdateDocMode = m_rSwdoc.GetDocShell()->GetUpdateDocMode(); + sal_uInt16 nLinkMode = m_rDoc.GetDocumentSettingManager().getLinkUpdateMode( true ); + if ( m_rDoc.GetDocShell()) { + sal_uInt16 nUpdateDocMode = m_rDoc.GetDocShell()->GetUpdateDocMode(); if( (nLinkMode != NEVER || document::UpdateDocMode::FULL_UPDATE == nUpdateDocMode) && !GetLinkManager().GetLinks().empty() && SFX_CREATE_MODE_INTERNAL != - ( eMode = m_rSwdoc.GetDocShell()->GetCreateMode()) && + ( eMode = m_rDoc.GetDocShell()->GetCreateMode()) && SFX_CREATE_MODE_ORGANIZER != eMode && SFX_CREATE_MODE_PREVIEW != eMode && - !m_rSwdoc.GetDocShell()->IsPreview() ) + !m_rDoc.GetDocShell()->IsPreview() ) { bool bAskUpdate = nLinkMode == MANUAL; bool bUpdate = true; @@ -226,7 +226,7 @@ void DocumentLinksAdministrationManager::UpdateLinks( bool bUI ) } if( bUpdate && (bUI || !bAskUpdate) ) { - SfxMedium* pMedium = m_rSwdoc.GetDocShell()->GetMedium(); + SfxMedium* pMedium = m_rDoc.GetDocShell()->GetMedium(); SfxFrame* pFrm = pMedium ? pMedium->GetLoadTargetFrame() : 0; vcl::Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0; @@ -243,14 +243,14 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O bool bCaseSensitive = true; while( true ) { - ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rSwdoc.getIDocumentMarkAccess(), rItem, bCaseSensitive); + ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rDoc.getIDocumentMarkAccess(), rItem, bCaseSensitive); if(pBkmk) return SwServerObject(*pBkmk).GetData(rValue, rMimeType); // Do we already have the Item? OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); _FindItem aPara( sItem ); - BOOST_FOREACH( const SwSectionFmt* pFmt, m_rSwdoc.GetSections() ) + BOOST_FOREACH( const SwSectionFmt* pFmt, m_rDoc.GetSections() ) { if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive))) break; @@ -266,7 +266,7 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O } _FindItem aPara( GetAppCharClass().lowercase( rItem )); - BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rSwdoc.GetTblFrmFmts() ) + BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rDoc.GetTblFrmFmts() ) { if (!(lcl_FindTable(pFmt, &aPara))) break; @@ -286,14 +286,14 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O bool bCaseSensitive = true; while( true ) { - ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rSwdoc.getIDocumentMarkAccess(), rItem, bCaseSensitive); + ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rDoc.getIDocumentMarkAccess(), rItem, bCaseSensitive); if(pBkmk) return SwServerObject(*pBkmk).SetData(rMimeType, rValue); // Do we already have the Item? OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); _FindItem aPara( sItem ); - BOOST_FOREACH( const SwSectionFmt* pFmt, m_rSwdoc.GetSections() ) + BOOST_FOREACH( const SwSectionFmt* pFmt, m_rDoc.GetSections() ) { if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive))) break; @@ -310,7 +310,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O OUString sItem(GetAppCharClass().lowercase(rItem)); _FindItem aPara( sItem ); - BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rSwdoc.GetTblFrmFmts() ) + BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rDoc.GetTblFrmFmts() ) { if (!(lcl_FindTable(pFmt, &aPara))) break; @@ -332,7 +332,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O while( true ) { // bookmarks - ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rSwdoc.getIDocumentMarkAccess(), rItem, bCaseSensitive); + ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rDoc.getIDocumentMarkAccess(), rItem, bCaseSensitive); if(pBkmk && pBkmk->IsExpanded() && (0 == (pObj = pBkmk->GetRefObject()))) { @@ -346,7 +346,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem)); // sections - BOOST_FOREACH( const SwSectionFmt* pFmt, m_rSwdoc.GetSections() ) + BOOST_FOREACH( const SwSectionFmt* pFmt, m_rDoc.GetSections() ) { if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive))) break; @@ -369,7 +369,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O _FindItem aPara( GetAppCharClass().lowercase(rItem) ); // tables - BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rSwdoc.GetTblFrmFmts() ) + BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rDoc.GetTblFrmFmts() ) { if (!(lcl_FindTable(pFmt, &aPara))) break; @@ -393,7 +393,7 @@ bool DocumentLinksAdministrationManager::EmbedAllLinks() const ::sfx2::SvBaseLinks& rLinks = rLnkMgr.GetLinks(); if( !rLinks.empty() ) { - ::sw::UndoGuard const undoGuard(m_rSwdoc.GetIDocumentUndoRedo()); + ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo()); ::sfx2::SvBaseLink* pLnk = 0; while( 0 != (pLnk = lcl_FindNextRemovableLink( rLinks, rLnkMgr ) ) ) @@ -409,8 +409,8 @@ bool DocumentLinksAdministrationManager::EmbedAllLinks() bRet = true; } - m_rSwdoc.GetIDocumentUndoRedo().DelAllUndoObj(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.GetIDocumentUndoRedo().DelAllUndoObj(); + m_rDoc.getIDocumentState().SetModified(); } return bRet; } @@ -458,7 +458,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, if( sCmp == "table" ) { sName = rCC.lowercase( sName ); - BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rSwdoc.GetTblFrmFmts() ) + BOOST_FOREACH( const SwFrmFmt* pFmt, *m_rDoc.GetTblFrmFmts() ) { if (!(lcl_FindTable(pFmt, &aPara))) break; @@ -474,7 +474,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, { SwNodeIndex* pIdx; SwNode* pNd; - const SwFlyFrmFmt* pFlyFmt = m_rSwdoc.FindFlyByName( sName ); + const SwFlyFrmFmt* pFlyFmt = m_rDoc.FindFlyByName( sName ); if( pFlyFmt && 0 != ( pIdx = (SwNodeIndex*)pFlyFmt->GetCntnt().GetCntntIdx() ) && !( pNd = &pIdx->GetNode())->IsNoTxtNode() ) @@ -490,13 +490,13 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, } else if( sCmp == "outline" ) { - SwPosition aPos( SwNodeIndex( (SwNodes&)m_rSwdoc.GetNodes() )); - if( m_rSwdoc.GotoOutline( aPos, sName )) + SwPosition aPos( SwNodeIndex( (SwNodes&)m_rDoc.GetNodes() )); + if( m_rDoc.GotoOutline( aPos, sName )) { SwNode* pNd = &aPos.nNode.GetNode(); const int nLvl = pNd->GetTxtNode()->GetAttrOutlineLevel()-1; - const SwOutlineNodes& rOutlNds = m_rSwdoc.GetNodes().GetOutLineNds(); + const SwOutlineNodes& rOutlNds = m_rDoc.GetNodes().GetOutLineNds(); sal_uInt16 nTmpPos; rOutlNds.Seek_Entry( pNd, &nTmpPos ); rpRange = new SwNodeRange( aPos.nNode, 0, aPos.nNode ); @@ -512,7 +512,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, if( nTmpPos < rOutlNds.size() ) rpRange->aEnd = *rOutlNds[ nTmpPos ]; else - rpRange->aEnd = m_rSwdoc.GetNodes().GetEndOfContent(); + rpRange->aEnd = m_rDoc.GetNodes().GetEndOfContent(); return true; } } @@ -525,7 +525,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, bool bCaseSensitive = true; while( true ) { - ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rSwdoc.getIDocumentMarkAccess(), sItem, bCaseSensitive); + ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rDoc.getIDocumentMarkAccess(), sItem, bCaseSensitive); if(pBkmk) { if(pBkmk->IsExpanded()) @@ -537,9 +537,9 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, _FindItem aPara( bCaseSensitive ? sItem : rCC.lowercase( sItem ) ); - if( !m_rSwdoc.GetSections().empty() ) + if( !m_rDoc.GetSections().empty() ) { - BOOST_FOREACH( const SwSectionFmt* pFmt, m_rSwdoc.GetSections() ) + BOOST_FOREACH( const SwSectionFmt* pFmt, m_rDoc.GetSections() ) { if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive))) break; diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx index 1e0a02fb1a95..340396fbe2f4 100644 --- a/sw/source/core/doc/DocumentListsManager.cxx +++ b/sw/source/core/doc/DocumentListsManager.cxx @@ -27,7 +27,7 @@ namespace sw { -DocumentListsManager::DocumentListsManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), maLists(), maListStyleLists() +DocumentListsManager::DocumentListsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), maLists(), maListStyleLists() { } @@ -46,14 +46,14 @@ SwList* DocumentListsManager::createList( const OUString& rListId, return 0; } - SwNumRule* pDefaultNumRuleForNewList = m_rSwdoc.FindNumRulePtr( sDefaultListStyleName ); + SwNumRule* pDefaultNumRuleForNewList = m_rDoc.FindNumRulePtr( sDefaultListStyleName ); if ( !pDefaultNumRuleForNewList ) { OSL_FAIL( "<DocumentListsManager::createList(..)> - for provided default list style name no list style is found. Serious defect -> please inform OD." ); return 0; } - SwList* pNewList = new SwList( sListId, *pDefaultNumRuleForNewList, m_rSwdoc.GetNodes() ); + SwList* pNewList = new SwList( sListId, *pDefaultNumRuleForNewList, m_rDoc.GetNodes() ); maLists[sListId] = pNewList; return pNewList; @@ -97,7 +97,7 @@ SwList* DocumentListsManager::createListForListStyle( const OUString& sListStyle return 0; } - SwNumRule* pNumRule = m_rSwdoc.FindNumRulePtr( sListStyleName ); + SwNumRule* pNumRule = m_rDoc.FindNumRulePtr( sListStyleName ); if ( !pNumRule ) { OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect -> please inform OD." ); diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx index a967b909313d..f6f5a610cf11 100644 --- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx +++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx @@ -23,18 +23,18 @@ namespace sw { -DocumentOutlineNodesManager::DocumentOutlineNodesManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ) +DocumentOutlineNodesManager::DocumentOutlineNodesManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ) { } sal_Int32 DocumentOutlineNodesManager::getOutlineNodesCount() const { - return m_rSwdoc.GetNodes().GetOutLineNds().size(); + return m_rDoc.GetNodes().GetOutLineNds().size(); } int DocumentOutlineNodesManager::getOutlineLevel( const sal_Int32 nIdx ) const { - return m_rSwdoc.GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]-> + return m_rDoc.GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]-> GetTxtNode()->GetAttrOutlineLevel()-1; } @@ -43,14 +43,14 @@ OUString DocumentOutlineNodesManager::getOutlineText( const sal_Int32 nIdx, const bool bWithSpacesForLevel, const bool bWithFtn ) const { - return m_rSwdoc.GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]-> + return m_rDoc.GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]-> GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber, bWithNumber, bWithSpacesForLevel, bWithFtn ); } SwTxtNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const { - return m_rSwdoc.GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]->GetTxtNode(); + return m_rDoc.GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]->GetTxtNode(); } void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const @@ -62,7 +62,7 @@ void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSorte for ( sal_uInt16 i = 0; i < nOutlCount; ++i ) { orOutlineNodeList.push_back( - m_rSwdoc.GetNodes().GetOutLineNds()[i]->GetTxtNode() ); + m_rDoc.GetNodes().GetOutLineNds()[i]->GetTxtNode() ); } } diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 5f44298f5a88..d0e979759a60 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -580,7 +580,7 @@ namespace namespace sw { -DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), +DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), meRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)), mpRedlineTbl( new SwRedlineTbl ), mpExtraRedlineTbl ( new SwExtraRedlineTbl ), @@ -603,8 +603,8 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode ) if( (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) != (nsRedlineMode_t::REDLINE_SHOW_MASK & eMode) || 0 == (nsRedlineMode_t::REDLINE_SHOW_MASK & eMode) ) { - bool bSaveInXMLImportFlag = m_rSwdoc.IsInXMLImport(); - m_rSwdoc.SetInXMLImport( false ); + bool bSaveInXMLImportFlag = m_rDoc.IsInXMLImport(); + m_rDoc.SetInXMLImport( false ); // and then hide/display everything void (SwRangeRedline::*pFnc)( sal_uInt16 ) = 0; @@ -633,10 +633,10 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode ) for( sal_uInt16 i = 0; i < mpRedlineTbl->size(); ++i ) ((*mpRedlineTbl)[ i ]->*pFnc)( nLoop ); _CHECK_REDLINE( *this ) - m_rSwdoc.SetInXMLImport( bSaveInXMLImportFlag ); + m_rDoc.SetInXMLImport( bSaveInXMLImportFlag ); } meRedlineMode = eMode; - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } // #TODO - add 'SwExtraRedlineTbl' also ? @@ -685,7 +685,7 @@ bool DocumentRedlineManager::HasExtraRedlineTbl() const bool DocumentRedlineManager::IsInRedlines(const SwNode & rNode) const { SwPosition aPos(rNode); - SwNode & rEndOfRedlines = m_rSwdoc.GetNodes().GetEndOfRedlines(); + SwNode & rEndOfRedlines = m_rDoc.GetNodes().GetEndOfRedlines(); SwPaM aPam(SwPosition(*rEndOfRedlines.StartOfSectionNode()), SwPosition(rEndOfRedlines)); @@ -735,7 +735,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall { pNewRedl->InvalidateRange(); - if( m_rSwdoc.IsAutoFmtRedline() ) + if( m_rDoc.IsAutoFmtRedline() ) { pNewRedl->SetAutoFmtFlag(); if( mpAutoFmtRedlnComment && !mpAutoFmtRedlnComment->isEmpty() ) @@ -1200,10 +1200,10 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall pEnd->nNode--; pEnd->nContent.Assign( pEnd->nNode.GetNode().GetTxtNode(), 0); - m_rSwdoc.getIDocumentContentOperations().DelFullPara( *pNewRedl ); + m_rDoc.getIDocumentContentOperations().DelFullPara( *pNewRedl ); } else - m_rSwdoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl ); + m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl ); bCompress = true; } @@ -1219,7 +1219,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall if( bCallDelete ) { mpRedlineTbl->Insert( pNewRedl ); - m_rSwdoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl ); + m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl ); if( !mpRedlineTbl->Remove( pNewRedl ) ) pNewRedl = 0; } @@ -1246,7 +1246,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall // We insert temporarily so that pNew is // also dealt with when moving the indices. mpRedlineTbl->Insert( pNewRedl ); - m_rSwdoc.getIDocumentContentOperations().DeleteAndJoin( aPam ); + m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam ); if( !mpRedlineTbl->Remove( pNewRedl ) ) pNewRedl = 0; n = 0; // re-initialize @@ -1272,7 +1272,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall // We insert temporarily so that pNew is // also dealt with when moving the indices. mpRedlineTbl->Insert( pNewRedl ); - m_rSwdoc.getIDocumentContentOperations().DeleteAndJoin( aPam ); + m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam ); if( !mpRedlineTbl->Remove( pNewRedl ) ) pNewRedl = 0; n = 0; // re-initialize @@ -1660,7 +1660,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall // Set to NONE, so that the Delete::Redo merges the Redline data correctly! // The ShowMode needs to be retained! meRedlineMode = (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE)); - m_rSwdoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl ); + m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl ); meRedlineMode = eOld; } delete pNewRedl, pNewRedl = 0; @@ -1880,12 +1880,12 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd bool bChg = false; - if (bSaveInUndo && m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (bSaveInUndo && m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwUndoRedline* pUndo = new SwUndoRedline( UNDO_REDLINE, rRange ); if( pUndo->GetRedlSaveCount() ) { - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } else delete pUndo; @@ -1981,7 +1981,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd } if( bChg ) - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return bChg; @@ -2099,12 +2099,12 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete ) SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ]; if( pTmp->HasMark() && pTmp->IsVisible() ) { - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, pTmp->GetDescr()); - m_rSwdoc.GetIDocumentUndoRedo().StartUndo(UNDO_ACCEPT_REDLINE, &aRewriter); + m_rDoc.GetIDocumentUndoRedo().StartUndo(UNDO_ACCEPT_REDLINE, &aRewriter); } int nLoopCnt = 2; @@ -2112,10 +2112,10 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete ) do { - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwUndo *const pUndo( new SwUndoAcceptRedline(*pTmp) ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } bRet |= lcl_AcceptRedline( *mpRedlineTbl, nPos, bCallDelete ); @@ -2142,12 +2142,12 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete ) if( bRet ) { CompressRedlines(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().EndUndo(UNDO_END, 0); + m_rDoc.GetIDocumentUndoRedo().EndUndo(UNDO_END, 0); } } return bRet; @@ -2168,10 +2168,10 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete SwPaM aPam( *rPam.GetMark(), *rPam.GetPoint() ); lcl_AdjustRedlineRange( aPam ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().StartUndo( UNDO_ACCEPT_REDLINE, NULL ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoAcceptRedline( aPam )); + m_rDoc.GetIDocumentUndoRedo().StartUndo( UNDO_ACCEPT_REDLINE, NULL ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoAcceptRedline( aPam )); } int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTbl, @@ -2179,9 +2179,9 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete if( nRet > 0 ) { CompressRedlines(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { OUString aTmpStr; @@ -2194,7 +2194,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, aTmpStr); - m_rSwdoc.GetIDocumentUndoRedo().EndUndo( UNDO_ACCEPT_REDLINE, &aRewriter ); + m_rDoc.GetIDocumentUndoRedo().EndUndo( UNDO_ACCEPT_REDLINE, &aRewriter ); } return nRet != 0; @@ -2213,12 +2213,12 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ]; if( pTmp->HasMark() && pTmp->IsVisible() ) { - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, pTmp->GetDescr()); - m_rSwdoc.GetIDocumentUndoRedo().StartUndo(UNDO_REJECT_REDLINE, &aRewriter); + m_rDoc.GetIDocumentUndoRedo().StartUndo(UNDO_REJECT_REDLINE, &aRewriter); } int nLoopCnt = 2; @@ -2226,10 +2226,10 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) do { - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { SwUndo *const pUndo( new SwUndoRejectRedline( *pTmp ) ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo(pUndo); + m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo); } bRet |= lcl_RejectRedline( *mpRedlineTbl, nPos, bCallDelete ); @@ -2256,12 +2256,12 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) if( bRet ) { CompressRedlines(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().EndUndo(UNDO_END, 0); + m_rDoc.GetIDocumentUndoRedo().EndUndo(UNDO_END, 0); } } return bRet; @@ -2282,10 +2282,10 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete SwPaM aPam( *rPam.GetMark(), *rPam.GetPoint() ); lcl_AdjustRedlineRange( aPam ); - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { - m_rSwdoc.GetIDocumentUndoRedo().StartUndo( UNDO_REJECT_REDLINE, NULL ); - m_rSwdoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoRejectRedline(aPam) ); + m_rDoc.GetIDocumentUndoRedo().StartUndo( UNDO_REJECT_REDLINE, NULL ); + m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoRejectRedline(aPam) ); } int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTbl, @@ -2293,9 +2293,9 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete if( nRet > 0 ) { CompressRedlines(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } - if (m_rSwdoc.GetIDocumentUndoRedo().DoesUndo()) + if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { OUString aTmpStr; @@ -2308,7 +2308,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, aTmpStr); - m_rSwdoc.GetIDocumentUndoRedo().EndUndo( UNDO_REJECT_REDLINE, &aRewriter ); + m_rDoc.GetIDocumentUndoRedo().EndUndo( UNDO_REJECT_REDLINE, &aRewriter ); } return nRet != 0; @@ -2335,7 +2335,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons if( !pEnd->nNode.GetNode().IsCntntNode() ) { SwNodeIndex aTmp( pEnd->nNode ); - SwCntntNode* pCNd = m_rSwdoc.GetNodes().GoPrevSection( &aTmp ); + SwCntntNode* pCNd = m_rDoc.GetNodes().GoPrevSection( &aTmp ); if( !pCNd || ( aTmp == rSttPos.nNode && pCNd->Len() == rSttPos.nContent.GetIndex() )) pFnd = 0; @@ -2392,7 +2392,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons SwCntntNode* pCNd; SwNodeIndex* pIdx = &rPam.GetMark()->nNode; if( !pIdx->GetNode().IsCntntNode() && - 0 != ( pCNd = m_rSwdoc.GetNodes().GoNextSection( pIdx )) ) + 0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) ) { if( *pIdx <= rPam.GetPoint()->nNode ) rPam.GetMark()->nContent.Assign( pCNd, 0 ); @@ -2404,7 +2404,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons { pIdx = &rPam.GetPoint()->nNode; if( !pIdx->GetNode().IsCntntNode() && - 0 != ( pCNd = m_rSwdoc.GetNodes().GoPrevSection( pIdx )) ) + 0 != ( pCNd = m_rDoc.GetNodes().GoPrevSection( pIdx )) ) { if( *pIdx >= rPam.GetMark()->nNode ) rPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() ); @@ -2454,7 +2454,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons if( !pStt->nNode.GetNode().IsCntntNode() ) { SwNodeIndex aTmp( pStt->nNode ); - SwCntntNode* pCNd = m_rSwdoc.GetNodes().GoNextSection( &aTmp ); + SwCntntNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp ); if( !pCNd || ( aTmp == rSttPos.nNode && !rSttPos.nContent.GetIndex() )) pFnd = 0; @@ -2513,7 +2513,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons SwCntntNode* pCNd; SwNodeIndex* pIdx = &rPam.GetMark()->nNode; if( !pIdx->GetNode().IsCntntNode() && - 0 != ( pCNd = m_rSwdoc.GetNodes().GoPrevSection( pIdx )) ) + 0 != ( pCNd = m_rDoc.GetNodes().GoPrevSection( pIdx )) ) { if( *pIdx >= rPam.GetPoint()->nNode ) rPam.GetMark()->nContent.Assign( pCNd, pCNd->Len() ); @@ -2525,7 +2525,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons { pIdx = &rPam.GetPoint()->nNode; if( !pIdx->GetNode().IsCntntNode() && - 0 != ( pCNd = m_rSwdoc.GetNodes().GoNextSection( pIdx )) ) + 0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) ) { if( *pIdx <= rPam.GetMark()->nNode ) rPam.GetPoint()->nContent.Assign( pCNd, 0 ); @@ -2579,7 +2579,7 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin } } if( bRet ) - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); return bRet; @@ -2620,7 +2620,7 @@ void DocumentRedlineManager::SetRedlinePassword( /*[in]*/const uno::Sequence <sal_Int8>& rNewPassword) { maRedlinePasswd = rNewPassword; - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentState().SetModified(); } /// Set comment text for the Redline, which is inserted later on via @@ -2629,7 +2629,7 @@ void DocumentRedlineManager::SetRedlinePassword( /// needs to stay valid! void DocumentRedlineManager::SetAutoFmtRedlineComment( const OUString* pTxt, sal_uInt16 nSeqNo ) { - m_rSwdoc.SetAutoFmtRedline( 0 != pTxt ); + m_rDoc.SetAutoFmtRedline( 0 != pTxt ); if( pTxt ) { if( !mpAutoFmtRedlnComment ) @@ -2648,7 +2648,7 @@ void DocumentRedlineManager::SetAutoFmtRedlineComment( const OUString* pTxt, sal void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode) { const SwRedlineTbl& rRedlineTbl = GetRedlineTbl(); - SwEditShell* pEditShell = m_rSwdoc.GetEditShell(); + SwEditShell* pEditShell = m_rDoc.GetEditShell(); vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : NULL; if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT && !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) ) diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index 568920c974a3..699e442bc985 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -28,7 +28,7 @@ namespace sw { DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) : - m_rSwdoc( i_rSwdoc ), + m_rDoc( i_rSwdoc ), mbModified(false), mbLoaded(false), mbUpdateExpFld(false), @@ -40,22 +40,22 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) : void DocumentStateManager::SetModified() { - m_rSwdoc.GetDocumentLayoutManager().ClearSwLayouterEntries(); + m_rDoc.GetDocumentLayoutManager().ClearSwLayouterEntries(); // give the old and new modified state to the link // Bit 0: -> old state // Bit 1: -> new state sal_IntPtr nCall = mbModified ? 3 : 2; mbModified = true; - m_rSwdoc.GetDocumentStatisticsManager().GetDocStat().bModified = true; - if( m_rSwdoc.GetOle2Link().IsSet() ) + m_rDoc.GetDocumentStatisticsManager().GetDocStat().bModified = true; + if( m_rDoc.GetOle2Link().IsSet() ) { mbInCallModified = true; - m_rSwdoc.GetOle2Link().Call( (void*)nCall ); + m_rDoc.GetOle2Link().Call( (void*)nCall ); mbInCallModified = false; } - if( m_rSwdoc.GetAutoCorrExceptWord() && !m_rSwdoc.GetAutoCorrExceptWord()->IsDeleted() ) - m_rSwdoc.DeleteAutoCorrExceptWord(); + if( m_rDoc.GetAutoCorrExceptWord() && !m_rDoc.GetAutoCorrExceptWord()->IsDeleted() ) + m_rDoc.DeleteAutoCorrExceptWord(); } void DocumentStateManager::ResetModified() @@ -65,11 +65,11 @@ void DocumentStateManager::ResetModified() // Bit 1: -> new state sal_IntPtr nCall = mbModified ? 1 : 0; mbModified = false; - m_rSwdoc.GetIDocumentUndoRedo().SetUndoNoModifiedPosition(); - if( nCall && m_rSwdoc.GetOle2Link().IsSet() ) + m_rDoc.GetIDocumentUndoRedo().SetUndoNoModifiedPosition(); + if( nCall && m_rDoc.GetOle2Link().IsSet() ) { mbInCallModified = true; - m_rSwdoc.GetOle2Link().Call( (void*)nCall ); + m_rDoc.GetOle2Link().Call( (void*)nCall ); mbInCallModified = false; } } diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 8987fb09bbf0..5035ab5dbd03 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -73,7 +73,7 @@ namespace namespace sw { -DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), +DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), mpDocStat( new SwDocStat ) { maStatsUpdateTimer.SetTimeout( 100 ); @@ -82,9 +82,9 @@ DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rSwd void DocumentStatisticsManager::DocInfoChgd( ) { - m_rSwdoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )->UpdateFlds(); - m_rSwdoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )->UpdateFlds(); - m_rSwdoc.getIDocumentState().SetModified(); + m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )->UpdateFlds(); + m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )->UpdateFlds(); + m_rDoc.getIDocumentState().SetModified(); } const SwDocStat& DocumentStatisticsManager::GetDocStat() const @@ -134,9 +134,9 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF SwNode* pNd; // This is the inner loop - at least while the paras are dirty. - for( sal_uLong i = m_rSwdoc.GetNodes().Count(); i > 0 && nChars > 0; ) + for( sal_uLong i = m_rDoc.GetNodes().Count(); i > 0 && nChars > 0; ) { - switch( ( pNd = m_rSwdoc.GetNodes()[ --i ])->GetNodeType() ) + switch( ( pNd = m_rDoc.GetNodes()[ --i ])->GetNodeType() ) { case ND_TEXTNODE: { @@ -157,7 +157,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF // #i93174#: notes contain paragraphs that are not nodes { - SwFieldType * const pPostits( m_rSwdoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD) ); + SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD) ); SwIterator<SwFmtFld,SwFieldType> aIter( *pPostits ); for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() ) { @@ -170,7 +170,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF } } - mpDocStat->nPage = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout() ? m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetPageNum() : 0; + mpDocStat->nPage = m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ? m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetPageNum() : 0; mpDocStat->bModified = false; com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7); @@ -196,7 +196,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF aStat[n++].Value <<= (sal_Int32)mpDocStat->nCharExcludingSpaces; // For e.g. autotext documents there is no pSwgInfo (#i79945) - SwDocShell* pObjShell(m_rSwdoc.GetDocShell()); + SwDocShell* pObjShell(m_rDoc.GetDocShell()); if (pObjShell) { const uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -204,7 +204,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF const uno::Reference<document::XDocumentProperties> xDocProps( xDPS->getDocumentProperties()); // #i96786#: do not set modified flag when updating statistics - const bool bDocWasModified( m_rSwdoc.getIDocumentState().IsModified() ); + const bool bDocWasModified( m_rDoc.getIDocumentState().IsModified() ); const ModifyBlocker_Impl b(pObjShell); // rhbz#1081176: don't jump to cursor pos because of (temporary) // activation of modified flag triggering move to input position @@ -212,14 +212,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF xDocProps->setDocumentStatistics(aStat); if (!bDocWasModified) { - m_rSwdoc.getIDocumentState().ResetModified(); + m_rDoc.getIDocumentState().ResetModified(); } } // optionally update stat. fields if (bFields) { - SwFieldType *pType = m_rSwdoc.getIDocumentFieldsAccess().GetSysFldType(RES_DOCSTATFLD); + SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DOCSTATFLD); pType->UpdateFlds(); } @@ -232,7 +232,7 @@ IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer ) if (IncrementalDocStatCalculate(32000)) maStatsUpdateTimer.Start(); - SwView* pView = m_rSwdoc.GetDocShell() ? m_rSwdoc.GetDocShell()->GetView() : NULL; + SwView* pView = m_rDoc.GetDocShell() ? m_rDoc.GetDocShell()->GetView() : NULL; if( pView ) pView->UpdateDocStats(); return 0; diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index c5590335d420..abc11490fb60 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -270,7 +270,7 @@ namespace namespace sw { -DocumentStylePoolManager::DocumentStylePoolManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ) +DocumentStylePoolManager::DocumentStylePoolManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ) { } @@ -287,9 +287,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool SwTxtFmtColl* pNewColl; sal_uInt16 nOutLvlBits = 0; - for( sal_uInt16 n = 0; n < m_rSwdoc.GetTxtFmtColls()->size(); ++n ) + for( sal_uInt16 n = 0; n < m_rDoc.GetTxtFmtColls()->size(); ++n ) { - if( nId == ( pNewColl = (*m_rSwdoc.GetTxtFmtColls())[ n ] )->GetPoolFmtId() ) + if( nId == ( pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ] )->GetPoolFmtId() ) { return pNewColl; } @@ -321,26 +321,26 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool OUString aNm( aResId ); // A Set for all to-be-set Attributes - SwAttrSet aSet( m_rSwdoc.GetAttrPool(), aTxtFmtCollSetRange ); + SwAttrSet aSet( m_rDoc.GetAttrPool(), aTxtFmtCollSetRange ); sal_uInt16 nParent = GetPoolParent( nId ); { //FEATURE::CONDCOLL if(::IsConditionalByPoolId( nId )) - pNewColl = new SwConditionTxtFmtColl( m_rSwdoc.GetAttrPool(), aNm, !nParent - ? m_rSwdoc.GetDfltTxtFmtColl() + pNewColl = new SwConditionTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent + ? m_rDoc.GetDfltTxtFmtColl() : GetTxtCollFromPool( nParent )); else //FEATURE::CONDCOLL - pNewColl = new SwTxtFmtColl( m_rSwdoc.GetAttrPool(), aNm, !nParent - ? m_rSwdoc.GetDfltTxtFmtColl() + pNewColl = new SwTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent + ? m_rDoc.GetDfltTxtFmtColl() : GetTxtCollFromPool( nParent )); pNewColl->SetPoolFmtId( nId ); - m_rSwdoc.GetTxtFmtColls()->push_back( pNewColl ); + m_rDoc.GetTxtFmtColls()->push_back( pNewColl ); } - bool bNoDefault = m_rSwdoc.GetDocumentSettingManager().get( IDocumentSettingAccess::STYLES_NODEFAULT ); + bool bNoDefault = m_rDoc.GetDocumentSettingManager().get( IDocumentSettingAccess::STYLES_NODEFAULT ); if ( !bNoDefault ) { switch( nId ) @@ -371,7 +371,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool RES_PARATR_LINESPACING ); SvxULSpaceItem aUL( 0, PT_7, RES_UL_SPACE ); aLSpc.SetPropLineSpace( (const sal_uInt8) 120 ); - if( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); + if( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); aSet.Put( aUL ); aSet.Put( aLSpc ); } @@ -436,7 +436,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool for( const sal_uInt16* pArr = aFntInit; *pArr; pArr += 4 ) { - sal_uInt16 nLng = ((SvxLanguageItem&)m_rSwdoc.GetDefault( *(pArr+2) )).GetLanguage(); + sal_uInt16 nLng = ((SvxLanguageItem&)m_rDoc.GetDefault( *(pArr+2) )).GetLanguage(); if( LANGUAGE_DONTKNOW == nLng ) nLng = *(pArr+3); @@ -450,7 +450,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool SvxFontHeightItem aFntSize( PT_14, 100, RES_CHRATR_FONTSIZE ); SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE ); - if( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); aSet.Put( SvxFmtKeepItem( true, RES_KEEP )); @@ -478,14 +478,14 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool { SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 0, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 0, false ); } break; case RES_POOLCOLL_HEADLINE2: // Headinline 2 { SvxULSpaceItem aUL( PT_10, PT_6, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 1, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 1, false ); } break; case RES_POOLCOLL_HEADLINE3: // Headinline 3 @@ -494,7 +494,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool Color aCol( COL_GRAY ); aSet.Put( aUL ); aSet.Put( SvxColorItem ( aCol, RES_CHRATR_COLOR ) ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 2, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 2, false ); } break; case RES_POOLCOLL_HEADLINE4: // Headinline 4 @@ -503,49 +503,49 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool Color aCol( COL_GRAY ); aSet.Put( aUL ); aSet.Put( SvxColorItem ( aCol, RES_CHRATR_COLOR ) ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 3, true ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 3, true ); } break; case RES_POOLCOLL_HEADLINE5: // Headinline 5 { SvxULSpaceItem aUL( PT_6, PT_3, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 4, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 4, false ); } break; case RES_POOLCOLL_HEADLINE6: // Headinline 6 { SvxULSpaceItem aUL( PT_3, PT_3, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 5, true ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 5, true ); } break; case RES_POOLCOLL_HEADLINE7: // Headinline 7 { SvxULSpaceItem aUL( PT_3, PT_3, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 6, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 6, false ); } break; case RES_POOLCOLL_HEADLINE8: // Headinline 8 { SvxULSpaceItem aUL( PT_3, PT_3, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 7, true ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 7, true ); } break; case RES_POOLCOLL_HEADLINE9: // Headinline 9 { SvxULSpaceItem aUL( PT_3, PT_3, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 8, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 8, false ); } break; case RES_POOLCOLL_HEADLINE10: // Headinline 10 { SvxULSpaceItem aUL( PT_3, PT_3, RES_UL_SPACE ); aSet.Put( aUL ); - lcl_SetHeadline( &m_rSwdoc, pNewColl, aSet, nOutLvlBits, 9, false ); + lcl_SetHeadline( &m_rDoc, pNewColl, aSet, nOutLvlBits, 9, false ); } break; @@ -562,7 +562,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool SwFmtLineNumber aLN; aLN.SetCountLines( false ); aSet.Put( aLN ); - long nRightMargin = lcl_GetRightMargin( m_rSwdoc ); + long nRightMargin = lcl_GetRightMargin( m_rDoc ); SvxTabStopItem aTStops( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ); aTStops.Insert( SvxTabStop( nRightMargin / 2, SVX_TAB_ADJUST_CENTER ) ); @@ -623,7 +623,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool case RES_POOLCOLL_SENDADRESS: // Sender address { - if( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) SetAllScriptItem( aSet, SvxPostureItem(ITALIC_NORMAL, RES_CHRATR_POSTURE) ); else { @@ -637,108 +637,108 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool // User defined indexes: case RES_POOLCOLL_TOX_USERH: // Header - lcl_SetRegister( &m_rSwdoc, aSet, 0, true, false ); + lcl_SetRegister( &m_rDoc, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( false ); aSet.Put( aLN ); } break; case RES_POOLCOLL_TOX_USER1: // 1. Level - lcl_SetRegister( &m_rSwdoc, aSet, 0, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 0, false, true ); break; case RES_POOLCOLL_TOX_USER2: // 2. Level - lcl_SetRegister( &m_rSwdoc, aSet, 1, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 1, false, true ); break; case RES_POOLCOLL_TOX_USER3: // 3. Level - lcl_SetRegister( &m_rSwdoc, aSet, 2, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 2, false, true ); break; case RES_POOLCOLL_TOX_USER4: // 4. Level - lcl_SetRegister( &m_rSwdoc, aSet, 3, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 3, false, true ); break; case RES_POOLCOLL_TOX_USER5: // 5. Level - lcl_SetRegister( &m_rSwdoc, aSet, 4, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 4, false, true ); break; case RES_POOLCOLL_TOX_USER6: // 6. Level - lcl_SetRegister( &m_rSwdoc, aSet, 5, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 5, false, true ); break; case RES_POOLCOLL_TOX_USER7: // 7. Level - lcl_SetRegister( &m_rSwdoc, aSet, 6, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 6, false, true ); break; case RES_POOLCOLL_TOX_USER8: // 8. Level - lcl_SetRegister( &m_rSwdoc, aSet, 7, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 7, false, true ); break; case RES_POOLCOLL_TOX_USER9: // 9. Level - lcl_SetRegister( &m_rSwdoc, aSet, 8, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 8, false, true ); break; case RES_POOLCOLL_TOX_USER10: // 10. Level - lcl_SetRegister( &m_rSwdoc, aSet, 9, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 9, false, true ); break; // Index case RES_POOLCOLL_TOX_IDXH: // Header - lcl_SetRegister( &m_rSwdoc, aSet, 0, true, false ); + lcl_SetRegister( &m_rDoc, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( false ); aSet.Put( aLN ); } break; case RES_POOLCOLL_TOX_IDX1: // 1. Level - lcl_SetRegister( &m_rSwdoc, aSet, 0, false, false ); + lcl_SetRegister( &m_rDoc, aSet, 0, false, false ); break; case RES_POOLCOLL_TOX_IDX2: // 2. Level - lcl_SetRegister( &m_rSwdoc, aSet, 1, false, false ); + lcl_SetRegister( &m_rDoc, aSet, 1, false, false ); break; case RES_POOLCOLL_TOX_IDX3: // 3. Level - lcl_SetRegister( &m_rSwdoc, aSet, 2, false, false ); + lcl_SetRegister( &m_rDoc, aSet, 2, false, false ); break; case RES_POOLCOLL_TOX_IDXBREAK: // Trenner - lcl_SetRegister( &m_rSwdoc, aSet, 0, false, false ); + lcl_SetRegister( &m_rDoc, aSet, 0, false, false ); break; // Table of Content case RES_POOLCOLL_TOX_CNTNTH: // Header - lcl_SetRegister( &m_rSwdoc, aSet, 0, true, false ); + lcl_SetRegister( &m_rDoc, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( false ); aSet.Put( aLN ); } break; case RES_POOLCOLL_TOX_CNTNT1: // 1. Level - lcl_SetRegister( &m_rSwdoc, aSet, 0, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 0, false, true ); break; case RES_POOLCOLL_TOX_CNTNT2: // 2. Level - lcl_SetRegister( &m_rSwdoc, aSet, 1, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 1, false, true ); break; case RES_POOLCOLL_TOX_CNTNT3: // 3. Level - lcl_SetRegister( &m_rSwdoc, aSet, 2, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 2, false, true ); break; case RES_POOLCOLL_TOX_CNTNT4: // 4. Level - lcl_SetRegister( &m_rSwdoc, aSet, 3, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 3, false, true ); break; case RES_POOLCOLL_TOX_CNTNT5: // 5. Level - lcl_SetRegister( &m_rSwdoc, aSet, 4, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 4, false, true ); break; case RES_POOLCOLL_TOX_CNTNT6: // 6. Level - lcl_SetRegister( &m_rSwdoc, aSet, 5, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 5, false, true ); break; case RES_POOLCOLL_TOX_CNTNT7: // 7. Level - lcl_SetRegister( &m_rSwdoc, aSet, 6, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 6, false, true ); break; case RES_POOLCOLL_TOX_CNTNT8: // 8. Level - lcl_SetRegister( &m_rSwdoc, aSet, 7, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 7, false, true ); break; case RES_POOLCOLL_TOX_CNTNT9: // 9. Level - lcl_SetRegister( &m_rSwdoc, aSet, 8, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 8, false, true ); break; case RES_POOLCOLL_TOX_CNTNT10: // 10. Level - lcl_SetRegister( &m_rSwdoc, aSet, 9, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 9, false, true ); break; case RES_POOLCOLL_TOX_ILLUSH: case RES_POOLCOLL_TOX_OBJECTH: case RES_POOLCOLL_TOX_TABLESH: case RES_POOLCOLL_TOX_AUTHORITIESH: - lcl_SetRegister( &m_rSwdoc, aSet, 0, true, false ); + lcl_SetRegister( &m_rDoc, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( false ); aSet.Put( aLN ); @@ -748,198 +748,198 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool case RES_POOLCOLL_TOX_OBJECT1: case RES_POOLCOLL_TOX_TABLES1: case RES_POOLCOLL_TOX_AUTHORITIES1: - lcl_SetRegister( &m_rSwdoc, aSet, 0, false, true ); + lcl_SetRegister( &m_rDoc, aSet, 0, false, true ); break; case RES_POOLCOLL_NUM_LEVEL1S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1, lNumFirstLineOffset, SwNumRule::GetNumIndent( 0 ), PT_12, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL1: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1, lNumFirstLineOffset, SwNumRule::GetNumIndent( 0 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL1E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1, lNumFirstLineOffset, SwNumRule::GetNumIndent( 0 ), 0, PT_12 ); break; case RES_POOLCOLL_NUM_NONUM1: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM1, 0, SwNumRule::GetNumIndent( 0 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL2S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2, lNumFirstLineOffset, SwNumRule::GetNumIndent( 1 ), PT_12, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL2: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2, lNumFirstLineOffset, SwNumRule::GetNumIndent( 1 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL2E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2, lNumFirstLineOffset, SwNumRule::GetNumIndent( 1 ), 0, PT_12 ); break; case RES_POOLCOLL_NUM_NONUM2: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM2, 0, SwNumRule::GetNumIndent( 1 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL3S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3, lNumFirstLineOffset, SwNumRule::GetNumIndent( 2 ), PT_12, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL3: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3, lNumFirstLineOffset, SwNumRule::GetNumIndent( 2 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL3E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3, lNumFirstLineOffset, SwNumRule::GetNumIndent( 2 ), 0, PT_12 ); break; case RES_POOLCOLL_NUM_NONUM3: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM3, 0, SwNumRule::GetNumIndent( 2 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL4S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4, lNumFirstLineOffset, SwNumRule::GetNumIndent( 3 ), PT_12, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL4: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4, lNumFirstLineOffset, SwNumRule::GetNumIndent( 3 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL4E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4, lNumFirstLineOffset, SwNumRule::GetNumIndent( 3 ), 0, PT_12 ); break; case RES_POOLCOLL_NUM_NONUM4: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM4, 0, SwNumRule::GetNumIndent( 3 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL5S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5, lNumFirstLineOffset, SwNumRule::GetNumIndent( 4 ), PT_12, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL5: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5, lNumFirstLineOffset, SwNumRule::GetNumIndent( 4 ), 0, PT_6 ); break; case RES_POOLCOLL_NUM_LEVEL5E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5, lNumFirstLineOffset, SwNumRule::GetNumIndent( 4 ), 0, PT_12 ); break; case RES_POOLCOLL_NUM_NONUM5: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_NONUM5, 0, SwNumRule::GetNumIndent( 4 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL1S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1, lBullFirstLineOffset, SwNumRule::GetBullIndent( 0 ), PT_12, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL1: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1, lBullFirstLineOffset, SwNumRule::GetBullIndent( 0 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL1E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1, lBullFirstLineOffset, SwNumRule::GetBullIndent( 0 ), 0, PT_12 ); break; case RES_POOLCOLL_BUL_NONUM1: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM1, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM1, 0, SwNumRule::GetBullIndent( 0 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL2S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2, lBullFirstLineOffset, SwNumRule::GetBullIndent( 1 ), PT_12, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL2: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2, lBullFirstLineOffset, SwNumRule::GetBullIndent( 1 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL2E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2, lBullFirstLineOffset, SwNumRule::GetBullIndent( 1 ), 0, PT_12 ); break; case RES_POOLCOLL_BUL_NONUM2: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM2, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM2, 0, SwNumRule::GetBullIndent( 1 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL3S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3, lBullFirstLineOffset, SwNumRule::GetBullIndent( 2 ), PT_12, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL3: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3, lBullFirstLineOffset, SwNumRule::GetBullIndent( 2 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL3E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3, lBullFirstLineOffset, SwNumRule::GetBullIndent( 2 ), 0, PT_12 ); break; case RES_POOLCOLL_BUL_NONUM3: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM3, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM3, 0, SwNumRule::GetBullIndent( 2 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL4S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4, lBullFirstLineOffset, SwNumRule::GetBullIndent( 3 ), PT_12, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL4: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4, lBullFirstLineOffset, SwNumRule::GetBullIndent( 3 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL4E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4, lBullFirstLineOffset, SwNumRule::GetBullIndent( 3 ), 0, PT_12 ); break; case RES_POOLCOLL_BUL_NONUM4: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM4, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM4, 0, SwNumRule::GetBullIndent( 3 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL5S: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5, lBullFirstLineOffset, SwNumRule::GetBullIndent( 4 ), PT_12, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL5: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5, lBullFirstLineOffset, SwNumRule::GetBullIndent( 4 ), 0, PT_6 ); break; case RES_POOLCOLL_BUL_LEVEL5E: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5, lBullFirstLineOffset, SwNumRule::GetBullIndent( 4 ), 0, PT_12 ); break; case RES_POOLCOLL_BUL_NONUM5: - lcl_SetNumBul( &m_rSwdoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM5, + lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM5, 0, SwNumRule::GetBullIndent( 4 ), 0, PT_6 ); break; @@ -1069,8 +1069,8 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) { case POOLGRP_CHARFMT: { - pArray[0] = m_rSwdoc.GetCharFmts(); - pDeriveFmt = m_rSwdoc.GetDfltCharFmt(); + pArray[0] = m_rDoc.GetCharFmts(); + pDeriveFmt = m_rDoc.GetDfltCharFmt(); if( nId > RES_POOLCHR_NORMAL_END ) nRCId = RC_POOLCHRFMT_HTML_BEGIN - RES_POOLCHR_HTML_BEGIN; @@ -1089,9 +1089,9 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) break; case POOLGRP_FRAMEFMT: { - pArray[0] = m_rSwdoc.GetFrmFmts(); - pArray[1] = m_rSwdoc.GetSpzFrmFmts(); - pDeriveFmt = m_rSwdoc.GetDfltFrmFmt(); + pArray[0] = m_rDoc.GetFrmFmts(); + pArray[1] = m_rDoc.GetSpzFrmFmts(); + pDeriveFmt = m_rDoc.GetDfltFrmFmt(); nArrCnt = 2; nRCId = RC_POOLFRMFMT_BEGIN - RES_POOLFRM_BEGIN; pWhichRange = aFrmFmtSetRange; @@ -1123,20 +1123,20 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) ResId aResId( nRCId + nId, *pSwResMgr ); OUString aNm( aResId ); - SwAttrSet aSet( m_rSwdoc.GetAttrPool(), pWhichRange ); + SwAttrSet aSet( m_rDoc.GetAttrPool(), pWhichRange ); { - bool bIsModified = m_rSwdoc.getIDocumentState().IsModified(); + bool bIsModified = m_rDoc.getIDocumentState().IsModified(); { - ::sw::UndoGuard const undoGuard(m_rSwdoc.GetIDocumentUndoRedo()); + ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo()); switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) ) { case POOLGRP_CHARFMT: - pNewFmt = m_rSwdoc._MakeCharFmt(aNm, pDeriveFmt, false, true); + pNewFmt = m_rDoc._MakeCharFmt(aNm, pDeriveFmt, false, true); break; case POOLGRP_FRAMEFMT: - pNewFmt = m_rSwdoc._MakeFrmFmt(aNm, pDeriveFmt, false, true); + pNewFmt = m_rDoc._MakeFrmFmt(aNm, pDeriveFmt, false, true); break; default: break; @@ -1144,7 +1144,7 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) } if( !bIsModified ) - m_rSwdoc.getIDocumentState().ResetModified(); + m_rDoc.getIDocumentState().ResetModified(); pNewFmt->SetPoolFmtId( nId ); pNewFmt->SetAuto( false ); // no AutoFormat } @@ -1246,7 +1246,7 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) case RES_POOLFRM_FRAME: { - if ( m_rSwdoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) + if ( m_rDoc.GetDocumentSettingManager().get(IDocumentSettingAccess::HTML_MODE) ) { aSet.Put( SwFmtAnchor( FLY_AS_CHAR )); aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) ); @@ -1351,11 +1351,11 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool OSL_ENSURE( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END, "Wrong AutoFormat Id" ); - for( sal_uInt16 n = 0; n < m_rSwdoc.GetPageDescCnt(); ++n ) + for( sal_uInt16 n = 0; n < m_rDoc.GetPageDescCnt(); ++n ) { - if ( nId == m_rSwdoc.GetPageDesc(n).GetPoolFmtId() ) + if ( nId == m_rDoc.GetPageDesc(n).GetPoolFmtId() ) { - return &m_rSwdoc.GetPageDesc(n); + return &m_rDoc.GetPageDesc(n); } } @@ -1370,17 +1370,17 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool { const ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId - RES_POOLPAGE_BEGIN), *pSwResMgr ); const OUString aNm( aResId ); - const bool bIsModified = m_rSwdoc.getIDocumentState().IsModified(); + const bool bIsModified = m_rDoc.getIDocumentState().IsModified(); { - ::sw::UndoGuard const undoGuard(m_rSwdoc.GetIDocumentUndoRedo()); - pNewPgDsc = m_rSwdoc.MakePageDesc(aNm, 0, bRegardLanguage); + ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo()); + pNewPgDsc = m_rDoc.MakePageDesc(aNm, 0, bRegardLanguage); } pNewPgDsc->SetPoolFmtId( nId ); if ( !bIsModified ) { - m_rSwdoc.getIDocumentState().ResetModified(); + m_rDoc.getIDocumentState().ResetModified(); } } @@ -1395,7 +1395,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool aUL.SetLower( (sal_uInt16)aLR.GetLeft() ); } - SwAttrSet aSet( m_rSwdoc.GetAttrPool(), aPgFrmFmtSetRange ); + SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrmFmtSetRange ); bool bSetLeft = true; switch( nId ) @@ -1411,7 +1411,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool case RES_POOLPAGE_FIRST: // "First Page" case RES_POOLPAGE_REGISTER: // "Index" { - lcl_PutStdPageSizeIntoItemSet( &m_rSwdoc, aSet ); + lcl_PutStdPageSizeIntoItemSet( &m_rDoc, aSet ); aSet.Put( aLR ); aSet.Put( aUL ); pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL ); @@ -1422,7 +1422,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool case RES_POOLPAGE_LEFT: // "Left Page" { - lcl_PutStdPageSizeIntoItemSet( &m_rSwdoc, aSet ); + lcl_PutStdPageSizeIntoItemSet( &m_rDoc, aSet ); aSet.Put( aLR ); aSet.Put( aUL ); bSetLeft = false; @@ -1434,7 +1434,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool break; case RES_POOLPAGE_RIGHT: // "Right Page" { - lcl_PutStdPageSizeIntoItemSet( &m_rSwdoc, aSet ); + lcl_PutStdPageSizeIntoItemSet( &m_rDoc, aSet ); aSet.Put( aLR ); aSet.Put( aUL ); bSetLeft = false; @@ -1460,7 +1460,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool case RES_POOLPAGE_HTML: // "HTML" { - lcl_PutStdPageSizeIntoItemSet( &m_rSwdoc, aSet ); + lcl_PutStdPageSizeIntoItemSet( &m_rDoc, aSet ); aLR.SetRight( GetMetricVal( CM_1 )); aUL.SetUpper( (sal_uInt16)aLR.GetRight() ); aUL.SetLower( (sal_uInt16)aLR.GetRight() ); @@ -1474,7 +1474,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool case RES_POOLPAGE_FOOTNOTE: // "Footnote" case RES_POOLPAGE_ENDNOTE: // "Endnote" { - lcl_PutStdPageSizeIntoItemSet( &m_rSwdoc, aSet ); + lcl_PutStdPageSizeIntoItemSet( &m_rDoc, aSet ); aSet.Put( aLR ); aSet.Put( aUL ); pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL ); @@ -1526,9 +1526,9 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId ) SwNumRule* pNewRule; - for (size_t n = 0; n < m_rSwdoc.GetNumRuleTbl().size(); ++n ) + for (size_t n = 0; n < m_rDoc.GetNumRuleTbl().size(); ++n ) { - if (nId == ( pNewRule = m_rSwdoc.GetNumRuleTbl()[ n ] )->GetPoolFmtId()) + if (nId == ( pNewRule = m_rDoc.GetNumRuleTbl()[ n ] )->GetPoolFmtId()) { return pNewRule; } @@ -1549,11 +1549,11 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId ) const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode = numfunc::GetDefaultPositionAndSpaceMode(); //#i89178# { - bool bIsModified = m_rSwdoc.getIDocumentState().IsModified(); + bool bIsModified = m_rDoc.getIDocumentState().IsModified(); - sal_uInt16 n = m_rSwdoc.MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode ); + sal_uInt16 n = m_rDoc.MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode ); - pNewRule = m_rSwdoc.GetNumRuleTbl()[ n ]; + pNewRule = m_rDoc.GetNumRuleTbl()[ n ]; pNewRule->SetPoolFmtId( nId ); pNewRule->SetAutoRule( false ); @@ -1565,7 +1565,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId ) pBullCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL ); if( !bIsModified ) - m_rSwdoc.getIDocumentState().ResetModified(); + m_rDoc.getIDocumentState().ResetModified(); } switch( nId ) @@ -2101,9 +2101,9 @@ bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const SwTxtFmtColl* pNewColl = 0; bool bFnd = false; - for( sal_uInt16 n = 0; !bFnd && n < m_rSwdoc.GetTxtFmtColls()->size(); ++n ) + for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTxtFmtColls()->size(); ++n ) { - pNewColl = (*m_rSwdoc.GetTxtFmtColls())[ n ]; + pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ]; if( nId == pNewColl->GetPoolFmtId() ) bFnd = true; } @@ -2111,7 +2111,7 @@ bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const if( !bFnd || !pNewColl->GetDepends() ) return false; - SwAutoFmtGetDocNode aGetHt( &m_rSwdoc.GetNodes() ); + SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() ); return !pNewColl->GetInfo( aGetHt ); } @@ -2125,12 +2125,12 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const if (RES_POOLCHR_BEGIN <= nId && nId < RES_POOLCHR_END) { - pArray[0] = m_rSwdoc.GetCharFmts(); + pArray[0] = m_rDoc.GetCharFmts(); } else if (RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END) { - pArray[0] = m_rSwdoc.GetFrmFmts(); - pArray[1] = m_rSwdoc.GetSpzFrmFmts(); + pArray[0] = m_rDoc.GetFrmFmts(); + pArray[1] = m_rDoc.GetSpzFrmFmts(); nArrCnt = 2; } else @@ -2156,7 +2156,7 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const { // Check if we have dependent ContentNodes in the Nodes array // (also indirect ones for derived Formats) - SwAutoFmtGetDocNode aGetHt( &m_rSwdoc.GetNodes() ); + SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() ); bFnd = !pNewFmt->GetInfo( aGetHt ); } else @@ -2172,9 +2172,9 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const "Wrong AutoFormat Id" ); SwPageDesc *pNewPgDsc = 0; bool bFnd = false; - for( sal_uInt16 n = 0; !bFnd && n < m_rSwdoc.GetPageDescCnt(); ++n ) + for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetPageDescCnt(); ++n ) { - pNewPgDsc = &m_rSwdoc.GetPageDesc(n); + pNewPgDsc = &m_rDoc.GetPageDesc(n); if( nId == pNewPgDsc->GetPoolFmtId() ) bFnd = true; } @@ -2185,7 +2185,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const // Check if we have dependent ContentNodes in the Nodes array // (also indirect ones for derived Formats) - SwAutoFmtGetDocNode aGetHt( &m_rSwdoc.GetNodes() ); + SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() ); return !pNewPgDsc->GetInfo( aGetHt ); } diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 180b50b46d61..444f36e7a2db 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -38,7 +38,7 @@ namespace sw { -DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc ) : m_rSwdoc( i_rSwdoc ), +DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), mbStartIdleTimer( false ), mIdleBlockCount( 0 ) { @@ -85,12 +85,12 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *, pTimer ) pModLogFile = new ::rtl::Logfile( "First DoIdleJobs" ); #endif - SwRootFrm* pTmpRoot = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout(); + SwRootFrm* pTmpRoot = m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(); if( pTmpRoot && - !SfxProgress::GetActiveProgress( m_rSwdoc.GetDocShell() ) ) + !SfxProgress::GetActiveProgress( m_rDoc.GetDocShell() ) ) { SwViewShell *pSh, *pStartSh; - pSh = pStartSh = m_rSwdoc.getIDocumentLayoutAccess().GetCurrentViewShell(); + pSh = pStartSh = m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell(); do { if( pSh->ActionPend() ) { @@ -108,9 +108,9 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *, pTimer ) UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar; if (bIsOnlineSpell && bIsAutoGrammar) - StartGrammarChecking( m_rSwdoc ); + StartGrammarChecking( m_rDoc ); } - std::set<SwRootFrm*> aAllLayouts = m_rSwdoc.GetAllLayouts(); + std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts(); std::set<SwRootFrm*>::iterator pLayIter = aAllLayouts.begin(); for ( ;pLayIter != aAllLayouts.end();++pLayIter ) { @@ -124,23 +124,23 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *, pTimer ) } } - SwFldUpdateFlags nFldUpdFlag = m_rSwdoc.GetDocumentSettingManager().getFieldUpdateFlags(true); + SwFldUpdateFlags nFldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true); if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag || AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) && - m_rSwdoc.getIDocumentFieldsAccess().GetUpdtFlds().IsFieldsDirty() + m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsFieldsDirty() // If we switch the field name the Fields are not updated. // So the "backgorund update" should always be carried out /* && !pStartSh->GetViewOptions()->IsFldName()*/ ) { - if ( m_rSwdoc.getIDocumentFieldsAccess().GetUpdtFlds().IsInUpdateFlds() || - m_rSwdoc.getIDocumentFieldsAccess().IsExpFldsLocked() ) + if ( m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsInUpdateFlds() || + m_rDoc.getIDocumentFieldsAccess().IsExpFldsLocked() ) { pTimer->Start(); return 0; } // Action brackets! - m_rSwdoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( true ); + m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( true ); pTmpRoot->StartAllAction(); @@ -148,17 +148,17 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *, pTimer ) const bool bOldLockView = pStartSh->IsViewLocked(); pStartSh->LockView( true ); - m_rSwdoc.getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 ); // ChapterField - m_rSwdoc.getIDocumentFieldsAccess().UpdateExpFlds( 0, false ); // Updates ExpressionFields - m_rSwdoc.getIDocumentFieldsAccess().UpdateTblFlds(NULL); // Tables - m_rSwdoc.getIDocumentFieldsAccess().UpdateRefFlds(NULL); // References + m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 ); // ChapterField + m_rDoc.getIDocumentFieldsAccess().UpdateExpFlds( 0, false ); // Updates ExpressionFields + m_rDoc.getIDocumentFieldsAccess().UpdateTblFlds(NULL); // Tables + m_rDoc.getIDocumentFieldsAccess().UpdateRefFlds(NULL); // References pTmpRoot->EndAllAction(); pStartSh->LockView( bOldLockView ); - m_rSwdoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( false ); - m_rSwdoc.getIDocumentFieldsAccess().GetUpdtFlds().SetFieldsDirty( false ); + m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( false ); + m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetFieldsDirty( false ); } } #ifdef TIMELOG diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx index e646adc704f8..62852535fe34 100644 --- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx +++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx @@ -55,7 +55,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; mutable rtl::Reference<SwChartDataProvider> maChartDataProviderImplRef; SwChartLockController_Helper *mpChartControllerHelper; diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index f5745b615265..adf7498a0435 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -149,7 +149,7 @@ public: virtual ~DocumentContentOperationsManager(); private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; bool DeleteAndJoinImpl(SwPaM&, const bool); bool DeleteAndJoinWithRedlineImpl(SwPaM&, const bool unused = false); diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index d9cf1067c502..1440b63897b6 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -71,7 +71,7 @@ private: Care has to be taken of the necessary invalidations and notifications. */ - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; SfxPrinter* mpPrt; VirtualDevice* mpVirDev; SwPrintData* mpPrtData; diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index c9052e75867f..b87b06ff25ac 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -67,7 +67,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; SwDrawModel* mpDrawModel; diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index acc1bde75cd9..c29a4d9eb833 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -92,7 +92,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; bool mbNewFldLst; //< TRUE: Rebuild field-list. SwDocUpdtFld *mpUpdtFlds; //< Struct for updating fields diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx index 66a1d8bb0d87..ddc8ef30e4bd 100644 --- a/sw/source/core/inc/DocumentLayoutManager.hxx +++ b/sw/source/core/inc/DocumentLayoutManager.hxx @@ -60,7 +60,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; SwViewShell *mpCurrentView; //< SwDoc should get a new member mpCurrentView SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx index 27ce04ef32bb..79eb9adf3b96 100644 --- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx +++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -72,7 +72,7 @@ private: bool mbLinksUpdated; //< #i38810# flag indicating, that the links have been updated. sfx2::LinkManager *mpLinkMgr; //< List of linked stuff (graphics/DDE/OLE). - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; }; } diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx index cc916b1c0c16..37bdfaee68e3 100644 --- a/sw/source/core/inc/DocumentListsManager.hxx +++ b/sw/source/core/inc/DocumentListsManager.hxx @@ -54,7 +54,7 @@ class DocumentListsManager : public IDocumentListsAccess, private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; typedef boost::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists; // container to hold the lists of the text document diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx index e53fb7e9b4ee..c16a15732c0b 100644 --- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx +++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx @@ -51,7 +51,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; }; } diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index 0c63c493086b..fd7d2332c679 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -124,7 +124,7 @@ public: virtual ~DocumentRedlineManager(); private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; RedlineMode_t meRedlineMode; //< Current Redline Mode. SwRedlineTbl *mpRedlineTbl; //< List of all Ranged Redlines. diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx index b789c68ffb3c..70f3a7332639 100644 --- a/sw/source/core/inc/DocumentStateManager.hxx +++ b/sw/source/core/inc/DocumentStateManager.hxx @@ -49,7 +49,7 @@ public: void SetLoaded(bool b) SAL_OVERRIDE; private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; bool mbModified ; //< TRUE: document has changed. bool mbLoaded ; //< TRUE: Doc loaded. diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index 07408b800d5a..45915c77ecde 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -48,7 +48,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; /** continue computing a chunk of document statistics diff --git a/sw/source/core/inc/DocumentStylePoolManager.hxx b/sw/source/core/inc/DocumentStylePoolManager.hxx index e3ec3889a450..a18506b24f4d 100644 --- a/sw/source/core/inc/DocumentStylePoolManager.hxx +++ b/sw/source/core/inc/DocumentStylePoolManager.hxx @@ -49,7 +49,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; }; } diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index 5becf1bcdad1..b591b70f094e 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -56,7 +56,7 @@ public: private: - SwDoc& m_rSwdoc; + SwDoc& m_rDoc; bool mbStartIdleTimer; //< idle timer mode start/stop sal_Int32 mIdleBlockCount; |