vcl/inc/vcl/alpha.hxx | 2 +- vcl/inc/vcl/bitmap.hxx | 2 +- vcl/source/gdi/gfxlink.cxx | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit cbcdf190e86ed2874d8d5703ef4666f4074e7c7a Author: Andre Fischer <[email protected]> Date: Wed Jun 13 08:03:08 2012 +0000 Resolves: #i119965# Fixed saving slides where temporary files... of background images were deleted outside the office. Patch by: Steve Yin Review by: Andre Fischer (cherry picked from commit 2809da479a141ad2c5c90624edf411ac2ec04597) Change-Id: I30318ef05408eb397cb26a0d433d265de90a6e74 diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index effa86c..04fc666 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -375,6 +375,11 @@ sal_uInt8* ImpSwap::GetData() const pData = new sal_uInt8[ mnDataSize ]; pIStm->Read( pData, mnDataSize ); sal_Bool bError = ( ERRCODE_NONE != pIStm->GetError() ); + sal_Size nActReadSize = pIStm->Tell(); + if (nActReadSize != mnDataSize) + { + bError = sal_True; + } delete pIStm; if( bError ) commit d859e54534994d2e6f0c62e7711fa674406f8e22 Author: Herbert Dürr <[email protected]> Date: Wed Jan 16 11:31:37 2013 +0000 AlphaMask derives from Bitmap so their destructors should be virtual (cherry picked from commit 846a7425314d1782bae3b517d1394a46ff980256) Conflicts: vcl/inc/vcl/alpha.hxx vcl/inc/vcl/bitmap.hxx Change-Id: I8bf83e2edde33f9aee50a7feffe18bcb5c352dd4 diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx index ddad314..95bb0ea 100644 --- a/vcl/inc/vcl/alpha.hxx +++ b/vcl/inc/vcl/alpha.hxx @@ -47,7 +47,7 @@ public: AlphaMask( const Bitmap& rBitmap ); AlphaMask( const AlphaMask& rAlphaMask ); AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL ); - ~AlphaMask(); + virtual ~AlphaMask(); AlphaMask& operator=( const Bitmap& rBitmap ); AlphaMask& operator=( const AlphaMask& rAlphaMask ) diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 7753083..c0ec5b1 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -379,7 +379,7 @@ public: Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL ); Bitmap( const ResId& rResId ); Bitmap( SalBitmap* pSalBitmap ); - ~Bitmap(); + virtual ~Bitmap(); Bitmap& operator=( const Bitmap& rBitmap ); inline sal_Bool operator!() const;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
