diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 08:53:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 10:45:27 +0000 |
| commit | 58ba105a0328a932ff3dd86b043a909d01dacf5d (patch) | |
| tree | 35d2e72bad7bc10cbc6ba7cfdc69023767c94521 /sfx2 | |
| parent | coverity#737807 Uncaught exception (diff) | |
| download | core-58ba105a0328a932ff3dd86b043a909d01dacf5d.tar.gz core-58ba105a0328a932ff3dd86b043a909d01dacf5d.zip | |
callcatcher: update unused code
Change-Id: Ia8e6abffb85b92ee4538fb0aeaee4e4aa18f2772
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/graphhelp.cxx | 55 | ||||
| -rw-r--r-- | sfx2/source/doc/graphhelp.hxx | 4 |
2 files changed, 0 insertions, 59 deletions
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 6a6597d9197d..60329d0740aa 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -206,61 +206,6 @@ sal_Bool GraphicHelper::supportsMetaFileHandle_Impl() // static -sal_Bool GraphicHelper::mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay, - const Rectangle& rOverlayRect, BitmapEx& rReturn ) -{ - // the implementation is provided by KA - - Point aNullPt; - Rectangle aBmpRect( aNullPt, rBmpEx.GetSizePixel() ); - VirtualDevice aVDev; - - if( !rReturn.IsEmpty() ) - rReturn.SetEmpty(); - - if( !rBmpEx.IsEmpty() && aVDev.SetOutputSizePixel( aBmpRect.GetSize() ) ) - { - Rectangle aOverlayRect( rOverlayRect ); - - aOverlayRect.Intersection( aBmpRect ); - - if( rOverlay.IsEmpty() || rOverlayRect.IsEmpty() ) - rReturn = rBmpEx; - else - { - aVDev.DrawBitmap( aNullPt, aVDev.GetOutputSizePixel(), rBmpEx.GetBitmap() ); - aVDev.DrawBitmapEx( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), rOverlay ); - - Bitmap aBmp( aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) ); - aBmp.Convert( BMP_CONVERSION_24BIT ); - - if( !rBmpEx.IsTransparent() ) - rReturn = aBmp; - else - { - aVDev.DrawBitmap( aNullPt, aVDev.GetOutputSizePixel(), rBmpEx.GetMask() ); - Bitmap aOverlayMergeBmp( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ) ); - - if( rOverlay.IsTransparent() ) - aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), rOverlay.GetMask() ); - else - { - aVDev.SetLineColor( COL_BLACK ); - aVDev.SetFillColor( COL_BLACK ); - aVDev.DrawRect( aOverlayRect); - } - - aOverlayMergeBmp.CombineSimple( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ), BMP_COMBINE_AND ); - aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), aOverlayMergeBmp ); - rReturn = BitmapEx( aBmp, aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) ); - } - } - } - - return !rReturn.IsEmpty(); -} - -// static sal_Bool GraphicHelper::getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, const uno::Reference< io::XStream >& xStream ) { diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index 8acec37a19a9..f9beeded2030 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -30,10 +30,6 @@ class BitmapEx; class GraphicHelper { - - static sal_Bool mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay, - const Rectangle& rOverlayRect, BitmapEx& rReturn ); - public: static SvMemoryStream* getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, sal_uInt32 nFormat ); |