diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-06 14:10:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-06 16:32:20 +0000 |
| commit | 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249 (patch) | |
| tree | 41843d922d70b433a0e5647b0fdcdb406fa6be0e /vcl/quartz | |
| parent | fdo#37167 create statement before execute/wasNull/getBoolean (diff) | |
| download | core-9e77ddcd19d328c54ed0fb3ebb83f585b85f0249.tar.gz core-9e77ddcd19d328c54ed0fb3ebb83f585b85f0249.zip | |
Resolves: #i123817# prepare codebase for updating to boost 1.55
(cherry picked from commit c31988351c10e9f3fd783730d95da34efd52c153)
Conflicts:
basic/source/comp/parser.cxx
basic/source/comp/token.cxx
dbaccess/source/ui/dlg/generalpage.cxx
sc/source/ui/unoobj/chart2uno.cxx
vcl/quartz/salbmp.cxx
Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/salbmp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 933bd2b13221..d3246df5d134 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -280,7 +280,7 @@ bool QuartzSalBitmap::AllocateUserData() catch( const std::bad_alloc& ) { OSL_FAIL( "vcl::QuartzSalBitmap::AllocateUserData: bad alloc" ); - maUserBuffer.reset( static_cast<sal_uInt8*>(NULL) ); + maUserBuffer.reset(); mnBytesPerRow = 0; } |