diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 14:42:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 18:10:44 +0000 |
| commit | 272a8afa60fe9a6b497c69a58b0054ad5b880690 (patch) | |
| tree | 7ab255dd96cad6ab57b1271559b1d45a1c40baa1 /filter | |
| parent | 29eac0e49e372092cb119898e9f1116ab4e00532 (diff) | |
convert more DBG_ASSERT(false to SAL_WARN
Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55
Reviewed-on: https://gerrit.libreoffice.org/26195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter1.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 64c234b958bf..2097bcbc94df 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -794,7 +794,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali #ifdef DBG_UTIL if(compress2(pCompressed.get(), &compressed_size, pImageData, raw_size, Z_BEST_COMPRESSION) != Z_OK) { - DBG_ASSERT( false, "compress2 failed!" ); ((void)0); + SAL_WARN( "filter", "compress2 failed!" ); ((void)0); } #else compress2(pCompressed.get(), &compressed_size, pImageData, raw_size, Z_BEST_COMPRESSION); @@ -812,7 +812,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali #ifdef DBG_UTIL if(compress2(pAlphaCompressed.get(), &alpha_compressed_size, pAlphaData, width * height, Z_BEST_COMPRESSION) != Z_OK) { - DBG_ASSERT( false, "compress2 failed!" ); ((void)0); + SAL_WARN( "filter", "compress2 failed!" ); ((void)0); } #else compress2(pAlphaCompressed.get(), &alpha_compressed_size, pAlphaData, width * height, Z_BEST_COMPRESSION); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f33c088543b6..2cb1cc563b49 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -20,6 +20,7 @@ #include <osl/endian.h> #include <vcl/svapp.hxx> #include <unotools/tempfile.hxx> +#include <tools/diagnose_ex.h> #include <math.h> #include <editeng/eeitem.hxx> #include <editeng/editdata.hxx> @@ -7408,7 +7409,7 @@ void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nR } catch( const Exception& ) { - DBG_ASSERT( false, "exception caught!" ); + DBG_UNHANDLED_EXCEPTION(); } } |