diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-25 17:12:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-26 09:21:54 +0200 |
| commit | 8155ba78bab5dfe600170d42c0b1ae47da602657 (patch) | |
| tree | ffc56ffb630e586dc784533d2aa2745889c12316 /sw | |
| parent | dddbb8dc6e6caefc15134fe48fd769e332d916f4 (diff) | |
SwTextFormatInfo::CtorInitTextFormatInfo: use vcl::RenderContext
Change-Id: I0f775bdfaf6a098be25d053f87b1bcf86d533297
(cherry picked from commit a5fe6ea091ae7e897b11b62b9b749b6194d34585)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index cb70ff23c9ce..1434a49ae242 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -1624,7 +1624,7 @@ void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ) // If something went wrong, we need to reformat again if( !bGoOn ) { - rInf.CtorInitTextFormatInfo( this ); + rInf.CtorInitTextFormatInfo( getRootFrm()->GetCurrShell()->GetOut(), this ); rLine.CtorInitTextFormatter( this, &rInf ); rLine.SetDropLines( 1 ); rLine.CalcDropHeight( 1 ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index bac97041f2cc..741bef706b02 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1351,10 +1351,10 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen ) return bAuto; } -void SwTextFormatInfo::CtorInitTextFormatInfo( SwTextFrm *pNewFrm, const bool bNewInterHyph, +void SwTextFormatInfo::CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwTextFrm *pNewFrm, const bool bNewInterHyph, const bool bNewQuick, const bool bTst ) { - CtorInitTextPaintInfo( pNewFrm->getRootFrm()->GetCurrShell()->GetOut(), pNewFrm, SwRect() ); + CtorInitTextPaintInfo( pRenderContext, pNewFrm, SwRect() ); bQuick = bNewQuick; bInterHyph = bNewInterHyph; @@ -1470,7 +1470,7 @@ void SwTextFormatInfo::Init() SwTextFormatInfo::SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL, const bool bQuickL, const bool bTst) { - CtorInitTextFormatInfo(pFrame, bInterHyphL, bQuickL, bTst); + CtorInitTextFormatInfo(pFrame->getRootFrm()->GetCurrShell()->GetOut(), pFrame, bInterHyphL, bQuickL, bTst); } /** diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index cbcabef11a0f..fc28a0a49f7e 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -561,7 +561,7 @@ class SwTextFormatInfo : public SwTextPaintInfo bool _CheckFootnotePortion( SwLineLayout* pCurr ); public: - void CtorInitTextFormatInfo( SwTextFrm *pFrm, const bool bInterHyph = false, + void CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwTextFrm *pFrm, const bool bInterHyph = false, const bool bQuick = false, const bool bTst = false ); SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL = false, const bool bQuickL = false, const bool bTst = false); |