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 /toolkit | |
| parent | 01329972d89ddfd30d197b7947c571fdb83b0cf8 (diff) | |
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 'toolkit')
| -rw-r--r-- | toolkit/source/helper/formpdfexport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 2ad6900cfc8e..8fc3b9695806 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -257,7 +257,7 @@ namespace toolkitform void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl, ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(()) { - _rpDescriptor.reset( NULL ); + _rpDescriptor.reset(); OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" ); if ( !_rxControl.is() ) return; |