diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-21 22:00:31 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-22 02:30:36 +1000 |
| commit | f749ffbdf4c007f1a42bcafc9c2723c47bac22d1 (patch) | |
| tree | 7d6db09d2190265462206ff4416101994822750f /include | |
| parent | 0d6bc7001d3f4ff9e5118b5425b9f2f8583507ed (diff) | |
Move DrawImage function location in outdev.hxx
... also slightly changed the overload documentation for DrawBitmapEx
and DrawBitmap functions.
Furthermore, DrawImage() should never be called from a Printer
instance, so warn and abort.
Change-Id: I0de65a5d7bd8249fcd14d844faf74477d490cef5
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 72 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 4 |
2 files changed, 59 insertions, 17 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 34c675378674..5b4cb6d1565f 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1022,16 +1022,28 @@ public: */ ///@{ - /** @overload void DrawBitmap(const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, - const Size& rSecSizePixel, const Bitmap& rBitmap, - sal_uLong nAction = META_BMPSCALEPART_ACTION) */ + /** @overload + void DrawBitmap( + const Point& rDestPt, + const Size& rDestSize, + const Point& rSrcPtPixel, + const Size& rSecSizePixel, + const Bitmap& rBitmap, + sal_uLong nAction = META_BMPSCALEPART_ACTION) + */ void DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ); - /** @overload void DrawBitmap(const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, - const Size& rSecSizePixel, const Bitmap& rBitmap, - sal_uLong nAction = META_BMPSCALEPART_ACTION) */ + /** @overload + void DrawBitmap( + const Point& rDestPt, + const Size& rDestSize, + const Point& rSrcPtPixel, + const Size& rSecSizePixel, + const Bitmap& rBitmap, + sal_uLong nAction = META_BMPSCALEPART_ACTION) + */ void DrawBitmap( const Point& rDestPt, const Size& rDestSize, @@ -1045,16 +1057,29 @@ public: const Bitmap& rBitmap, sal_uLong nAction = META_BMPSCALEPART_ACTION ); - /** @overload void DrawBitmapEx(const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, - const Size& rSecSizePixel, const BitmapEx& rBitmapEx, - sal_uLong nAction = META_BMPEXSCALEPART_ACTION) */ + /** @overload + void DrawBitmapEx( + const Point& rDestPt, + const Size& rDestSize, + const Point& rSrcPtPixel, + const Size& rSecSizePixel, + const BitmapEx& rBitmapEx, + sal_uLong nAction = META_BMPEXSCALEPART_ACTION) + */ void DrawBitmapEx( const Point& rDestPt, const BitmapEx& rBitmapEx ); - /** @overload void DrawBitmapEx(const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, - const Size& rSecSizePixel, const BitmapEx& rBitmapEx, - sal_uLong nAction = META_BMPEXSCALEPART_ACTION) */ + + /** @overload + void DrawBitmapEx( + const Point& rDestPt, + const Size& rDestSize, + const Point& rSrcPtPixel, + const Size& rSecSizePixel, + const BitmapEx& rBitmapEx, + sal_uLong nAction = META_BMPEXSCALEPART_ACTION) + */ void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, @@ -1068,6 +1093,24 @@ public: const BitmapEx& rBitmapEx, sal_uLong nAction = META_BMPEXSCALEPART_ACTION ); + /** @overload + virtual void DrawImage( + const Point& rPos, + const Size& rSize, + const Image& rImage, + sal_uInt16 nStyle = 0) + */ + virtual void DrawImage( + const Point& rPos, + const Image& rImage, + sal_uInt16 nStyle = 0 ); + + virtual void DrawImage( + const Point& rPos, + const Size& rSize, + const Image& rImage, + sal_uInt16 nStyle = 0 ); + protected: /** Draw BitmapEx transformed @@ -1198,11 +1241,6 @@ public: const Bitmap& rBitmap, const Color& rMaskColor, sal_uLong nAction ); - virtual void DrawImage( const Point& rPos, - const Image& rImage, sal_uInt16 nStyle = 0 ); - virtual void DrawImage( const Point& rPos, const Size& rSize, - const Image& rImage, sal_uInt16 nStyle = 0 ); - #ifdef _MSC_VER void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); void AddHatchActions( const PolyPolygon& rPolyPoly, diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 1eb2a45a0357..c29f8458113c 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -413,6 +413,10 @@ public: const Point& rSrcPt, const Size& rSrcSize, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; + virtual void DrawImage( const Point&, const Image&, sal_uInt16 ) SAL_OVERRIDE; + virtual void DrawImage( const Point&, const Size&, + const Image&, sal_uInt16 ) SAL_OVERRIDE; + // implementation detail of PrintJob being asynchronous // not exported, not usable outside vcl |