diff options
Diffstat (limited to 'vcl')
42 files changed, 117 insertions, 117 deletions
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 28d3fc0df71b..925dfa8c00b0 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -111,7 +111,7 @@ void SalData::ensureThreadAutoreleasePool() } else { - DBG_ERROR( "no autorelease key" ); + OSL_FAIL( "no autorelease key" ); } } @@ -135,7 +135,7 @@ void SalData::drainThreadAutoreleasePool() } else { - DBG_ERROR( "no autorelease key" ); + OSL_FAIL( "no autorelease key" ); } } diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 570ba4ff3747..da5b92b7ff7f 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -246,7 +246,7 @@ BOOL ImplSVMainHook( int * pnInit ) } else { - DBG_ERROR( "NSApplication initialization could not be done" ); + OSL_FAIL( "NSApplication initialization could not be done" ); } return TRUE; // indicate that ImplSVMainHook is implemented @@ -667,7 +667,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; default: - DBG_ERROR( "unhandled NSApplicationDefined event" ); + OSL_FAIL( "unhandled NSApplicationDefined event" ); break; }; } diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index 3a37f6d32d39..2a531f243de2 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -265,7 +265,7 @@ bool AquaSalBitmap::AllocateUserData() case 24: mnBytesPerRow = (mnWidth << 1) + mnWidth; break; case 32: mnBytesPerRow = mnWidth << 2; break; default: - DBG_ERROR("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!"); + OSL_FAIL("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!"); } } @@ -276,7 +276,7 @@ bool AquaSalBitmap::AllocateUserData() } catch( const std::bad_alloc& ) { - DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" ); + OSL_FAIL( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" ); maUserBuffer.reset( NULL ); mnBytesPerRow = 0; } diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 7b8e41584a30..cd32820f258c 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -443,17 +443,17 @@ void AquaSalGraphics::initResolution( NSWindow* pWin ) } else { - DBG_ERROR( "no resolution found in device description" ); + OSL_FAIL( "no resolution found in device description" ); } } else { - DBG_ERROR( "no device description" ); + OSL_FAIL( "no device description" ); } } else { - DBG_ERROR( "no screen found" ); + OSL_FAIL( "no screen found" ); } // #i107076# maintaining size-WYSIWYG-ness causes many problems for @@ -1269,7 +1269,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor ) { - DBG_ERROR("not implemented for color masking!"); + OSL_FAIL("not implemented for color masking!"); drawBitmap( pPosAry, rSalBitmap ); } @@ -2416,7 +2416,7 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti else if( pFontData->IsEmbeddable() ) { // get individual character widths - DBG_ERROR("not implemented for non-subsettable fonts!\n"); + OSL_FAIL("not implemented for non-subsettable fonts!\n"); } } diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index de7cbcbf4d5e..3d6eba93a59b 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -152,7 +152,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const mpGraphics->SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 ); } else - DBG_ERROR( "no print info in SetupPrinterGraphics" ); + OSL_FAIL( "no print info in SetupPrinterGraphics" ); } } @@ -775,7 +775,7 @@ BOOL AquaSalPrinter::StartJob( const XubString* i_pFileName, bool i_bDirect, ImplJobSetup* i_pSetupData ) { - DBG_ERROR( "should never be called" ); + OSL_FAIL( "should never be called" ); return FALSE; } diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index e280a583b3d5..ca99a2ca6a2d 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -848,7 +848,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const pCursor = GetSalData()->getCursor( mePointerStyle ); if( pCursor == nil ) { - DBG_ERROR( "unmapped cursor" ); + OSL_FAIL( "unmapped cursor" ); pCursor = [NSCursor arrowCursor]; } break; diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index df1de50d8709..a124201480b5 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -554,7 +554,7 @@ void AquaSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) maItems.insert( maItems.begin() + nPos, pAquaSalMenuItem ); else { - DBG_ERROR( "invalid item index in insert" ); + OSL_FAIL( "invalid item index in insert" ); return; } @@ -577,7 +577,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos ) } else { - DBG_ERROR( "invalid item index in remove" ); + OSL_FAIL( "invalid item index in remove" ); return; } @@ -800,7 +800,7 @@ void AquaSalMenu::statusLayout() if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is [(OOStatusItemView*)pView layout]; else - DBG_ERROR( "someone stole our status view" ); + OSL_FAIL( "someone stole our status view" ); } } diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index 7659ed1a0640..97271b6ecd5f 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -308,7 +308,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); + OSL_FAIL( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); } } } @@ -319,7 +319,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked in the main thread" ); + OSL_FAIL( "SolarMutex not locked in the main thread" ); } } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index ec8101d74315..46a32b699650 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1581,7 +1581,7 @@ Window* Application::GetDefDialogParent() // check for corrupted window hierarchy, #122232#, may be we now crash somewhere else if( !pWin->mpWindowImpl ) { - DBG_ERROR( "Window hierarchy corrupted!" ); + OSL_FAIL( "Window hierarchy corrupted!" ); pSVData->maWinData.mpFocusWin = NULL; // avoid further access return NULL; } diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 7749aa8ba0de..d83c11e4f270 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -319,7 +319,7 @@ void Timer::Start() } else if( !mpTimerData->mpSVTimer ) // TODO: remove when guilty found { - DBG_ERROR( "Timer::Start() on a destroyed Timer!" ); + OSL_FAIL( "Timer::Start() on a destroyed Timer!" ); } else { diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index fd6f24c90bfb..962ad4553a29 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2901,7 +2901,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize } else { - DBG_ERROR( "RadioButton::Draw() - not implemented for RadioButton with Image" ); + OSL_FAIL( "RadioButton::Draw() - not implemented for RadioButton with Image" ); } } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 1f0f7af61a92..4fffe2f277ca 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1212,7 +1212,7 @@ static FieldUnit ImplMap2FieldUnit( MapUnit meUnit, long& nDecDigits ) case MAP_TWIP : return FUNIT_TWIP; default: - DBG_ERROR( "default eInUnit" ); + OSL_FAIL( "default eInUnit" ); break; } return FUNIT_NONE; @@ -1326,7 +1326,7 @@ double MetricField::ConvertDoubleValue( double nValue, USHORT nDigits, eInUnit == MAP_APPFONT || eInUnit == MAP_RELATIVE ) { - DBG_ERROR( "invalid parameters" ); + OSL_FAIL( "invalid parameters" ); return nValue; } @@ -1383,7 +1383,7 @@ double MetricField::ConvertDoubleValue( double nValue, USHORT nDigits, eOutUnit == MAP_APPFONT || eOutUnit == MAP_RELATIVE ) { - DBG_ERROR( "invalid parameters" ); + OSL_FAIL( "invalid parameters" ); return nValue; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index a01be7411c18..bd6eec0029e8 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1298,7 +1298,7 @@ static BOOL ImplDateGetValue( const XubString& rStr, Date& rDate, ExtDateFieldFo default: { - DBG_ERROR( "DateFormat???" ); + OSL_FAIL( "DateFormat???" ); } } } @@ -1434,7 +1434,7 @@ XubString DateFormatter::ImplGetDateAsText( const Date& rDate, break; default: { - DBG_ERROR( "DateFormat???" ); + OSL_FAIL( "DateFormat???" ); } } @@ -1607,7 +1607,7 @@ void DateField::ImplDateSpinArea( BOOL bUp ) } break; default: - DBG_ERROR( "invalid conversion" ); + OSL_FAIL( "invalid conversion" ); break; } } @@ -3300,7 +3300,7 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) SetFormat( TIMEF_SEC ); } break; - default: DBG_ERROR( "ExtTimeFieldFormat unknown!" ); + default: OSL_FAIL( "ExtTimeFieldFormat unknown!" ); } if ( GetField() && GetField()->GetText().Len() ) diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index b492033d078e..889d46efe373 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -116,7 +116,7 @@ bool FontSubsetInfo::CreateFontSubset( case NO_FONT: // fall trough default: - DBG_ERROR( "unhandled type in CreateFontSubset()"); + OSL_FAIL( "unhandled type in CreateFontSubset()"); break; } diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index a1f902ed9365..8d13cdb41a0f 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -221,7 +221,7 @@ const BitmapPalette& Bitmap::GetGreyPalette( int nEntries ) } else { - DBG_ERROR( "Bitmap::GetGreyPalette: invalid entry count (2/4/16/256 allowed)" ); + OSL_FAIL( "Bitmap::GetGreyPalette: invalid entry count (2/4/16/256 allowed)" ); return aGreyPalette2; } } diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 82b9c81ba97e..f246ecd31058 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -354,7 +354,7 @@ BOOL Bitmap::Convert( BmpConversion eConversion ) break; default: - DBG_ERROR( "Bitmap::Convert(): Unsupported conversion" ); + OSL_FAIL( "Bitmap::Convert(): Unsupported conversion" ); break; } @@ -1841,7 +1841,7 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount ) nBitCount = 8; else { - DBG_ERROR( "Bitmap::ImplReduceMedian(): invalid color count!" ); + OSL_FAIL( "Bitmap::ImplReduceMedian(): invalid color count!" ); nBitCount = 8; nColCount = 256; } diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 1f18b9375ea9..4411b5def4ce 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -98,7 +98,7 @@ BOOL Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons break; default: - DBG_ERROR( "Bitmap::Convert(): Unsupported filter" ); + OSL_FAIL( "Bitmap::Convert(): Unsupported filter" ); break; } diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 51b27501ddc6..e3a1eb37fa98 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -250,7 +250,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits() default: { - DBG_ERROR( "BitmapWriteAccess::ZeroInitUnusedBits: Unsupported pixel format"); + OSL_FAIL( "BitmapWriteAccess::ZeroInitUnusedBits: Unsupported pixel format"); nBits = 0; bMsb = true; } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 59757228be9e..df6dcd58545f 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -943,7 +943,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) } #ifdef DBG_UTIL else - DBG_ERROR("More than one DX array element missing on SVM import"); + OSL_FAIL("More than one DX array element missing on SVM import"); #endif } } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 371571578dad..f476fa8e8452 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1627,7 +1627,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) case( META_TEXTRECT_ACTION ): case( META_MOVECLIPREGION_ACTION ): { - DBG_ERROR( "GDIMetaFile::Rotate(): unsupported action" ); + OSL_FAIL( "GDIMetaFile::Rotate(): unsupported action" ); } break; @@ -2331,7 +2331,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol case( META_BMPEX_ACTION ): case( META_MASK_ACTION ): { - DBG_ERROR( "Don't use bitmap actions of this type in metafiles!" ); + OSL_FAIL( "Don't use bitmap actions of this type in metafiles!" ); } break; diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 3edf63925c9e..08533663c562 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -52,7 +52,7 @@ static ::rtl::OString polyToString( const Polygon& rPoly ) break; default: - DBG_ERROR( "SvtGraphicStroke::polyToString invalid flag"); + OSL_FAIL( "SvtGraphicStroke::polyToString invalid flag"); break; } aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getX() ) ); @@ -227,7 +227,7 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing cap type"); + OSL_FAIL( "SvtGraphicStroke::toString missing cap type"); break; } aStr += " join: "; @@ -250,7 +250,7 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing join type"); + OSL_FAIL( "SvtGraphicStroke::toString missing join type"); break; } aStr += " "; @@ -515,7 +515,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicFill::toString missing fill rule"); + OSL_FAIL( "SvtGraphicFill::toString missing fill rule"); break; } aStr += " type: "; @@ -538,7 +538,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing fill type"); + OSL_FAIL( "SvtGraphicStroke::toString missing fill type"); break; } @@ -564,7 +564,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing hatch type"); + OSL_FAIL( "SvtGraphicStroke::toString missing hatch type"); break; } @@ -587,7 +587,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing gradient type"); + OSL_FAIL( "SvtGraphicStroke::toString missing gradient type"); break; } @@ -618,7 +618,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing graphic type"); + OSL_FAIL( "SvtGraphicStroke::toString missing graphic type"); break; } diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index be9e3fd74307..d33f58d3ef14 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -279,7 +279,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } break; default: - DBG_ERROR( "unhandled MapUnit" ); + OSL_FAIL( "unhandled MapUnit" ); break; } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 97b6ae716de8..6afa91f16c73 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2427,7 +2427,7 @@ void PDFWriterImpl::endPage() // sanity check if( m_aOutputStreams.begin() != m_aOutputStreams.end() ) { - DBG_ERROR( "redirection across pages !!!" ); + OSL_FAIL( "redirection across pages !!!" ); m_aOutputStreams.clear(); // leak ! m_aMapMode.SetOrigin( Point() ); } @@ -2678,7 +2678,7 @@ OString PDFWriterImpl::emitStructureAttributes( PDFStructureElement& i_rEle ) } else { - DBG_ERROR( "unresolved link id for Link structure" ); + OSL_FAIL( "unresolved link id for Link structure" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "unresolved link id %" SAL_PRIdINT32 " for Link structure\n", nLink ); { @@ -2779,7 +2779,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) emitStructure( rChild ); else { - DBG_ERROR( "PDFWriterImpl::emitStructure: invalid child structure element" ); + OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure element" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::emitStructure: invalid child structure elemnt with id %" SAL_PRIdINT32 "\n", *it ); #endif @@ -2788,7 +2788,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) } else { - DBG_ERROR( "PDFWriterImpl::emitStructure: invalid child structure id" ); + OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure id" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::emitStructure: invalid child structure id %" SAL_PRIdINT32 "\n", *it ); #endif @@ -3120,7 +3120,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontDa } else { - DBG_ERROR( "system font neither embeddable nor subsettable" ); + OSL_FAIL( "system font neither embeddable nor subsettable" ); } // write font descriptor @@ -3956,7 +3956,7 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const ImplFontData* pFont, FontSubs case FontSubsetInfo::ANY_TYPE1: break; default: - DBG_ERROR( "unknown fonttype in PDF font descriptor" ); + OSL_FAIL( "unknown fonttype in PDF font descriptor" ); return 0; } aLine.append( ' ' ); @@ -4031,7 +4031,7 @@ bool PDFWriterImpl::emitFonts() nGlyphs++; else { - DBG_ERROR( "too many glyphs for subset" ); + OSL_FAIL( "too many glyphs for subset" ); } } FontSubsetInfo aSubsetInfo; @@ -4092,7 +4092,7 @@ bool PDFWriterImpl::emitFonts() else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::CFF_FONT) != 0 ) { // TODO: implement - DBG_ERROR( "PDFWriterImpl does not support CFF-font subsets yet!" ); + OSL_FAIL( "PDFWriterImpl does not support CFF-font subsets yet!" ); } else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::TYPE1_PFB) != 0 ) // TODO: also support PFA? { @@ -11010,11 +11010,11 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, DBG_ASSERT( 0, "Structure element inserted to StructTreeRoot that is not a document" ); } else { - DBG_ERROR( "document structure in disorder !" ); + OSL_FAIL( "document structure in disorder !" ); } } else { - DBG_ERROR( "PDF document structure MUST be contained in a Document element" ); + OSL_FAIL( "PDF document structure MUST be contained in a Document element" ); } } @@ -11132,7 +11132,7 @@ void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle ) addInternalStructureContainer( rChild );//examine the child else { - DBG_ERROR( "PDFWriterImpl::addInternalStructureContainer: invalid child structure element" ); + OSL_FAIL( "PDFWriterImpl::addInternalStructureContainer: invalid child structure element" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::addInternalStructureContainer: invalid child structure elemnt with id %" SAL_PRIdINT32 "\n", *it ); #endif @@ -11141,7 +11141,7 @@ void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle ) } else { - DBG_ERROR( "PDFWriterImpl::emitStructure: invalid child structure id" ); + OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure id" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::addInternalStructureContainer: invalid child structure id %" SAL_PRIdINT32 "\n", *it ); #endif diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index b5f9e08daa81..c8be71b70a45 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -202,7 +202,7 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, case META_TRANSPARENT_ACTION: default: - DBG_ERROR("Printer::GetPreparedMetafile impossible state reached"); + OSL_FAIL("Printer::GetPreparedMetafile impossible state reached"); break; } @@ -267,7 +267,7 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, aBmp )); break; default: - DBG_ERROR("Unexpected case"); + OSL_FAIL("Unexpected case"); break; } } @@ -605,7 +605,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic break; case META_TEXTLINE_ACTION: - DBG_ERROR("META_TEXTLINE_ACTION not supported"); + OSL_FAIL("META_TEXTLINE_ACTION not supported"); break; default: diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index ed58a5d90ade..a00795e2e2ce 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -656,7 +656,7 @@ BOOL ImplRegion::InsertPoint( const Point &rPoint, long nLineID, mpLastCheckedBand = mpLastCheckedBand->mpNextBand; } - DBG_ERROR( "ImplRegion::InsertPoint reached the end of the list!" ); + OSL_FAIL( "ImplRegion::InsertPoint reached the end of the list!" ); } else { @@ -673,10 +673,10 @@ BOOL ImplRegion::InsertPoint( const Point &rPoint, long nLineID, mpLastCheckedBand = mpLastCheckedBand->mpPrevBand; } - DBG_ERROR( "ImplRegion::InsertPoint reached the beginning of the list!" ); + OSL_FAIL( "ImplRegion::InsertPoint reached the beginning of the list!" ); } - DBG_ERROR( "ImplRegion::InsertPoint point not inserted!" ); + OSL_FAIL( "ImplRegion::InsertPoint point not inserted!" ); // reinitialize pointer (should never be reached!) mpLastCheckedBand = mpFirstBand; @@ -889,7 +889,7 @@ void ImplRegion::Union( long nLeft, long nTop, long nRight, long nBottom ) { if ( (pBand->mnYTop < nCurY) || (pBand->mnYBottom < nCurY) ) { - DBG_ERROR( "ImplRegion::Union() - Bands not sorted!" ); + OSL_FAIL( "ImplRegion::Union() - Bands not sorted!" ); } pBand = pBand->mpNextBand; } @@ -926,7 +926,7 @@ void ImplRegion::Exclude( long nLeft, long nTop, long nRight, long nBottom ) { if ( (pBand->mnYTop < nCurY) || (pBand->mnYBottom < nCurY) ) { - DBG_ERROR( "ImplRegion::Exclude() - Bands not sorted!" ); + OSL_FAIL( "ImplRegion::Exclude() - Bands not sorted!" ); } pBand = pBand->mpNextBand; } @@ -963,7 +963,7 @@ void ImplRegion::XOr( long nLeft, long nTop, long nRight, long nBottom ) { if ( (pBand->mnYTop < nCurY) || (pBand->mnYBottom < nCurY) ) { - DBG_ERROR( "ImplRegion::XOr() - Bands not sorted!" ); + OSL_FAIL( "ImplRegion::XOr() - Bands not sorted!" ); } pBand = pBand->mpNextBand; } @@ -1054,12 +1054,12 @@ BOOL ImplRegion::OptimizeBandList() "Exiting ImplRegion::OptimizeBandList(): empty band in region!" ); if ( pBand->mnYBottom < pBand->mnYTop ) - DBG_ERROR( "ImplRegion::OptimizeBandList(): YBottomBoundary < YTopBoundary" ); + OSL_FAIL( "ImplRegion::OptimizeBandList(): YBottomBoundary < YTopBoundary" ); if ( pBand->mpNextBand ) { if ( pBand->mnYBottom >= pBand->mpNextBand->mnYTop ) - DBG_ERROR( "ImplRegion::OptimizeBandList(): overlapping bands in region!" ); + OSL_FAIL( "ImplRegion::OptimizeBandList(): overlapping bands in region!" ); } pBand = pBand->mpNextBand; @@ -2477,7 +2477,7 @@ SvStream& operator>>( SvStream& rIStrm, Region& rRegion ) if( rIStrm.IsEof() ) { - DBG_ERROR( "premature end of region stream" ); + OSL_FAIL( "premature end of region stream" ); delete rRegion.mpImplRegion; rRegion.mpImplRegion = (ImplRegion*)&aImplEmptyRegion; return rIStrm; diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 3f2dcd1f384c..293098496d15 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -326,7 +326,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec // initialize pFncGetPixel to something valid that is // least likely to crash pFncGetPixel = BitmapReadAccess::GetPixelFor_1BIT_MSB_PAL; - DBG_ERROR( "unknown read format" ); + OSL_FAIL( "unknown read format" ); break; } @@ -357,7 +357,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec // least likely to crash pFncSetPixel = BitmapReadAccess::SetPixelFor_1BIT_MSB_PAL; pDstBuffer->mnBitCount = 1; - DBG_ERROR( "unknown write format" ); + OSL_FAIL( "unknown write format" ); break; } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 3e2d839093bc..fc15cc77dcce 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -368,7 +368,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : break; default: - DBG_ERROR( "unsupported bitmap format" ); + OSL_FAIL( "unsupported bitmap format" ); break; } diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index f6b0d2deead0..c78a1eb13f6a 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -263,7 +263,7 @@ void Accelerator::ImplInsertAccel( USHORT nItemId, const KeyCode& rKeyCode, ULONG nCode = rKeyCode.GetFullKeyCode(); if ( !nCode ) { - DBG_ERROR( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not allowed" ); + OSL_FAIL( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not allowed" ); delete pEntry; } else if ( !mpData->maKeyTable.Insert( nCode, pEntry ) ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index d6da6ad37237..b50fd4f17a9a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -722,7 +722,7 @@ short Dialog::Execute() if( ! aParentDelData.IsDelete() ) pDialogParent->ImplRemoveDel( &aParentDelData ); else - DBG_ERROR( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); + OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); } #endif if ( !aDelData.IsDelete() ) @@ -730,7 +730,7 @@ short Dialog::Execute() #ifdef DBG_UTIL else { - DBG_ERROR( "Dialog::Execute() - Dialog destroyed in Execute()" ); + OSL_FAIL( "Dialog::Execute() - Dialog destroyed in Execute()" ); } #endif diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 4b3b0ec72174..4932b689a9c2 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1540,7 +1540,7 @@ void PrintDialog::setupOptionalUI() } else { - DBG_ERROR( "Unsupported UI option" ); + OSL_FAIL( "Unsupported UI option" ); } pCurColumn = pSaveCurColumn; @@ -2169,7 +2169,7 @@ PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const } else { - DBG_ERROR( "changed control not in property map" ); + OSL_FAIL( "changed control not in property map" ); } return pVal; } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a230b17d50e1..d8698966d14e 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1125,7 +1125,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec mbHorz = TRUE; } else { - DBG_ERROR( "ImplLineSizing: Trailing else" ); + OSL_FAIL( "ImplLineSizing: Trailing else" ); nCurSize = 0; mbHorz = FALSE; } diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 8b7296e9a777..da042c00bdfc 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -204,7 +204,7 @@ void GtkSalDisplay::screenSizeChanged( GdkScreen* pScreen ) } else { - DBG_ERROR( "unknown screen changed size" ); + OSL_FAIL( "unknown screen changed size" ); } } } @@ -233,7 +233,7 @@ void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen ) } else { - DBG_ERROR( "monitors for non-default screen changed, extend-me" ); + OSL_FAIL( "monitors for non-default screen changed, extend-me" ); } } } diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 7e7d0e2c6f8c..776e90d8daff 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1142,7 +1142,7 @@ void GtkSalFrame::SetIcon( USHORT nIcon ) aMask = AlphaMask( aIcon.GetMask() ); break; default: - DBG_ERROR( "unhandled transparent type" ); + OSL_FAIL( "unhandled transparent type" ); break; } } diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/unx/headless/svpelement.cxx index 55af58700a85..cc3d4a1b0726 100644 --- a/vcl/unx/headless/svpelement.cxx +++ b/vcl/unx/headless/svpelement.cxx @@ -283,7 +283,7 @@ sal_uInt32 SvpElement::getBitCountFromScanlineFormat( sal_Int32 nFormat ) nBitCount = 32; break; default: - DBG_ERROR( "unsupported basebmp format" ); + OSL_FAIL( "unsupported basebmp format" ); break; } return nBitCount; diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 1c803b58f913..cc2e2c9e20ac 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -372,7 +372,7 @@ BOOL PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pP void PspGraphics::copyBits( const SalTwoRect* /*pPosAry*/, SalGraphics* /*pSSrcGraphics*/ ) { - DBG_ERROR( "Error: PrinterGfx::CopyBits() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyBits() not implemented" ); } void PspGraphics::copyArea ( long /*nDestX*/, long /*nDestY*/, @@ -380,7 +380,7 @@ void PspGraphics::copyArea ( long /*nDestX*/, long /*nDestY*/, long /*nSrcWidth*/, long /*nSrcHeight*/, USHORT /*nFlags*/ ) { - DBG_ERROR( "Error: PrinterGfx::CopyArea() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyArea() not implemented" ); } void PspGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) @@ -402,21 +402,21 @@ void PspGraphics::drawBitmap( const SalTwoRect* /*pPosAry*/, const SalBitmap& /*rSalBitmap*/, const SalBitmap& /*rTransBitmap*/ ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); } void PspGraphics::drawBitmap( const SalTwoRect* /*pPosAry*/, const SalBitmap& /*rSalBitmap*/, SalColor /*nTransparentColor*/ ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent color"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent color"); } void PspGraphics::drawMask( const SalTwoRect* /*pPosAry*/, const SalBitmap& /*rSalBitmap*/, SalColor /*nMaskColor*/ ) { - DBG_ERROR("Error: PrinterGfx::DrawMask() not implemented"); + OSL_FAIL("Error: PrinterGfx::DrawMask() not implemented"); } SalBitmap* PspGraphics::getBitmap( long /*nX*/, long /*nY*/, long /*nDX*/, long /*nDY*/ ) @@ -427,7 +427,7 @@ SalBitmap* PspGraphics::getBitmap( long /*nX*/, long /*nY*/, long /*nDX*/, long SalColor PspGraphics::getPixel( long /*nX*/, long /*nY*/ ) { - DBG_ERROR ("Warning: PrinterGfx::GetPixel() not implemented"); + OSL_FAIL("Warning: PrinterGfx::GetPixel() not implemented"); return 0; } @@ -438,7 +438,7 @@ void PspGraphics::invert( long /*nDY*/, SalInvert /*nFlags*/ ) { - DBG_ERROR ("Warning: PrinterGfx::Invert() not implemented"); + OSL_FAIL("Warning: PrinterGfx::Invert() not implemented"); } //========================================================================== diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index 6a4685165749..07e6497d839a 100644 --- a/vcl/unx/headless/svptext.cxx +++ b/vcl/unx/headless/svptext.cxx @@ -118,7 +118,7 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont, bFound = rServerFont.GetGlyphBitmap8( nGlyphIndex, pGcpHelper->maRawBitmap ); break; default: - DBG_ERROR( "SVP GCP::GetGlyphBmp(): illegal scanline format"); + OSL_FAIL( "SVP GCP::GetGlyphBmp(): illegal scanline format"); // fall back to black&white mask nBmpFormat = Format::ONE_BIT_LSB_GREY; bFound = false; diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index d85b100bcf0e..4bc379846edf 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2190,7 +2190,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle ) break; default: - DBG_ERROR("pointer not implemented"); + OSL_FAIL("pointer not implemented"); aCur = XCreateFontCursor( pDisp_, XC_arrow ); break; } @@ -2802,7 +2802,7 @@ void SalDisplay::deregisterFrame( SalFrame* pFrame ) osl_releaseMutex( hEventGuard_ ); } else { - DBG_ERROR( "SalDisplay::deregisterFrame !acquireMutex\n" ); + OSL_FAIL( "SalDisplay::deregisterFrame !acquireMutex\n" ); } m_aFrames.remove( pFrame ); diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index 6eb3c5216e02..bdccf4a82e01 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -145,7 +145,7 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) : mpFncGetPixel = BitmapReadAccess::GetPixelFor_32BIT_TC_MASK; break; default: - DBG_ERROR("Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap format"); + OSL_FAIL("Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap format"); break; } } @@ -190,7 +190,7 @@ SalPrinterBmp::GetDepth () const default: nDepth = 1; - DBG_ERROR ("Error: unsupported bitmap depth in SalPrinterBmp::GetDepth()"); + OSL_FAIL("Error: unsupported bitmap depth in SalPrinterBmp::GetDepth()"); break; } @@ -448,12 +448,12 @@ BOOL PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pP void PspGraphics::copyBits( const SalTwoRect*, SalGraphics* ) { - DBG_ERROR( "Error: PrinterGfx::CopyBits() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyBits() not implemented" ); } void PspGraphics::copyArea ( long,long,long,long,long,long,USHORT ) { - DBG_ERROR( "Error: PrinterGfx::CopyArea() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyArea() not implemented" ); } void PspGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) @@ -475,21 +475,21 @@ void PspGraphics::drawBitmap( const SalTwoRect*, const SalBitmap&, const SalBitmap& ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); } void PspGraphics::drawBitmap( const SalTwoRect*, const SalBitmap&, SalColor ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent color"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent color"); } void PspGraphics::drawMask( const SalTwoRect*, const SalBitmap &, SalColor ) { - DBG_ERROR("Error: PrinterGfx::DrawMask() not implemented"); + OSL_FAIL("Error: PrinterGfx::DrawMask() not implemented"); } SalBitmap* PspGraphics::getBitmap( long, long, long, long ) @@ -500,13 +500,13 @@ SalBitmap* PspGraphics::getBitmap( long, long, long, long ) SalColor PspGraphics::getPixel( long, long ) { - DBG_ERROR ("Warning: PrinterGfx::GetPixel() not implemented"); + OSL_FAIL("Warning: PrinterGfx::GetPixel() not implemented"); return 0; } void PspGraphics::invert(long,long,long,long,SalInvert) { - DBG_ERROR ("Warning: PrinterGfx::Invert() not implemented"); + OSL_FAIL("Warning: PrinterGfx::Invert() not implemented"); } //========================================================================== @@ -1202,7 +1202,7 @@ FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth) case psp::width::UltraExpanded: return WIDTH_ULTRA_EXPANDED; case psp::width::Unknown: return WIDTH_DONTKNOW; default: - DBG_ERROR( "unknown width mapping" ); + OSL_FAIL( "unknown width mapping" ); break; } return WIDTH_DONTKNOW; @@ -1224,7 +1224,7 @@ FontWeight PspGraphics::ToFontWeight (psp::weight::type eWeight) case psp::weight::Black: return WEIGHT_BLACK; case psp::weight::Unknown: return WEIGHT_DONTKNOW; default: - DBG_ERROR( "unknown weight mapping" ); + OSL_FAIL( "unknown weight mapping" ); break; } return WEIGHT_DONTKNOW; @@ -1238,7 +1238,7 @@ FontPitch PspGraphics::ToFontPitch (psp::pitch::type ePitch) case psp::pitch::Variable: return PITCH_VARIABLE; case psp::pitch::Unknown: return PITCH_DONTKNOW; default: - DBG_ERROR( "unknown pitch mapping" ); + OSL_FAIL( "unknown pitch mapping" ); break; } return PITCH_DONTKNOW; @@ -1253,7 +1253,7 @@ FontItalic PspGraphics::ToFontItalic (psp::italic::type eItalic) case psp::italic::Italic: return ITALIC_NORMAL; case psp::italic::Unknown: return ITALIC_DONTKNOW; default: - DBG_ERROR( "unknown italic mapping" ); + OSL_FAIL( "unknown italic mapping" ); break; } return ITALIC_DONTKNOW; @@ -1271,7 +1271,7 @@ FontFamily PspGraphics::ToFontFamily (psp::family::type eFamily) case psp::family::System: return FAMILY_SYSTEM; case psp::family::Unknown: return FAMILY_DONTKNOW; default: - DBG_ERROR( "unknown family mapping" ); + OSL_FAIL( "unknown family mapping" ); break; } return FAMILY_DONTKNOW; diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx index 30094d46be52..7e8b4abc5905 100644 --- a/vcl/unx/source/gdi/salgdi2.cxx +++ b/vcl/unx/source/gdi/salgdi2.cxx @@ -927,7 +927,7 @@ void X11SalGraphics::drawBitmap( const SalTwoRect*, const SalBitmap&, SalColor ) { - DBG_ERROR( "::DrawBitmap with transparent color not supported" ); + OSL_FAIL( "::DrawBitmap with transparent color not supported" ); } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx index 6e926087f881..14d3a98d69b2 100644 --- a/vcl/unx/source/printergfx/common_gfx.cxx +++ b/vcl/unx/source/printergfx/common_gfx.cxx @@ -566,7 +566,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY } else { - DBG_ERROR( "PrinterGfx::DrawPolyLineBezier: Strange output" ); + OSL_FAIL( "PrinterGfx::DrawPolyLineBezier: Strange output" ); } i+=3; } @@ -612,7 +612,7 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT } else { - DBG_ERROR( "PrinterGfx::DrawPolygonBezier: Strange output" ); + OSL_FAIL( "PrinterGfx::DrawPolygonBezier: Strange output" ); } i+=3; } @@ -676,7 +676,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, } else { - DBG_ERROR( "PrinterGfx::DrawPolyPolygonBezier: Strange output" ); + OSL_FAIL( "PrinterGfx::DrawPolyPolygonBezier: Strange output" ); } j+=3; } @@ -999,7 +999,7 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld, case 4: cCmd |= 0x01; break; case 6: cCmd |= 0x02; break; case 8: cCmd |= 0x03; break; - default: DBG_ERROR ("invalid x precision in binary path"); + default: OSL_FAIL("invalid x precision in binary path"); } switch (nXPrec) { @@ -1007,7 +1007,7 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld, case 4: cCmd |= 0x04; break; case 6: cCmd |= 0x08; break; case 8: cCmd |= 0x0c; break; - default: DBG_ERROR ("invalid y precision in binary path"); + default: OSL_FAIL("invalid y precision in binary path"); } cCmd += 'A'; pPath[0] = cCmd; diff --git a/vcl/unx/source/printergfx/psputil.cxx b/vcl/unx/source/printergfx/psputil.cxx index 3fe106221ad2..9a5de44960e6 100644 --- a/vcl/unx/source/printergfx/psputil.cxx +++ b/vcl/unx/source/printergfx/psputil.cxx @@ -95,7 +95,7 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer) case '5' : pBuffer[0] = 'D'; break; case '6' : pBuffer[0] = 'E'; break; case '7' : pBuffer[0] = 'F'; break; - default: DBG_ERROR("Already a signed value"); + default: OSL_FAIL("Already a signed value"); } } diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d69337bf356d..0ecda3dc2427 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -340,7 +340,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); + OSL_FAIL( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); } } } @@ -351,7 +351,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked in the main thread" ); + OSL_FAIL( "SolarMutex not locked in the main thread" ); } } } |