[Libreoffice-commits] core.git: 4 commits - sw/source
Michael Stahl
mstahl at redhat.com
Mon Nov 3 09:05:47 PST 2014
sw/source/core/crsr/bookmrk.cxx | 8
sw/source/core/crsr/crossrefbookmark.cxx | 16
sw/source/core/doc/DocumentChartDataProviderManager.cxx | 10
sw/source/core/doc/DocumentContentOperationsManager.cxx | 468 +++++++-------
sw/source/core/doc/DocumentDeviceManager.cxx | 80 +-
sw/source/core/doc/DocumentDrawModelManager.cxx | 36 -
sw/source/core/doc/DocumentFieldsManager.cxx | 186 ++---
sw/source/core/doc/DocumentLayoutManager.cxx | 86 +-
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 56 -
sw/source/core/doc/DocumentListsManager.cxx | 8
sw/source/core/doc/DocumentOutlineNodesManager.cxx | 12
sw/source/core/doc/DocumentRedlineManager.cxx | 104 +--
sw/source/core/doc/DocumentStateManager.cxx | 20
sw/source/core/doc/DocumentStatisticsManager.cxx | 26
sw/source/core/doc/DocumentStylePoolManager.cxx | 270 ++++----
sw/source/core/doc/DocumentTimerManager.cxx | 34 -
sw/source/core/doc/docbm.cxx | 25
sw/source/core/inc/DocumentChartDataProviderManager.hxx | 2
sw/source/core/inc/DocumentContentOperationsManager.hxx | 2
sw/source/core/inc/DocumentDeviceManager.hxx | 2
sw/source/core/inc/DocumentDrawModelManager.hxx | 2
sw/source/core/inc/DocumentFieldsManager.hxx | 2
sw/source/core/inc/DocumentLayoutManager.hxx | 2
sw/source/core/inc/DocumentLinksAdministrationManager.hxx | 2
sw/source/core/inc/DocumentListsManager.hxx | 2
sw/source/core/inc/DocumentOutlineNodesManager.hxx | 2
sw/source/core/inc/DocumentRedlineManager.hxx | 2
sw/source/core/inc/DocumentStateManager.hxx | 2
sw/source/core/inc/DocumentStatisticsManager.hxx | 2
sw/source/core/inc/DocumentStylePoolManager.hxx | 2
sw/source/core/inc/DocumentTimerManager.hxx | 2
sw/source/core/inc/crossrefbookmark.hxx | 4
32 files changed, 741 insertions(+), 736 deletions(-)
New commits:
commit 093d54326f94467bc1601c14a38454efcc888017
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 3 17:37:56 2014 +0100
sw: s/m_rSwdoc/m_rDoc/g
... because i can type m_rDoc but "m_rSwdoc" always comes out m_rSwDoc.
Change-Id: Id50888012da6cf3cf7aebc52e8c70fc359c6e073
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index c243eb3..cd8d0e3 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 0ae2356..7a6319b 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 dd57453..baf9086 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 95f7bfa..8771a1b 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 8594f22..bf617fc 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list