vcl/source/outdev/bitmap.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 789d3b363f9a0619d14b37a74f37809d05230594 Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Apr 28 11:33:03 2014 +0200 fdo#78030 - Bitmaps are missing allover the UI Original behavior was to call DrawBitmap without the size argument. case IMAGETYPE_BITMAP: { const Bitmap &rBitmap = *static_cast< Bitmap* >( rImage.mpImplData->mpData ); if( nStyle & IMAGE_DRAW_DISABLE ) DrawBitmapEx( rPos, makeDisabledBitmap(rBitmap) ); else DrawBitmap( rPos, rBitmap ); } break; A check of bIsValidSize is needed here, too. This brings the missing bitmaps back. Change-Id: I60582090a7543b3916b15675af1a5ec9ee216270 diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 46d58da..e0841a6 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -1160,7 +1160,10 @@ void OutputDevice::DrawImage( const Point& rPos, const Size& rSize, } else { - DrawBitmap( rPos, rSize, rBitmap ); + if ( bIsSizeValid ) + DrawBitmap( rPos, rSize, rBitmap ); + else + DrawBitmap( rPos, rBitmap ); } } break; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits