Kaydet (Commit) 6e34c955 authored tarafından Miklos Vajna's avatar Miklos Vajna Kaydeden (comit) Andras Timar

SwTextFormatInfo::CtorInitTextFormatInfo: use vcl::RenderContext

Change-Id: I0f775bdfaf6a098be25d053f87b1bcf86d533297
(cherry picked from commit a5fe6ea0)
üst f50f76ce
...@@ -1624,7 +1624,7 @@ void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ) ...@@ -1624,7 +1624,7 @@ void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf )
// If something went wrong, we need to reformat again // If something went wrong, we need to reformat again
if( !bGoOn ) if( !bGoOn )
{ {
rInf.CtorInitTextFormatInfo( this ); rInf.CtorInitTextFormatInfo( getRootFrm()->GetCurrShell()->GetOut(), this );
rLine.CtorInitTextFormatter( this, &rInf ); rLine.CtorInitTextFormatter( this, &rInf );
rLine.SetDropLines( 1 ); rLine.SetDropLines( 1 );
rLine.CalcDropHeight( 1 ); rLine.CalcDropHeight( 1 );
......
...@@ -1351,10 +1351,10 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen ) ...@@ -1351,10 +1351,10 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen )
return bAuto; 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 ) const bool bNewQuick, const bool bTst )
{ {
CtorInitTextPaintInfo( pNewFrm->getRootFrm()->GetCurrShell()->GetOut(), pNewFrm, SwRect() ); CtorInitTextPaintInfo( pRenderContext, pNewFrm, SwRect() );
bQuick = bNewQuick; bQuick = bNewQuick;
bInterHyph = bNewInterHyph; bInterHyph = bNewInterHyph;
...@@ -1470,7 +1470,7 @@ void SwTextFormatInfo::Init() ...@@ -1470,7 +1470,7 @@ void SwTextFormatInfo::Init()
SwTextFormatInfo::SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL, SwTextFormatInfo::SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL,
const bool bQuickL, const bool bTst) const bool bQuickL, const bool bTst)
{ {
CtorInitTextFormatInfo(pFrame, bInterHyphL, bQuickL, bTst); CtorInitTextFormatInfo(pFrame->getRootFrm()->GetCurrShell()->GetOut(), pFrame, bInterHyphL, bQuickL, bTst);
} }
/** /**
......
...@@ -561,7 +561,7 @@ class SwTextFormatInfo : public SwTextPaintInfo ...@@ -561,7 +561,7 @@ class SwTextFormatInfo : public SwTextPaintInfo
bool _CheckFootnotePortion( SwLineLayout* pCurr ); bool _CheckFootnotePortion( SwLineLayout* pCurr );
public: 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 ); const bool bQuick = false, const bool bTst = false );
SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL = false, SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL = false,
const bool bQuickL = false, const bool bTst = false); const bool bQuickL = false, const bool bTst = false);
......
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