diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-10-25 13:46:44 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-10-30 12:13:13 +0100 |
| commit | 94cf44656492e408ef6c7f6e18deffe519f22018 (patch) | |
| tree | ad2b58c382245cc3d45b6a85a209f0d339143f38 /sw/source/core/edit/autofmt.cxx | |
| parent | 6f45913394a931f2053c7b1cba52bdfd79a3093b (diff) | |
Isolated SwFrame members maFrane and maPrt
To gain more control over changes of the Writer layout,
isolated mentioned members and replaced all calls with
inline methods for read and/or write access. Moved to
own class to also identify 'private' accesses reliably.
Change-Id: Ib0b7f852f5176744e860e2aad12dd13c9a906d68
Diffstat (limited to 'sw/source/core/edit/autofmt.cxx')
| -rw-r--r-- | sw/source/core/edit/autofmt.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 7ce2f7d0a068..b60a593da594 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -251,10 +251,10 @@ SwTextFrame* SwAutoFormat::GetFrame( const SwTextNode& rTextNd ) const if( m_aFlags.bAFormatByInput && !pFrame->IsValid() ) { DisableCallbackAction a(const_cast<SwRootFrame&>(*pFrame->getRootFrame())); - SwRect aTmpFrame( pFrame->Frame() ); - SwRect aTmpPrt( pFrame->Prt() ); + SwRect aTmpFrame( pFrame->FrameRA() ); + SwRect aTmpPrt( pFrame->PrintRA() ); pFrame->Calc(pFrame->getRootFrame()->GetCurrShell()->GetOut()); - if( pFrame->Frame() != aTmpFrame || pFrame->Prt() != aTmpPrt || + if( pFrame->FrameRA() != aTmpFrame || pFrame->PrintRA() != aTmpPrt || ( pFrame->IsTextFrame() && !const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pFrame))->Paint().IsEmpty() ) ) pFrame->SetCompletePaint(); } @@ -652,7 +652,7 @@ bool SwAutoFormat::DoTable() { eHori = text::HoriOrientation::NONE; // then - as last - we need to add the current frame width into the array - aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTextFrame->Frame().Width()) ); + aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTextFrame->FrameRA().Width()) ); } else eHori = text::HoriOrientation::LEFT; @@ -1374,7 +1374,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) bool bBreak = true; // first, determine current indentation and frame width - SwTwips nFrameWidth = m_pCurTextFrame->Prt().Width(); + SwTwips nFrameWidth = m_pCurTextFrame->PrintRA().Width(); SwTwips nLeftTextPos; { sal_Int32 nPos(0); |