Skip to content

C
core
Kaydet (Commit) 093d5432 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

sw: s/m_rSwdoc/m_rDoc/g 

... because i can type m_rDoc but "m_rSwdoc" always comes out m_rSwDoc.

Change-Id: Id50888012da6cf3cf7aebc52e8c70fc359c6e073
üst 9aa43559
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 87 deletions
sw/source/core/doc/DocumentChartDataProviderManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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;
}
......
sw/source/core/doc/DocumentDrawModelManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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;
......
sw/source/core/doc/DocumentListsManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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." );
......
sw/source/core/doc/DocumentOutlineNodesManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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() );
}
}
......
sw/source/core/doc/DocumentStateManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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;
}
}
......
sw/source/core/doc/DocumentStatisticsManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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;
......
sw/source/core/doc/DocumentTimerManager.cxx
Dosyayı görüntüle @ 093d5432
......@@ -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
......
sw/source/core/inc/DocumentChartDataProviderManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -55,7 +55,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
mutable rtl::Reference<SwChartDataProvider> maChartDataProviderImplRef;
SwChartLockController_Helper *mpChartControllerHelper;
......
sw/source/core/inc/DocumentContentOperationsManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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);
......
sw/source/core/inc/DocumentDeviceManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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;
......
sw/source/core/inc/DocumentDrawModelManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -67,7 +67,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
SwDrawModel* mpDrawModel;
......
sw/source/core/inc/DocumentFieldsManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -92,7 +92,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
bool mbNewFldLst; //< TRUE: Rebuild field-list.
SwDocUpdtFld *mpUpdtFlds; //< Struct for updating fields
......
sw/source/core/inc/DocumentLayoutManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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
......
sw/source/core/inc/DocumentLinksAdministrationManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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;
};
}
......
sw/source/core/inc/DocumentListsManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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
......
sw/source/core/inc/DocumentOutlineNodesManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -51,7 +51,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
};
}
......
sw/source/core/inc/DocumentRedlineManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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.
......
sw/source/core/inc/DocumentStateManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -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.
......
sw/source/core/inc/DocumentStatisticsManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -48,7 +48,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
/** continue computing a chunk of document statistics
......
sw/source/core/inc/DocumentStylePoolManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -49,7 +49,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
};
}
......
sw/source/core/inc/DocumentTimerManager.hxx
Dosyayı görüntüle @ 093d5432
......@@ -56,7 +56,7 @@ public:
private:
SwDoc& m_rSwdoc;
SwDoc& m_rDoc;
bool mbStartIdleTimer; //< idle timer mode start/stop
sal_Int32 mIdleBlockCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment