diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-25 16:44:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-26 09:21:41 +0200 |
| commit | 3110255ffd54da6f06b425cfcb4a629959a1cdfd (patch) | |
| tree | 9d015af6e13fa5940e317c3654b89a5e5458c8b9 /sw | |
| parent | 4283aa9cf0090ec5b21073605d3fe98223c649e0 (diff) | |
SwTextPaintInfo::CtorInitTextPaintInfo: use vcl::RenderContext
Change-Id: I1931ec139798d2f2eb956fd0590ab98ce1a65c3c
(cherry picked from commit 0c33e10b594aa07c4e9adadae59e5c03a4fdc29c)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 2ff35186966b..06bdcc0d4265 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -487,9 +487,9 @@ bool SwTextSizeInfo::_HasHint( const SwTextNode* pTextNode, sal_Int32 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 ), aPaintRect = rPaint; nSpaceIdx = 0; @@ -533,7 +533,7 @@ SwTextPaintInfo::SwTextPaintInfo( const SwTextPaintInfo &rInf ) SwTextPaintInfo::SwTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint ) { - CtorInitTextPaintInfo( pFrame, rPaint ); + CtorInitTextPaintInfo( pFrame->getRootFrm()->GetCurrShell()->GetOut(), pFrame, rPaint ); } extern Color aGlobalRetoucheColor; @@ -1354,7 +1354,7 @@ bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen ) void SwTextFormatInfo::CtorInitTextFormatInfo( SwTextFrm *pNewFrm, const bool bNewInterHyph, const bool bNewQuick, const bool bTst ) { - CtorInitTextPaintInfo( pNewFrm, SwRect() ); + CtorInitTextPaintInfo( pNewFrm->getRootFrm()->GetCurrShell()->GetOut(), pNewFrm, SwRect() ); bQuick = bNewQuick; bInterHyph = bNewInterHyph; diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 17ff85946709..0f9ea3e28615 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -403,7 +403,7 @@ public: SwTextPaintInfo( const SwTextPaintInfo &rInf ); 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, const SwRect &rRect ) { pBrushItem = pItem; aItemRect = rRect;} |