diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-20 09:00:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-22 10:28:40 +0200 |
| commit | 24724aad8e24d0ef3006934a0de3f4b3f9bcd884 (patch) | |
| tree | 0e92b6b358ddbd10b12e0e7a66bb88d78ae1bccd /sw | |
| parent | 2d1c78e5335dee23f2ace23c7a90b56be201cd3d (diff) | |
convert GRFMGR_DRAW_ constants to scoped enum
Change-Id: Ie0b4cc1d2cfa740d0e260db52db635c3fe6b90b6
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/ndgrf.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index daa18f604cb5..2ec771555ef3 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -131,7 +131,7 @@ public: void SetGraphic(const Graphic& rGraphic, const OUString& rLink); /// wrappers for non-const calls at GraphicObject - void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } + void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } virtual Size GetTwipSize() const SAL_OVERRIDE; diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 483936614192..fc799f0f67de 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -935,7 +935,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons pGrfNd->StartGraphicAnimation(pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), sal_IntPtr(this), - 0, GRFMGR_DRAW_STANDARD, pVout ); + 0, GraphicManagerDrawFlags::STANDARD, pVout ); } else { diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 292730f1d91f..64713bdacd82 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2119,7 +2119,7 @@ void DrawGraphic( aAlignedPaintRect.SVRect(), aGrf.SSize(), Size( aPaintOffset.X(), aPaintOffset.Y() ), - NULL, GRFMGR_DRAW_STANDARD, + NULL, GraphicManagerDrawFlags::STANDARD, ::std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); } // reset clipping at output device |