diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 14:42:51 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:08 -0400 |
commit | e873661f6c20389d50ee2d4661b00d111e46f3e5 (patch) | |
tree | 724646bac031fa8984ff3f3a6a02a0ab6756045b /vcl | |
parent | d48ceabd7aef42580d70c680ac863f497b146cca (diff) |
convert more DBG_ASSERT(false to SAL_WARN
Reviewed-on: https://gerrit.libreoffice.org/26195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 272a8afa60fe9a6b497c69a58b0054ad5b880690)
Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/virdev.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dlgctrl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index e667cb23ec41..6e736434083f 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -8225,7 +8225,7 @@ void PDFWriterImpl::sortWidgets() } else { - DBG_ASSERT( false, "wrong number of sorted annotations" ); + SAL_WARN( "vcl", "wrong number of sorted annotations" ); #if OSL_DEBUG_LEVEL > 0 fprintf( stderr, "PDFWriterImpl::sortWidgets(): wrong number of sorted assertions on page nr %ld\n" " %ld sorted and %ld unsorted\n", (long int)it->first, (long int)it->second.aSortedAnnots.size(), (long int)nAnnots ); @@ -12528,7 +12528,7 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, if( childType == PDFWriter::Document ) { m_nCurrentStructElement = nNewCurElement; - DBG_ASSERT( false, "Structure element inserted to StructTreeRoot that is not a document" ); + SAL_WARN( "vcl", "Structure element inserted to StructTreeRoot that is not a document" ); } else { OSL_FAIL( "document structure in disorder !" ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index dd9e6b38eee8..017acd1670d8 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -327,21 +327,21 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/ ) { - DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); + SAL_WARN( "vcl", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); } void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/, const OutputDevice& /*rOutDev*/ ) { - DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); + SAL_WARN( "vcl", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); } void Printer::CopyArea( const Point& /*rDestPt*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/, bool /*bWindowInvalidate*/ ) { - DBG_ASSERT( false, "Don't use OutputDevice::CopyArea(...) with printer devices!" ); + SAL_WARN( "vcl", "Don't use OutputDevice::CopyArea(...) with printer devices!" ); } void Printer::SetPrinterOptions( const PrinterOptions& i_rOptions ) diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index af9bbbdddc83..7d788de40720 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -467,7 +467,7 @@ void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode ) { case REFDEV_NONE: default: - DBG_ASSERT( false, "VDev::SetRefDev illegal argument!" ); + SAL_WARN( "vcl", "VDev::SetRefDev illegal argument!" ); break; case REFDEV_MODE06: nDPIX = nDPIY = 600; diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 3895ae2f4b50..2dbda7fdfb32 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -368,7 +368,7 @@ vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow, if ( nIteration >= 2 ) { // this is an unexpected scenario - DBG_ASSERT( false, "It seems to be an endless loop!" ); + SAL_WARN( "vcl", "It seems to be an endless loop!" ); rFormStart = 0; break; } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index bf1a68a1dc72..89593b5c9eb1 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1018,7 +1018,7 @@ void Menu::ShowItem( sal_uInt16 nItemId, bool bVisible ) vcl::Window* pWin = ImplGetWindow(); if ( pWin && pWin->IsVisible() ) { - DBG_ASSERT( false, "Menu::ShowItem - ignored for visible popups!" ); + SAL_WARN( "vcl", "Menu::ShowItem - ignored for visible popups!" ); return; } pData->bVisible = bVisible; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 71c175b52dfc..1d3eff4a033b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1714,7 +1714,7 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) } else { - DBG_ASSERT( false, "missing a checkbox" ); + SAL_WARN( "vcl", "missing a checkbox" ); } } else if( pValue->Value >>= nVal ) |