Kaydet (Commit) 0c33e10b authored tarafından Miklos Vajna's avatar Miklos Vajna

SwTextPaintInfo::CtorInitTextPaintInfo: use vcl::RenderContext

Change-Id: I1931ec139798d2f2eb956fd0590ab98ce1a65c3c
üst 9829d6ab
...@@ -487,9 +487,9 @@ bool SwTextSizeInfo::_HasHint( const SwTextNode* pTextNode, sal_Int32 nPos ) ...@@ -487,9 +487,9 @@ bool SwTextSizeInfo::_HasHint( const SwTextNode* pTextNode, sal_Int32 nPos )
return pTextNode->GetTextAttrForCharAt(nPos); return pTextNode->GetTextAttrForCharAt(nPos);
} }
void SwTextPaintInfo::CtorInitTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint ) void SwTextPaintInfo::CtorInitTextPaintInfo( OutputDevice* pRenderContext, SwTextFrm *pFrame, const SwRect &rPaint )
{ {
CtorInitTextSizeInfo( pFrame->getRootFrm()->GetCurrShell()->GetOut(), pFrame ); CtorInitTextSizeInfo( pRenderContext, pFrame );
aTextFly.CtorInitTextFly( pFrame ), aTextFly.CtorInitTextFly( pFrame ),
aPaintRect = rPaint; aPaintRect = rPaint;
nSpaceIdx = 0; nSpaceIdx = 0;
...@@ -533,7 +533,7 @@ SwTextPaintInfo::SwTextPaintInfo( const SwTextPaintInfo &rInf ) ...@@ -533,7 +533,7 @@ SwTextPaintInfo::SwTextPaintInfo( const SwTextPaintInfo &rInf )
SwTextPaintInfo::SwTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint ) SwTextPaintInfo::SwTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint )
{ {
CtorInitTextPaintInfo( pFrame, rPaint ); CtorInitTextPaintInfo( pFrame->getRootFrm()->GetCurrShell()->GetOut(), pFrame, rPaint );
} }
extern Color aGlobalRetoucheColor; extern Color aGlobalRetoucheColor;
...@@ -1354,7 +1354,7 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen ) ...@@ -1354,7 +1354,7 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen )
void SwTextFormatInfo::CtorInitTextFormatInfo( SwTextFrm *pNewFrm, const bool bNewInterHyph, void SwTextFormatInfo::CtorInitTextFormatInfo( SwTextFrm *pNewFrm, const bool bNewInterHyph,
const bool bNewQuick, const bool bTst ) const bool bNewQuick, const bool bTst )
{ {
CtorInitTextPaintInfo( pNewFrm, SwRect() ); CtorInitTextPaintInfo( pNewFrm->getRootFrm()->GetCurrShell()->GetOut(), pNewFrm, SwRect() );
bQuick = bNewQuick; bQuick = bNewQuick;
bInterHyph = bNewInterHyph; bInterHyph = bNewInterHyph;
......
...@@ -403,7 +403,7 @@ public: ...@@ -403,7 +403,7 @@ public:
SwTextPaintInfo( const SwTextPaintInfo &rInf ); SwTextPaintInfo( const SwTextPaintInfo &rInf );
SwTextPaintInfo( const SwTextPaintInfo &rInf, const OUString* pText ); SwTextPaintInfo( const SwTextPaintInfo &rInf, const OUString* pText );
void CtorInitTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint ); void CtorInitTextPaintInfo( OutputDevice* pRenderContext, SwTextFrm *pFrame, const SwRect &rPaint );
void SetBack( const SvxBrushItem *pItem, void SetBack( const SvxBrushItem *pItem,
const SwRect &rRect ) { pBrushItem = pItem; aItemRect = rRect;} const SwRect &rRect ) { pBrushItem = pItem; aItemRect = rRect;}
......
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