[Libreoffice-commits] .: basic/source connectivity/source desktop/source drawinglayer/source editeng/source formula/source fpicker/source framework/source idl/source linguistic/source linguistic/workben sfx2/source svx/source svx/workben ucb/workben xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Mar 2 06:05:12 PST 2011
basic/source/app/app.cxx | 2
basic/source/app/appwin.cxx | 8 -
basic/source/app/dialogs.cxx | 2
basic/source/app/msgedit.cxx | 10 -
basic/source/app/textedit.cxx | 4
basic/source/basmgr/basicmanagerrepository.cxx | 2
basic/source/basmgr/basmgr.cxx | 2
basic/source/classes/sb.cxx | 6
basic/source/classes/sbunoobj.cxx | 4
basic/source/comp/codegen.cxx | 2
basic/source/comp/symtbl.cxx | 2
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/runtime.cxx | 2
basic/source/sbx/sbxvalue.cxx | 2
basic/source/uno/namecont.cxx | 2
connectivity/source/drivers/file/fcomp.cxx | 6
desktop/source/app/appinit.cxx | 4
drawinglayer/source/processor2d/helperchartrenderer.cxx | 2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2
editeng/source/editeng/editdbg.cxx | 2
editeng/source/editeng/editdoc.cxx | 12 -
editeng/source/editeng/editdoc2.cxx | 4
editeng/source/editeng/editobj.cxx | 74 ++++++------
editeng/source/editeng/editundo.cxx | 4
editeng/source/editeng/editview.cxx | 4
editeng/source/editeng/edtspell.cxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit2.cxx | 6
editeng/source/editeng/impedit3.cxx | 6
editeng/source/editeng/impedit4.cxx | 4
editeng/source/editeng/textconv.cxx | 6
editeng/source/items/flditem.cxx | 12 -
editeng/source/items/frmitems.cxx | 52 ++++----
editeng/source/items/itemtype.cxx | 4
editeng/source/items/paraitem.cxx | 8 -
editeng/source/items/textitem.cxx | 4
editeng/source/items/writingmodeitem.cxx | 4
editeng/source/misc/hangulhanja.cxx | 18 +-
editeng/source/misc/svxacorr.cxx | 4
editeng/source/misc/unolingu.cxx | 4
editeng/source/outliner/outliner.cxx | 2
editeng/source/outliner/outlundo.cxx | 6
editeng/source/outliner/outlvw.cxx | 2
editeng/source/outliner/paralist.cxx | 2
editeng/source/uno/unoedhlp.cxx | 2
editeng/source/uno/unoedprx.cxx | 8 -
editeng/source/uno/unoedsrc.cxx | 2
editeng/source/uno/unofored.cxx | 2
editeng/source/uno/unoforou.cxx | 10 -
editeng/source/uno/unoipset.cxx | 12 -
editeng/source/xml/xmltxtexp.cxx | 6
editeng/source/xml/xmltxtimp.cxx | 8 -
formula/source/core/api/FormulaCompiler.cxx | 2
formula/source/core/api/token.cxx | 2
formula/source/ui/dlg/formula.cxx | 4
fpicker/source/office/OfficeControlAccess.cxx | 4
fpicker/source/office/asyncfilepicker.cxx | 4
fpicker/source/office/commonpicker.cxx | 2
fpicker/source/office/fpsmartcontent.cxx | 2
fpicker/source/office/iodlg.cxx | 6
framework/source/classes/addonsoptions.cxx | 2
idl/source/objects/basobj.cxx | 6
idl/source/objects/bastype.cxx | 2
idl/source/objects/object.cxx | 14 +-
idl/source/objects/slot.cxx | 4
idl/source/objects/types.cxx | 6
linguistic/source/convdiclist.cxx | 2
linguistic/source/gciterator.cxx | 2
linguistic/workben/sprophelp.cxx | 4
linguistic/workben/sspellimp.cxx | 2
sfx2/source/appl/appbas.cxx | 2
sfx2/source/appl/appbaslib.cxx | 2
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appchild.cxx | 2
sfx2/source/appl/appmisc.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/childwin.cxx | 4
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/module.cxx | 4
sfx2/source/appl/newhelp.cxx | 14 +-
sfx2/source/appl/workwin.cxx | 14 +-
sfx2/source/bastyp/fltfnc.cxx | 4
sfx2/source/config/evntconf.cxx | 6
sfx2/source/control/bindings.cxx | 12 -
sfx2/source/control/macrconf.cxx | 4
sfx2/source/control/msg.cxx | 2
sfx2/source/control/msgpool.cxx | 2
sfx2/source/control/objface.cxx | 6
sfx2/source/control/request.cxx | 4
sfx2/source/control/shell.cxx | 2
sfx2/source/control/sorgitm.cxx | 4
sfx2/source/control/unoctitm.cxx | 2
sfx2/source/dialog/basedlgs.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 6
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 18 +-
sfx2/source/dialog/filtergrouping.cxx | 2
sfx2/source/dialog/partwnd.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 8 -
sfx2/source/dialog/tplcitem.cxx | 2
sfx2/source/doc/docfile.cxx | 20 +--
sfx2/source/doc/docinsert.cxx | 4
sfx2/source/doc/docvor.cxx | 4
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/objmisc.cxx | 4
sfx2/source/doc/objserv.cxx | 2
sfx2/source/doc/objstor.cxx | 14 +-
sfx2/source/doc/printhelper.cxx | 8 -
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/notify/eventsupplier.cxx | 4
sfx2/source/view/frmload.cxx | 2
sfx2/source/view/sfxbasecontroller.cxx | 2
sfx2/source/view/viewfrm.cxx | 4
sfx2/source/view/viewfrm2.cxx | 4
sfx2/source/view/viewprn.cxx | 2
sfx2/source/view/viewsh.cxx | 4
svx/source/accessibility/AccessibleTextHelper.cxx | 8 -
svx/source/dialog/SpellDialogChildWindow.cxx | 6
svx/source/dialog/dlgutil.cxx | 2
svx/source/dialog/docrecovery.cxx | 2
svx/source/dialog/grfflt.cxx | 2
svx/source/dialog/imapdlg.cxx | 2
svx/source/dialog/rlrcitem.cxx | 2
svx/source/dialog/rubydialog.cxx | 4
svx/source/dialog/rulritem.cxx | 20 +--
svx/source/dialog/srchdlg.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 6
svx/source/dialog/svxruler.cxx | 2
svx/source/engine3d/float3d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 20 +--
svx/source/fmcomp/gridcell.cxx | 10 -
svx/source/fmcomp/gridctrl.cxx | 12 -
svx/source/form/ParseContext.cxx | 2
svx/source/form/datanavi.cxx | 4
svx/source/form/fmPropBrw.cxx | 4
svx/source/form/fmexch.cxx | 2
svx/source/form/fmitems.cxx | 4
svx/source/form/fmobj.cxx | 8 -
svx/source/form/fmobjfac.cxx | 2
svx/source/form/fmshell.cxx | 2
svx/source/form/fmshimp.cxx | 18 +-
svx/source/form/fmsrcimp.cxx | 6
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/fmtools.cxx | 8 -
svx/source/form/fmundo.cxx | 2
svx/source/form/fmvwimp.cxx | 12 -
svx/source/form/formcontrolfactory.cxx | 4
svx/source/form/formcontroller.cxx | 12 -
svx/source/form/navigatortree.cxx | 4
svx/source/form/navigatortreemodel.cxx | 4
svx/source/form/tabwin.cxx | 2
svx/source/gallery2/galbrws2.cxx | 2
svx/source/gallery2/galmisc.cxx | 4
svx/source/gallery2/galtheme.cxx | 2
svx/source/inc/fmshimp.hxx | 2
svx/source/items/algitem.cxx | 4
svx/source/items/numfmtsh.cxx | 6
svx/source/items/pageitem.cxx | 2
svx/source/items/rotmodit.cxx | 2
svx/source/items/viewlayoutitem.cxx | 4
svx/source/items/zoomitem.cxx | 4
svx/source/items/zoomslideritem.cxx | 4
svx/source/sdr/contact/viewcontact.cxx | 4
svx/source/stbctrls/selctrl.cxx | 2
svx/source/svdraw/svdattr.cxx | 6
svx/source/svdraw/svddrgmt.cxx | 10 -
svx/source/svdraw/svddrgv.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 2
svx/source/svdraw/svdedtv2.cxx | 4
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdetc.cxx | 6
svx/source/svdraw/svdhdl.cxx | 2
svx/source/svdraw/svdmodel.cxx | 24 +--
svx/source/svdraw/svdmrkv1.cxx | 4
svx/source/svdraw/svdoashp.cxx | 4
svx/source/svdraw/svdobj.cxx | 10 -
svx/source/svdraw/svdocapt.cxx | 2
svx/source/svdraw/svdoedge.cxx | 2
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdomeas.cxx | 4
svx/source/svdraw/svdoole2.cxx | 6
svx/source/svdraw/svdopath.cxx | 14 +-
svx/source/svdraw/svdotext.cxx | 4
svx/source/svdraw/svdpage.cxx | 8 -
svx/source/svdraw/svdundo.cxx | 8 -
svx/source/svdraw/svdview.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 10 -
svx/source/table/accessibletableshape.cxx | 4
svx/source/table/cell.cxx | 16 +-
svx/source/table/cellcursor.cxx | 6
svx/source/table/svdotable.cxx | 18 +-
svx/source/table/tablecontroller.cxx | 12 -
svx/source/table/tablelayouter.cxx | 22 +--
svx/source/table/tablemodel.cxx | 14 +-
svx/source/table/tablertfexporter.cxx | 4
svx/source/table/tablertfimporter.cxx | 2
svx/source/tbxctrls/fillctrl.cxx | 2
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/linectrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
svx/source/tbxctrls/tbxcolorupdate.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/unopage.cxx | 4
svx/source/unodraw/unoprov.cxx | 8 -
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap4.cxx | 4
svx/source/unodraw/unoshape.cxx | 16 +-
svx/source/xml/xmleohlp.cxx | 2
svx/source/xml/xmlexport.cxx | 6
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xml/xmlxtexp.cxx | 10 -
svx/source/xml/xmlxtimp.cxx | 16 +-
svx/source/xoutdev/xattr.cxx | 8 -
svx/source/xoutdev/xattr2.cxx | 2
svx/workben/msview/msview.cxx | 8 -
ucb/workben/ucb/ucbdemo.cxx | 6
xmloff/source/chart/SchXMLChartContext.cxx | 24 +--
xmloff/source/chart/SchXMLExport.cxx | 12 -
xmloff/source/chart/SchXMLImport.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 30 ++--
xmloff/source/chart/SchXMLTools.cxx | 8 -
xmloff/source/core/DocumentSettingsContext.cxx | 12 -
xmloff/source/core/DomExport.cxx | 2
xmloff/source/core/ProgressBarHelper.cxx | 2
xmloff/source/core/SettingsExportHelper.cxx | 4
xmloff/source/core/xmlcnitm.cxx | 2
xmloff/source/core/xmlehelp.cxx | 2
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 4
xmloff/source/core/xmltoken.cxx | 2
xmloff/source/core/xmluconv.cxx | 4
xmloff/source/draw/animationexport.cxx | 34 ++---
xmloff/source/draw/animationimport.cxx | 10 -
xmloff/source/draw/animexp.cxx | 6
xmloff/source/draw/animimp.cxx | 4
xmloff/source/draw/eventimp.cxx | 2
xmloff/source/draw/layerexp.cxx | 2
xmloff/source/draw/layerimp.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 12 -
xmloff/source/draw/sdxmlimp.cxx | 2
xmloff/source/draw/shapeexport.cxx | 20 +--
xmloff/source/draw/shapeexport2.cxx | 4
xmloff/source/draw/shapeexport4.cxx | 6
xmloff/source/draw/shapeimport.cxx | 2
xmloff/source/draw/xexptran.cxx | 20 +--
xmloff/source/draw/ximppage.cxx | 8 -
xmloff/source/draw/ximpshap.cxx | 24 +--
xmloff/source/draw/ximpstyl.cxx | 6
xmloff/source/meta/MetaExportComponent.cxx | 2
xmloff/source/meta/xmlmetae.cxx | 2
xmloff/source/script/XMLEventExport.cxx | 2
xmloff/source/style/EnumPropertyHdl.cxx | 2
xmloff/source/style/XMLConstantsPropertyHandler.cxx | 4
xmloff/source/style/XMLIsPercentagePropertyHandler.cxx | 2
xmloff/source/style/numehelp.cxx | 12 -
xmloff/source/style/xmlaustp.cxx | 6
xmloff/source/style/xmlnumfe.cxx | 6
xmloff/source/style/xmlnumfi.cxx | 6
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/style/xmlstyle.cxx | 2
xmloff/source/style/xmltabe.cxx | 2
xmloff/source/table/XMLTableExport.cxx | 16 +-
xmloff/source/table/XMLTableImport.cxx | 16 +-
xmloff/source/text/XMLRedlineExport.cxx | 6
xmloff/source/text/XMLTextMarkImportContext.cxx | 4
xmloff/source/text/txtflde.cxx | 24 +--
xmloff/source/text/txtfldi.cxx | 14 +-
xmloff/source/text/txtparae.cxx | 2
xmloff/source/text/txtparai.cxx | 6
xmloff/source/text/txtvfldi.cxx | 6
xmloff/source/xforms/SchemaRestrictionContext.cxx | 4
xmloff/source/xforms/SchemaSimpleTypeContext.cxx | 2
xmloff/source/xforms/XFormsBindContext.cxx | 4
xmloff/source/xforms/XFormsInstanceContext.cxx | 4
xmloff/source/xforms/XFormsModelContext.cxx | 4
xmloff/source/xforms/XFormsSubmissionContext.cxx | 4
xmloff/source/xforms/xformsapi.cxx | 2
xmloff/source/xforms/xformsexport.cxx | 4
279 files changed, 850 insertions(+), 850 deletions(-)
New commits:
commit b469b6676d7ff6da185ecba38bee685ab38dd73e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 19:07:44 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 8b00002..dba6299 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -239,7 +239,7 @@ int BasicApp::Main( )
DBG_INSTOUTERROR( DBG_OUT_TESTTOOL );
if ( osl_setDebugMessageFunc( osl_TestToolDebugMessageFilter ) )
- DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer");
+ OSL_FAIL("osl_setDebugMessageFunc returns non NULL pointer");
#endif
ResMgr::SetReadStringHook( ReplaceStringHookProc );
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index 1f0bf79..b47d7fb 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -390,7 +390,7 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat )
// uncomment to avoid compiler warning
// break;
default:
- DBG_ERROR("Not Implemented in AppWin::DiskFileChanged");
+ OSL_FAIL("Not Implemented in AppWin::DiskFileChanged");
}
return TRUE;
}
@@ -415,7 +415,7 @@ void AppWin::UpdateFileInfo( USHORT nWhat )
}
break;
default:
- DBG_ERROR("Not Implemented in AppWin::UpdateFileInfo");
+ OSL_FAIL("Not Implemented in AppWin::UpdateFileInfo");
}
}
@@ -590,7 +590,7 @@ USHORT AppWin::QuerySave( QueryBits nBits )
nReturn = SAVE_RES_CANCEL;
break;
default:
- DBG_ERROR("switch default where no default should be: Internal error");
+ OSL_FAIL("switch default where no default should be: Internal error");
nReturn = SAVE_RES_CANCEL;
}
SkipReload( FALSE );
@@ -619,7 +619,7 @@ BOOL AppWin::Close()
// uncomment to avoid compiler warning
// break;
default:
- DBG_ERROR("Not Implemented in AppWin::Close");
+ OSL_FAIL("Not Implemented in AppWin::Close");
return FALSE;
}
}
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index cf459af..d7d800f 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -301,7 +301,7 @@ IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl )
case RID_TP_FON:
pNewTabPage = new FontOptions( pTabCtrl, aConfig );
break;
- default: DBG_ERROR( "PageHdl: Unbekannte ID!" );
+ default: OSL_FAIL( "PageHdl: Unbekannte ID!" );
}
DBG_ASSERT( pNewTabPage, "Keine Page!" );
pTabCtrl->SetTabPage( nId, pNewTabPage );
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index edd4714..e8b6996 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -167,7 +167,7 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
case LOG_ASSERTION: AddAssertion( aUILogMsg, LogMsg->aDebugData ); break;
case LOG_ASSERTION_STACK: AddAssertionStack( aUILogMsg, LogMsg->aDebugData ); break;
case LOG_QA_ERROR: AddQAError( aUILogMsg, LogMsg->aDebugData ); break;
- default:DBG_ERROR("Unbekannter Typ in ResultFile. Speichern des ResultFile resultiert in Informationsverlust");
+ default:OSL_FAIL("Unbekannter Typ in ResultFile. Speichern des ResultFile resultiert in Informationsverlust");
}
if ( !bFileLoading )
@@ -486,7 +486,7 @@ String MsgEdit::Impl_MakeText( SvLBoxEntry *pEntry ) const
case LOG_ASSERTION: break;
case LOG_ASSERTION_STACK:aRet.AppendAscii("--> "); break;
case LOG_QA_ERROR: break;
- default:DBG_ERROR("Unknown type in ResultWindow!");
+ default:OSL_FAIL("Unknown type in ResultWindow!");
}
aRet += aEditTree.GetEntryText( pEntry );
return aRet;
@@ -584,7 +584,7 @@ void MsgEdit::ReplaceSelected( const String& rStr )
{
(void) rStr; /* avoid warning about unused parameter */
Sound::Beep();
- DBG_ERROR("Not Implemented");
+ OSL_FAIL("Not Implemented");
}
BOOL MsgEdit::IsModified(){ return bModified; }
@@ -608,7 +608,7 @@ void MsgEdit::SetText( const String& rStr )
{
(void) rStr; /* avoid warning about unused parameter */
Sound::Beep();
- DBG_ERROR("Not Implemented");
+ OSL_FAIL("Not Implemented");
}
BOOL MsgEdit::HasText() const
@@ -916,7 +916,7 @@ TTFeatures TTTreeListBox::GetFeatures( SvLBoxEntry* pEntry )
case LOG_QA_ERROR:
return HasQAError;
default:
- DBG_ERROR("Unknown type in ResultWindow");
+ OSL_FAIL("Unknown type in ResultWindow");
}
return HasNothing;
}
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 3d4d9ed..729e3c2 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -201,7 +201,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
if ( rLast.nStart > rLast.nEnd ) // Only up to the bug of MD repaired
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ERROR( "MD-Bug is not repaired!" );
+ OSL_FAIL( "MD-Bug is not repaired!" );
#endif
nCount--;
aPortionList.Remove( nCount);
@@ -324,7 +324,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
default:
{
aColor = Color( RGB_COLORDATA( 0xff, 0x80, 0x80 ) );
- DBG_ERROR( "Unknown syntax color" );
+ OSL_FAIL( "Unknown syntax color" );
}
}
pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 );
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index ff2d64f..7c0cb01 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -348,7 +348,7 @@ namespace basic
if ( pos != m_aCreationListeners.end() )
m_aCreationListeners.erase( pos );
else {
- DBG_ERROR( "ImplRepository::revokeCreationListener: listener is not registered!" );
+ OSL_FAIL( "ImplRepository::revokeCreationListener: listener is not registered!" );
}
}
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 2fb2088..63a0708 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1460,7 +1460,7 @@ void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
// cause modified
if( !bModified && bReference )
{
- DBG_ERROR( "Per Reference eingebundene Basic-Library ist nicht compiliert!" );
+ OSL_FAIL( "Per Reference eingebundene Basic-Library ist nicht compiliert!" );
pLib->SetModified( FALSE );
}
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0fb6f0f..193cbfa 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -501,7 +501,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbMethod* pImplMethod = pIfaceMethod->getImplMethod();
if( !pImplMethod )
{
- DBG_ERROR( "No ImplMethod" );
+ OSL_FAIL( "No ImplMethod" );
continue;
}
@@ -511,7 +511,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbMethod* pImplMethodCopy = p ? PTR_CAST(SbMethod,p) : NULL;
if( !pImplMethodCopy )
{
- DBG_ERROR( "Found no ImplMethod copy" );
+ OSL_FAIL( "Found no ImplMethod copy" );
continue;
}
SbIfaceMapperMethod* pNewIfaceMethod =
@@ -975,7 +975,7 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
if( rParentItem.m_bProcessing )
{
// TODO: raise error?
- DBG_ERROR( "Cyclic module dependency detected" );
+ OSL_FAIL( "Cyclic module dependency detected" );
continue;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 256af0a..9dffcf2 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1743,7 +1743,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
Reference<XIdlClass> xClass = TypeToIdlClass( rType );
if( !xClass.is() )
{
- DBG_ERROR("failed to get XIdlClass for type");
+ OSL_FAIL("failed to get XIdlClass for type");
break;
}
::rtl::OUString sClassName = xClass->getName();
@@ -1839,7 +1839,7 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
else if( xClassProvider.is() )
{
- DBG_ERROR( "XClassProvider not supported in UNO3" );
+ OSL_FAIL( "XClassProvider not supported in UNO3" );
}
}
return aRet;
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 8663a7f..acd909e 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -237,7 +237,7 @@ void SbiCodeGen::Save()
ePropType = SbxOBJECT;
break;
case PROPERTY_MODE_NONE:
- DBG_ERROR( "Illegal PropertyMode PROPERTY_MODE_NONE" );
+ OSL_FAIL( "Illegal PropertyMode PROPERTY_MODE_NONE" );
break;
}
String aPropName = pProc->GetPropName();
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 1bfab6d..c49ec9f 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -500,7 +500,7 @@ void SbiProcDef::setPropertyMode( PropertyMode ePropMode )
case PROPERTY_MODE_LET: aCompleteProcName.AppendAscii( "Let " ); break;
case PROPERTY_MODE_SET: aCompleteProcName.AppendAscii( "Set " ); break;
case PROPERTY_MODE_NONE:
- DBG_ERROR( "Illegal PropertyMode PROPERTY_MODE_NONE" );
+ OSL_FAIL( "Illegal PropertyMode PROPERTY_MODE_NONE" );
break;
}
aCompleteProcName += aName;
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 59c0787..e94c9a6 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -625,7 +625,7 @@ void UCBStream::SetSize( ULONG nSize )
{
(void)nSize;
- DBG_ERROR( "not allowed to call from basic" );
+ OSL_FAIL( "not allowed to call from basic" );
SetError( ERRCODE_IO_GENERAL );
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index e8a2328..2cb8b5d 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -324,7 +324,7 @@ SbiInstance::~SbiInstance()
}
catch( const Exception& )
{
- DBG_ERROR( "SbiInstance::~SbiInstance: caught an exception while disposing the components!" );
+ OSL_FAIL( "SbiInstance::~SbiInstance: caught an exception while disposing the components!" );
}
ComponentVector.clear();
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 4662fb1..df4c109 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -624,7 +624,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
{
if ( p != this )
{
- DBG_ERROR( "TheRealValue" );
+ OSL_FAIL( "TheRealValue" );
}
HACK(nicht bei Parent-Prop - sonst CyclicRef)
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index a8182c0..ad65778 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1163,7 +1163,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
// #i93163
if( bCleanUp )
{
- DBG_ERROR( "Upgrade of Basic installation failed somehow" );
+ OSL_FAIL( "Upgrade of Basic installation failed somehow" );
static char strErrorSavFolderName[] = "__basic_80_err";
INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj );
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 1e42123..739804b 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -175,7 +175,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
m_aCodeList.push_back(new OOp_AND());
else
{
- DBG_ERROR("OPredicateCompiler: Fehler im Parse Tree");
+ OSL_FAIL("OPredicateCompiler: Fehler im Parse Tree");
}
}
else if (SQL_ISRULE(pPredicateNode,boolean_factor))
@@ -211,7 +211,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
m_aCodeList.push_back(new OOp_SUB());
else
{
- DBG_ERROR("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
+ OSL_FAIL("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
}
}
else if(SQL_ISRULE(pPredicateNode,term))
@@ -226,7 +226,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
m_aCodeList.push_back(new OOp_DIV());
else
{
- DBG_ERROR("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
+ OSL_FAIL("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
}
}
else
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 8ee67d1..39967e9 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -103,7 +103,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
xServiceFactory( comphelper::getProcessServiceFactory() );
if (!xServiceFactory.is())
{
- DBG_ERROR("configureUcb(): No XMultiServiceFactory");
+ OSL_FAIL("configureUcb(): No XMultiServiceFactory");
return false;
}
@@ -277,7 +277,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
pCmdLine->GetPortalConnectString( aPortalConnect );
if ( !configureUcb( bServer, aPortalConnect ) )
{
- DBG_ERROR( "Can't configure UCB" );
+ OSL_FAIL( "Can't configure UCB" );
throw com::sun::star::uno::Exception(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegisterServices, configureUcb")), NULL);
}
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx
index e77255f..a3a2476 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx
@@ -145,7 +145,7 @@ namespace drawinglayer
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR( "Chart cannot be painted pretty!" );
+ OSL_FAIL( "Chart cannot be painted pretty!" );
}
return bChartRendered;
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 13b3aed..5f541c6 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1863,7 +1863,7 @@ namespace accessibility
}
catch( const uno::Exception& )
{
- DBG_ERROR("AccessibleEditableTextPara::setAttributes exception in setPropertyValue");
+ OSL_FAIL("AccessibleEditableTextPara::setAttributes exception in setPropertyValue");
}
++pPropArray;
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index eb66683..f56b148 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -329,7 +329,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
#endif
if ( fp == 0 )
{
- DBG_ERROR( "Log file could not be created!" );
+ OSL_FAIL( "Log file could not be created!" );
return;
}
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 3dfef5a..e8078d7 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -402,7 +402,7 @@ EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, US
break;
default:
{
- DBG_ERROR( "Invalid Attribute!" );
+ OSL_FAIL( "Invalid Attribute!" );
}
}
return pNew;
@@ -828,7 +828,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
DBG_ASSERT( ( pAttrib->GetEnd() <= Len() ), "Expand: Attribute larger than paragraph!" );
if ( pAttrib->IsEmpty() )
{
- DBG_ERROR( "Empty Attribute after ExpandAttribs?" );
+ OSL_FAIL( "Empty Attribute after ExpandAttribs?" );
bResort = TRUE;
aCharAttribList.GetAttribs().Remove( nAttr );
rItemPool.Remove( *pAttrib->GetItem() );
@@ -1379,7 +1379,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
nLen += nNodes * nSepSize;
if ( nLen > 0xFFFb / sizeof(xub_Unicode) )
{
- DBG_ERROR( "Text to large for String" );
+ OSL_FAIL( "Text to large for String" );
return XubString();
}
xub_Unicode* pStr = new xub_Unicode[nLen+1];
@@ -1442,7 +1442,7 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT
case EE_FEATURE_FIELD: if ( bResolveFields )
aStr += ((EditCharAttribField*)pNextFeature)->GetFieldValue();
break;
- default: DBG_ERROR( "What feature?" );
+ default: OSL_FAIL( "What feature?" );
}
pNextFeature = pNode->GetCharAttribs().FindFeature( ++nEnd );
}
@@ -2185,12 +2185,12 @@ BOOL CharAttribList::DbgCheckAttribs()
if ( pAttr->GetStart() > pAttr->GetEnd() )
{
bOK = FALSE;
- DBG_ERROR( "Attribute is distorted" );
+ OSL_FAIL( "Attribute is distorted" );
}
else if ( pAttr->IsFeature() && ( pAttr->GetLen() != 1 ) )
{
bOK = FALSE;
- DBG_ERROR( "Feature, Len != 1" );
+ OSL_FAIL( "Feature, Len != 1" );
}
}
return bOK;
diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 6b3d7e5..6faed93 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -112,7 +112,7 @@ USHORT TextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, BOO
}
}
}
- DBG_ERROR( "FindPortion: Not found!" );
+ OSL_FAIL( "FindPortion: Not found!" );
return ( Count() - 1 );
}
@@ -371,7 +371,7 @@ long ParaPortionList::GetYOffset( ParaPortion* pPPortion )
return nHeight;
nHeight += pTmpPortion->GetHeight();
}
- DBG_ERROR( "GetYOffset: Portion not found" );
+ OSL_FAIL( "GetYOffset: Portion not found" );
return nHeight;
}
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 247b82d..8c3a66c 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -111,14 +111,14 @@ BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, Sv
rBullet.SetStyle( BS_BULLET );
break;
case SVX_NUM_PAGEDESC:
- DBG_ERROR( "Unknown: SVX_NUM_PAGEDESC" );
+ OSL_FAIL( "Unknown: SVX_NUM_PAGEDESC" );
rBullet.SetStyle( BS_BULLET );
break;
case SVX_NUM_BITMAP:
rBullet.SetStyle( BS_BMP );
break;
default:
- DBG_ERROR( "Unknown NumType" );
+ OSL_FAIL( "Unknown NumType" );
}
switch ( pFmt->GetNumAdjust() )
@@ -133,7 +133,7 @@ BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, Sv
rBullet.SetJustification( BJ_VCENTER|BJ_HCENTER );
break;
default:
- DBG_ERROR( "Unknown or invalid NumAdjust" );
+ OSL_FAIL( "Unknown or invalid NumAdjust" );
}
}
return pFmt ? TRUE : FALSE;
@@ -287,172 +287,172 @@ EditTextObject::~EditTextObject()
USHORT EditTextObject::GetParagraphCount() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
XubString EditTextObject::GetText( USHORT /* nParagraph */ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return XubString();
}
void EditTextObject::Insert( const EditTextObject& /* rObj */, USHORT /* nPara */)
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
EditTextObject* EditTextObject::CreateTextObject( USHORT /*nPara*/, USHORT /*nParas*/ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
void EditTextObject::RemoveParagraph( USHORT /*nPara*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
BOOL EditTextObject::HasPortionInfo() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
void EditTextObject::ClearPortionInfo()
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
BOOL EditTextObject::HasOnlineSpellErrors() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
BOOL EditTextObject::HasCharAttribs( USHORT ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
void EditTextObject::GetCharAttribs( USHORT /*nPara*/, EECharAttribArray& /*rLst*/ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
void EditTextObject::MergeParaAttribs( const SfxItemSet& /*rAttribs*/, USHORT /*nStart*/, USHORT /*nEnd*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
BOOL EditTextObject::IsFieldObject() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
const SvxFieldItem* EditTextObject::GetField() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
BOOL EditTextObject::HasField( TypeId /*aType*/ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
SfxItemSet EditTextObject::GetParaAttribs( USHORT /*nPara*/ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return SfxItemSet( *(SfxItemPool*)NULL );
}
void EditTextObject::SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rAttribs*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
BOOL EditTextObject::RemoveCharAttribs( USHORT /*nWhich*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
BOOL EditTextObject::RemoveParaAttribs( USHORT /*nWhich*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
BOOL EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFamily /*eFamily*/ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
void EditTextObject::GetStyleSheet( USHORT /*nPara*/, XubString& /*rName*/, SfxStyleFamily& /*eFamily*/ ) const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
void EditTextObject::SetStyleSheet( USHORT /*nPara*/, const XubString& /*rName*/, const SfxStyleFamily& /*eFamily*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
BOOL EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
const XubString&, SfxStyleFamily )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
void EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
const XubString& /*rOldName*/, const XubString& /*rNewName*/ )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
USHORT EditTextObject::GetUserType() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
void EditTextObject::SetUserType( USHORT )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
ULONG EditTextObject::GetObjectSettings() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
void EditTextObject::SetObjectSettings( ULONG )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
BOOL EditTextObject::IsVertical() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return FALSE;
}
void EditTextObject::SetVertical( BOOL bVertical )
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
((BinTextObject*)this)->SetVertical( bVertical );
}
USHORT EditTextObject::GetScriptType() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return ((const BinTextObject*)this)->GetScriptType();
}
@@ -534,17 +534,17 @@ void EditTextObject::Skip( SvStream& rIStream )
void EditTextObject::StoreData( SvStream& ) const
{
- DBG_ERROR( "StoreData: Base class!" );
+ OSL_FAIL( "StoreData: Base class!" );
}
void EditTextObject::CreateData( SvStream& )
{
- DBG_ERROR( "CreateData: Base class!" );
+ OSL_FAIL( "CreateData: Base class!" );
}
USHORT EditTextObject::GetVersion() const
{
- DBG_ERROR( "Virtual method direct from EditTextObject!" );
+ OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
@@ -1314,7 +1314,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
if ( bOwnerOfCurrent && !bOwnerOfPool )
{
// A global Pool was used, but not handed over to me, but I need it!
- DBG_ERROR( "Give me the global TextObjectPool!" );
+ OSL_FAIL( "Give me the global TextObjectPool!" );
return;
}
else if ( !bOwnerOfCurrent && bOwnerOfPool )
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 550f7cf..6aeea7e 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -85,7 +85,7 @@ BOOL EditUndoManager::Undo( USHORT nCount )
pImpEE->SetActiveView( pImpEE->GetEditViews().GetObject(0) );
else
{
- DBG_ERROR("Undo in engine is not possible without a View! ");
+ OSL_FAIL("Undo in engine is not possible without a View! ");
return FALSE;
}
}
@@ -120,7 +120,7 @@ BOOL EditUndoManager::Redo( USHORT nCount )
pImpEE->SetActiveView( pImpEE->GetEditViews().GetObject(0) );
else
{
- DBG_ERROR( "Redo in Engine ohne View nicht moeglich!" );
+ OSL_FAIL( "Redo in Engine ohne View nicht moeglich!" );
return FALSE;
}
}
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index e3b6892..409e3be 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -808,7 +808,7 @@ sal_Bool EditView::Drop( const DropEvent& )
ESelection EditView::GetDropPos()
{
- DBG_ERROR( "GetDropPos - Why?!" );
+ OSL_FAIL( "GetDropPos - Why?!" );
return ESelection();
}
@@ -1084,7 +1084,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
}
else
{
- DBG_ERROR( "content node is NULL" );
+ OSL_FAIL( "content node is NULL" );
}
nGuessLangWord = lcl_CheckLanguage( xSpellAlt->getWord(), xSpeller, xLangGuesser, sal_False );
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 8e6b249..4863a8d 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -116,7 +116,7 @@ void EditSpellWrapper::SpellStart( SvxSpellArea eArea )
}
else
{
- DBG_ERROR( "SpellStart: Unknown Area!" );
+ OSL_FAIL( "SpellStart: Unknown Area!" );
}
}
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 31637af..827dadf 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1143,7 +1143,7 @@ String ImpEditView::SpellIgnoreOrAddWord( sal_Bool bAdd )
{
if ( bAdd )
{
- DBG_ERROR( "Sorry, AddWord not implemented" );
+ OSL_FAIL( "Sorry, AddWord not implemented" );
}
else // Ignore
{
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 94f0679..cf0114c 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2864,7 +2864,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
{
if ( aEditDoc.Count() >= 0xFFFE )
{
- DBG_ERROR( "Can't process more than 64K paragraphs!" );
+ OSL_FAIL( "Can't process more than 64K paragraphs!" );
return rPaM;
}
@@ -3075,7 +3075,7 @@ Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, USHORT nFlags )
return aEditCursor;
}
}
- DBG_ERROR( "Portion not found!" );
+ OSL_FAIL( "Portion not found!" );
return aEditCursor;
}
@@ -4147,7 +4147,7 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
if( nPos >= pLine->GetCharPosArray().Count() )
{
nPos = pLine->GetCharPosArray().Count()-1;
- DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!");
+ OSL_FAIL("svx::ImpEditEngine::GetXPos(), index out of range!");
}
// old code restored see #i112788 (which leaves #i74188 unfixed again)
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 6b770b9..4a92e56 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1048,7 +1048,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
bCompressedChars = FALSE;
}
break;
- default: DBG_ERROR( "Was fuer ein Feature ?" );
+ default: OSL_FAIL( "Was fuer ein Feature ?" );
}
pNextFeature = pNode->GetCharAttribs().FindFeature( pNextFeature->GetStart() + 1 );
}
@@ -1139,7 +1139,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
}
else
{
- DBG_ERROR( "CreateLines: Tab not handled!" );
+ OSL_FAIL( "CreateLines: Tab not handled!" );
}
long nMaxW = aCurrentTab.nTabPos - aCurrentTab.nStartPosX - nStartX;
if ( nW >= nMaxW )
@@ -1806,7 +1806,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
}
else if ( ( nBreakPos > nMaxBreakPos ) && !aUserOptions.allowPunctuationOutsideMargin )
{
- DBG_ERROR( "I18N: XBreakIterator::getLineBreak returns position > Max" );
+ OSL_FAIL( "I18N: XBreakIterator::getLineBreak returns position > Max" );
nBreakPos = nMaxBreakPos;
}
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 95956d3..e07f783 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -118,7 +118,7 @@ EditPaM ImpEditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFor
aPaM = ReadBin( rInput, aSel );
else
{
- DBG_ERROR( "Read: Unknown Format" );
+ OSL_FAIL( "Read: Unknown Format" );
}
FormatFullDoc(); // perhaps a simple format is enough?
@@ -250,7 +250,7 @@ void ImpEditEngine::Write( SvStream& rOutput, EETextFormat eFormat, EditSelectio
WriteBin( rOutput, aSel );
else
{
- DBG_ERROR( "Write: Unknown Format" );
+ OSL_FAIL( "Write: Unknown Format" );
}
}
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index b139f1a..baf960f 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -234,7 +234,7 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
}
else
{
- DBG_ERROR( "ConvStart_impl: Unknown Area!" );
+ OSL_FAIL( "ConvStart_impl: Unknown Area!" );
}
}
@@ -373,10 +373,10 @@ void TextConvWrapper::ReplaceUnit(
case eOriginalAbove :
case eReplacementBelow :
case eOriginalBelow :
- DBG_ERROR( "Rubies not supported" );
+ OSL_FAIL( "Rubies not supported" );
break;
default:
- DBG_ERROR( "unexpected case" );
+ OSL_FAIL( "unexpected case" );
}
nUnitOffset = sal::static_int_cast< USHORT >(
nUnitOffset + nUnitStart + aNewTxt.getLength());
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 9b7be3c..11d863a 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -276,12 +276,12 @@ String SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberF
{
if ( eFormat == SVXDATEFORMAT_SYSTEM )
{
- DBG_ERROR( "SVXDATEFORMAT_SYSTEM not implemented!" );
+ OSL_FAIL( "SVXDATEFORMAT_SYSTEM not implemented!" );
eFormat = SVXDATEFORMAT_STDSMALL;
}
else if ( eFormat == SVXDATEFORMAT_APPDEFAULT )
{
- DBG_ERROR( "SVXDATEFORMAT_APPDEFAULT: take them from where? ");
+ OSL_FAIL( "SVXDATEFORMAT_APPDEFAULT: take them from where? ");
eFormat = SVXDATEFORMAT_STDSMALL;
}
@@ -423,7 +423,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
eFormat= (SvxURLFormat)nFormat;
// Relative save => make it absolute for loading
- DBG_ERROR("No BaseURL!");
+ OSL_FAIL("No BaseURL!");
// TODO/MBA: no BaseURL
aURL = INetURLObject::GetAbsURL( String(), aTmpURL );
}
@@ -433,7 +433,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
void SvxURLField::Save( SvPersistStream & rStm )
{
// Relative save of the URL
- DBG_ERROR("No BaseURL!");
+ OSL_FAIL("No BaseURL!");
// TODO/MBA: no BaseURL
String aTmpURL = INetURLObject::GetRelURL( String(), aURL );
@@ -662,11 +662,11 @@ String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumb
switch( eFormat )
{
case SVXTIMEFORMAT_SYSTEM :
- DBG_ERROR( "SVXTIMEFORMAT_SYSTEM: not implemented" );
+ OSL_FAIL( "SVXTIMEFORMAT_SYSTEM: not implemented" );
eFormat = SVXTIMEFORMAT_STANDARD;
break;
case SVXTIMEFORMAT_APPDEFAULT :
- DBG_ERROR( "SVXTIMEFORMAT_APPDEFAULT: not implemented" );
+ OSL_FAIL( "SVXTIMEFORMAT_APPDEFAULT: not implemented" );
eFormat = SVXTIMEFORMAT_STANDARD;
break;
default: ;//prevent warning
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 9f3daa2..ccec3fd 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -236,7 +236,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_SIZE_SIZE: rVal <<= aTmp; break;
case MID_SIZE_WIDTH: rVal <<= aTmp.Width; break;
case MID_SIZE_HEIGHT: rVal <<= aTmp.Height; break;
- default: DBG_ERROR("Wrong MemberId!"); return false;
+ default: OSL_FAIL("Wrong MemberId!"); return false;
}
return true;
@@ -285,7 +285,7 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
aSize.Height() = bConvert ? MM100_TO_TWIP(nVal) : nVal;
}
break;
- default: DBG_ERROR("Wrong MemberId!");
+ default: OSL_FAIL("Wrong MemberId!");
return false;
}
return true;
@@ -470,7 +470,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
default:
bRet = false;
- DBG_ERROR("unknown MemberId");
+ OSL_FAIL("unknown MemberId");
}
return bRet;
}
@@ -527,7 +527,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
default:
- DBG_ERROR("unknown MemberId");
+ OSL_FAIL("unknown MemberId");
return false;
}
return true;
@@ -900,7 +900,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
default:
- DBG_ERROR("unknown MemberId");
+ OSL_FAIL("unknown MemberId");
return false;
}
return true;
@@ -1175,7 +1175,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_PROTECT_SIZE : bValue = bSize; break;
case MID_PROTECT_POSITION: bValue = bPos; break;
default:
- DBG_ERROR("Wrong MemberId");
+ OSL_FAIL("Wrong MemberId");
return false;
}
@@ -1193,7 +1193,7 @@ bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case MID_PROTECT_SIZE : bSize = bVal; break;
case MID_PROTECT_POSITION: bPos = bVal; break;
default:
- DBG_ERROR("Wrong MemberId");
+ OSL_FAIL("Wrong MemberId");
return false;
}
return true;
@@ -1318,7 +1318,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_TRANSPARENT: rVal <<= aShadow.IsTransparent; break;
case MID_BG_COLOR: rVal <<= aShadow.Color; break;
case 0: rVal <<= aShadow; break;
- default: DBG_ERROR("Wrong MemberId!"); return false;
+ default: OSL_FAIL("Wrong MemberId!"); return false;
}
return true;
@@ -1351,7 +1351,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case MID_TRANSPARENT: rVal >>= aShadow.IsTransparent; break;
case MID_BG_COLOR: rVal >>= aShadow.Color; break;
case 0: rVal >>= aShadow; break;
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: OSL_FAIL("Wrong MemberId!"); return sal_False;
}
if ( bRet )
@@ -1426,7 +1426,7 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const
break;
default:
- DBG_ERROR( "wrong shadow" );
+ OSL_FAIL( "wrong shadow" );
}
return nSpace;
}
@@ -2427,7 +2427,7 @@ const SvxBorderLine *SvxBoxItem::GetLine( sal_uInt16 nLine ) const
pRet = pRight;
break;
default:
- DBG_ERROR( "wrong line" );
+ OSL_FAIL( "wrong line" );
break;
}
@@ -2459,7 +2459,7 @@ void SvxBoxItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine )
pRight = pTmp;
break;
default:
- DBG_ERROR( "wrong line" );
+ OSL_FAIL( "wrong line" );
}
}
@@ -2499,7 +2499,7 @@ sal_uInt16 SvxBoxItem::GetDistance( sal_uInt16 nLine ) const
nDist = nRightDist;
break;
default:
- DBG_ERROR( "wrong line" );
+ OSL_FAIL( "wrong line" );
}
return nDist;
@@ -2524,7 +2524,7 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew, sal_uInt16 nLine )
nRightDist = nNew;
break;
default:
- DBG_ERROR( "wrong line" );
+ OSL_FAIL( "wrong line" );
}
}
@@ -2553,7 +2553,7 @@ sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine ) c
nDist = nRightDist;
break;
default:
- DBG_ERROR( "wrong line" );
+ OSL_FAIL( "wrong line" );
}
if( pTmp )
@@ -2656,7 +2656,7 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine )
}
else
{
- DBG_ERROR( "wrong line" );
+ OSL_FAIL( "wrong line" );
}
}
@@ -2830,7 +2830,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
bIntMember = sal_True;
rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED(GetDefDist()) : GetDefDist());
break;
- default: DBG_ERROR("Wrong MemberId!"); return false;
+ default: OSL_FAIL("Wrong MemberId!"); return false;
}
if( !bIntMember )
@@ -2977,7 +2977,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
break;
}
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: OSL_FAIL("Wrong MemberId!"); return sal_False;
}
return sal_True;
@@ -3249,7 +3249,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
case MID_INNER_WIDTH: rVal <<= sal_Int32(pLine->GetInWidth( )); break;
case MID_DISTANCE: rVal <<= sal_Int32(pLine->GetDistance()); break;
default:
- DBG_ERROR( "Wrong MemberId" );
+ OSL_FAIL( "Wrong MemberId" );
return false;
}
}
@@ -3290,7 +3290,7 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
case MID_DISTANCE: pLine->SetDistance((USHORT)nVal); break;
case MID_LINE_STYLE: pLine->SetStyle((SvxBorderStyle)nVal); break;
default:
- DBG_ERROR( "Wrong MemberId" );
+ OSL_FAIL( "Wrong MemberId" );
return sal_False;
}
@@ -3604,7 +3604,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
rStream.ReadByteString(aRel);
// TODO/MBA: how can we get a BaseURL here?!
- DBG_ERROR("No BaseURL!");
+ OSL_FAIL("No BaseURL!");
String aAbs = INetURLObject::GetAbsURL( String(), aRel );
DBG_ASSERT( aAbs.Len(), "Invalid URL!" );
pStrLink = new String( aAbs );
@@ -3787,7 +3787,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if( 0 == sLink.compareToAscii( UNO_NAME_GRAPHOBJ_URLPKGPREFIX,
sizeof(UNO_NAME_GRAPHOBJ_URLPKGPREFIX)-1 ) )
{
- DBG_ERROR( "package urls aren't implemented" );
+ OSL_FAIL( "package urls aren't implemented" );
}
else if( 0 == sLink.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX,
sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1 ) )
@@ -3987,7 +3987,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
rStream << pImpl->pGraphicObject->GetGraphic();
if ( pStrLink )
{
- DBG_ERROR("No BaseURL!");
+ OSL_FAIL("No BaseURL!");
// TODO/MBA: how to get a BaseURL?!
String aRel = INetURLObject::GetRelURL( String(), *pStrLink );
// UNICODE: rStream << aRel;
@@ -4109,7 +4109,7 @@ void SvxBrushItem::SetGraphic( const Graphic& rNew )
}
else
{
- DBG_ERROR( "SetGraphic() on linked graphic! :-/" );
+ OSL_FAIL( "SetGraphic() on linked graphic! :-/" );
}
}
@@ -4131,7 +4131,7 @@ void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj )
}
else
{
- DBG_ERROR( "SetGraphic() on linked graphic! :-/" );
+ OSL_FAIL( "SetGraphic() on linked graphic! :-/" );
}
}
@@ -4395,7 +4395,7 @@ bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
nVal = text::WritingMode2::PAGE;
break;
default:
- DBG_ERROR("Unknown SvxFrameDirection value!");
+ OSL_FAIL("Unknown SvxFrameDirection value!");
bRet = false;
break;
}
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 0bc0e39..0d169e4 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -96,7 +96,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
nVal, (MapUnit)eSrcUnit, (MapUnit)eDestUnit ));
default:
- DBG_ERROR( "not supported mapunit" );
+ OSL_FAIL( "not supported mapunit" );
return sRet;
}
@@ -227,7 +227,7 @@ sal_uInt16 GetMetricId( SfxMapUnit eUnit )
break;
default:
- DBG_ERROR( "not supported mapunit" );
+ OSL_FAIL( "not supported mapunit" );
}
return nId;
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 009c49f..57c9f3c 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -184,7 +184,7 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case 0 : rVal <<= aLSp; break;
case MID_LINESPACE : rVal <<= aLSp.Mode; break;
case MID_HEIGHT : rVal <<= aLSp.Height; break;
- default: DBG_ERROR("Wrong MemberId!"); break;
+ default: OSL_FAIL("Wrong MemberId!"); break;
}
return true;
@@ -206,7 +206,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case 0 : bRet = (rVal >>= aLSp); break;
case MID_LINESPACE : bRet = (rVal >>= aLSp.Mode); break;
case MID_HEIGHT : bRet = (rVal >>= aLSp.Height); break;
- default: DBG_ERROR("Wrong MemberId!"); break;
+ default: OSL_FAIL("Wrong MemberId!"); break;
}
if( bRet )
@@ -1347,7 +1347,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
{
case MID_AUTO: rVal <<= (sal_Bool) bAuto; break;
case MID_NAME: rVal <<= ::rtl::OUString( GetValue() ); break;
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: OSL_FAIL("Wrong MemberId!"); return sal_False;
}
return sal_True;
@@ -1362,7 +1362,7 @@ bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMem
{
case MID_AUTO: bRet = ( rVal >>= bAuto ); break;
case MID_NAME: bRet = ( rVal >>= aStr ); if ( bRet ) SetValue(aStr); break;
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: OSL_FAIL("Wrong MemberId!"); return sal_False;
}
return bRet;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e891d92..7943a51 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1386,7 +1386,7 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
{
- DBG_ERROR("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
+ OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
return XubString();
}
@@ -3390,7 +3390,7 @@ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
return true;
}
- DBG_ERROR( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
+ OSL_FAIL( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
return false;
}
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index c1b03e4..0d5c6fe 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -65,13 +65,13 @@ SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
SfxPoolItem* SvxWritingModeItem::Create( SvStream & , USHORT ) const
{
- DBG_ERROR("SvxWritingModeItem should not be streamed!");
+ OSL_FAIL("SvxWritingModeItem should not be streamed!");
return NULL;
}
SvStream& SvxWritingModeItem::Store( SvStream & rStrm, USHORT ) const
{
- DBG_ERROR("SvxWritingModeItem should not be streamed!");
+ OSL_FAIL("SvxWritingModeItem should not be streamed!");
return rStrm;
}
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 4fe46f8..605979d 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -279,7 +279,7 @@ namespace editeng
m_eConvType = HHC::eConvSimplifiedTraditional;
else
{
- DBG_ERROR( "failed to determine conversion type from languages" );
+ OSL_FAIL( "failed to determine conversion type from languages" );
}
// set remaining conversion parameters to their default values
@@ -450,7 +450,7 @@ namespace editeng
}
catch( const Exception& )
{
- DBG_ERROR( "HangulHanjaConversion_Impl::implNextConvertibleUnit: caught an exception!" );
+ OSL_FAIL( "HangulHanjaConversion_Impl::implNextConvertibleUnit: caught an exception!" );
//!!! at least we want to move on in the text in order
//!!! to avoid an endless loop...
@@ -652,7 +652,7 @@ namespace editeng
}
catch( const Exception& )
{
- DBG_ERROR( "HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion: caught an exception!" );
+ OSL_FAIL( "HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion: caught an exception!" );
}
}
@@ -755,7 +755,7 @@ namespace editeng
case HHC::eRubyHangulAbove: eAction = bOriginalIsHangul ? HHC::eOriginalAbove : HHC::eReplacementAbove; break;
case HHC::eRubyHangulBelow: eAction = bOriginalIsHangul ? HHC::eOriginalBelow : HHC::eReplacementBelow; break;
default:
- DBG_ERROR( "HangulHanjaConversion_Impl::implChange: invalid/unexpected conversion format!" );
+ OSL_FAIL( "HangulHanjaConversion_Impl::implChange: invalid/unexpected conversion format!" );
}
}
@@ -808,7 +808,7 @@ namespace editeng
}
catch( const Exception& )
{
- DBG_ERROR( "HangulHanjaConversion_Impl::implChange: caught unexpected exception!" );
+ OSL_FAIL( "HangulHanjaConversion_Impl::implChange: caught unexpected exception!" );
aOffsets.realloc(0);
}
}
@@ -988,7 +988,7 @@ namespace editeng
}
catch( const Exception& )
{
- DBG_ERROR( "HangulHanjaConversion_Impl::OnFind: caught an exception!" );
+ OSL_FAIL( "HangulHanjaConversion_Impl::OnFind: caught an exception!" );
}
}
return 0L;
@@ -1053,7 +1053,7 @@ namespace editeng
void HangulHanjaConversion::GetNextPortion( ::rtl::OUString&, LanguageType&, sal_Bool )
{
- DBG_ERROR( "HangulHanjaConversion::GetNextPortion: to be overridden!" );
+ OSL_FAIL( "HangulHanjaConversion::GetNextPortion: to be overridden!" );
}
void HangulHanjaConversion::ReplaceUnit(
@@ -1064,12 +1064,12 @@ namespace editeng
ReplacementAction,
LanguageType * )
{
- DBG_ERROR( "HangulHanjaConversion::ReplaceUnit: to be overridden!" );
+ OSL_FAIL( "HangulHanjaConversion::ReplaceUnit: to be overridden!" );
}
sal_Bool HangulHanjaConversion::HasRubySupport() const
{
- DBG_ERROR( "HangulHanjaConversion::HasRubySupport: to be overridden!" );
+ OSL_FAIL( "HangulHanjaConversion::HasRubySupport: to be overridden!" );
return sal_False;
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 88a9369..b0c8e0f 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1472,7 +1472,7 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
#ifdef DBG_UTIL
else
{
- DBG_ERROR("Save an empty list? ");
+ OSL_FAIL("Save an empty list? ");
}
#endif
}
@@ -1488,7 +1488,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
#ifdef DBG_UTIL
else
{
- DBG_ERROR("Save an empty list? ");
+ OSL_FAIL("Save an empty list? ");
}
#endif
}
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 98ca3b8..2921662 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -161,7 +161,7 @@ Sequence< OUString > lcl_GetLastFoundSvcs(
aRes = aSvcImplNames;
else
{
- DBG_ERROR( "type mismatch" );
+ OSL_FAIL( "type mismatch" );
}
}
}
@@ -393,7 +393,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
if (!bRes)
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ERROR( "failed to set new configuration values" );
+ OSL_FAIL( "failed to set new configuration values" );
#endif
}
}
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 9d594e4..2b1a23c 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -258,7 +258,7 @@ void Outliner::Init( USHORT nMode )
nCtrl |= EE_CNTRL_OUTLINER;
break;
- default: DBG_ERROR( "Outliner::Init - Invalid Mode!" );
+ default: OSL_FAIL( "Outliner::Init - Invalid Mode!" );
}
pEditEngine->SetControlWord( nCtrl );
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 051460d..ca7b4e9 100644
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -132,7 +132,7 @@ void OutlinerUndoChangeDepth::Redo()
void OutlinerUndoChangeDepth::Repeat()
{
- DBG_ERROR( "Repeat not implemented!" );
+ OSL_FAIL( "Repeat not implemented!" );
}
@@ -158,7 +158,7 @@ void OutlinerUndoCheckPara::Redo()
void OutlinerUndoCheckPara::Repeat()
{
- DBG_ERROR( "Repeat not implemented!" );
+ OSL_FAIL( "Repeat not implemented!" );
}
DBG_NAME(OLUndoExpand);
@@ -231,7 +231,7 @@ void OLUndoExpand::Redo()
void OLUndoExpand::Repeat()
{
DBG_CHKTHIS(OLUndoExpand,0);
- DBG_ERROR("Not implemented");
+ OSL_FAIL("Not implemented");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 34a7507..e07952f 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1430,7 +1430,7 @@ void OutlinerView::StartTextConversion(
}
else
{
- DBG_ERROR( "unexpected language" );
+ OSL_FAIL( "unexpected language" );
}
}
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 81eae5c..55c7462 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -156,7 +156,7 @@ void ParagraphList::MoveParagraphs( ULONG nStart, ULONG nDest, ULONG _nCount )
}
else
{
- DBG_ERROR( "MoveParagraphs: Invalid Parameters" );
+ OSL_FAIL( "MoveParagraphs: Invalid Parameters" );
}
}
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 55754f7..219f2e7 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -124,7 +124,7 @@ void SvxEditSourceHint::SetEndValue( ULONG n )
return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
default:
- DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
+ OSL_FAIL( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
break;
}
}
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 23f9878..29b4dec 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -1187,23 +1187,23 @@ sal_Bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
const SfxItemSet * SvxAccessibleTextAdapter::GetEmptyItemSetPtr()
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
return 0;
}
void SvxAccessibleTextAdapter::AppendParagraph()
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
}
xub_StrLen SvxAccessibleTextAdapter::AppendTextPortion( USHORT, const String &, const SfxItemSet & )
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
return 0;
}
void SvxAccessibleTextAdapter::CopyText(const SvxTextForwarder&)
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
}
diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index 91bca0a..0633765 100644
--- a/editeng/source/uno/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
@@ -83,7 +83,7 @@ SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( sal_Bool )
SfxBroadcaster& SvxEditSource::GetBroadcaster() const
{
- DBG_ERROR("SvxEditSource::GetBroadcaster called for implementation missing this feature!");
+ OSL_FAIL("SvxEditSource::GetBroadcaster called for implementation missing this feature!");
static SfxBroadcaster aBroadcaster;
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 053f871..c3b05be 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -91,7 +91,7 @@ SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, BOOL bOnl
nFlags = GETATTRIBS_CHARATTRIBS;
break;
default:
- DBG_ERROR("unknown flags for SvxOutlinerForwarder::GetAttribs");
+ OSL_FAIL("unknown flags for SvxOutlinerForwarder::GetAttribs");
}
return rEditEngine.GetAttribs( rSel.nStartPara, rSel.nStartPos, rSel.nEndPos, nFlags );
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 4544fd3..004b567 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -100,7 +100,7 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, BOOL
nFlags = GETATTRIBS_CHARATTRIBS;
break;
default:
- DBG_ERROR("unknown flags for SvxOutlinerForwarder::GetAttribs");
+ OSL_FAIL("unknown flags for SvxOutlinerForwarder::GetAttribs");
}
return rEditEngine.GetAttribs( rSel.nStartPara, rSel.nStartPos, rSel.nEndPos, nFlags );
}
@@ -508,7 +508,7 @@ sal_Int16 SvxOutlinerForwarder::GetNumberingStartValue( sal_uInt16 nPara )
}
else
{
- DBG_ERROR( "SvxOutlinerForwarder::GetNumberingStartValue)(), Invalid paragraph index");
+ OSL_FAIL( "SvxOutlinerForwarder::GetNumberingStartValue)(), Invalid paragraph index");
return -1;
}
}
@@ -521,7 +521,7 @@ void SvxOutlinerForwarder::SetNumberingStartValue( sal_uInt16 nPara, sal_Int16
}
else
{
- DBG_ERROR( "SvxOutlinerForwarder::SetNumberingStartValue)(), Invalid paragraph index");
+ OSL_FAIL( "SvxOutlinerForwarder::SetNumberingStartValue)(), Invalid paragraph index");
}
}
@@ -533,7 +533,7 @@ sal_Bool SvxOutlinerForwarder::IsParaIsNumberingRestart( sal_uInt16 nPara )
}
else
{
- DBG_ERROR( "SvxOutlinerForwarder::IsParaIsNumberingRestart)(), Invalid paragraph index");
+ OSL_FAIL( "SvxOutlinerForwarder::IsParaIsNumberingRestart)(), Invalid paragraph index");
return sal_False;
}
}
@@ -546,7 +546,7 @@ void SvxOutlinerForwarder::SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Boo
}
else
{
- DBG_ERROR( "SvxOutlinerForwarder::SetParaIsNumberingRestart)(), Invalid paragraph index");
+ OSL_FAIL( "SvxOutlinerForwarder::SetParaIsNumberingRestart)(), Invalid paragraph index");
}
}
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 2e3c534..c5dbf3a 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -155,7 +155,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
}
else
{
- DBG_ERROR( "No SfxPoolItem found for property!" );
+ OSL_FAIL( "No SfxPoolItem found for property!" );
}
return aVal;
@@ -178,7 +178,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
{
if( pPool == NULL )
{
- DBG_ERROR( "No default item and no pool?" );
+ OSL_FAIL( "No default item and no pool?" );
return;
}
@@ -331,13 +331,13 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th
rMetric <<= (sal_uInt32)(TWIPS_TO_MM(*(sal_uInt32*)rMetric.getValue()));
break;
default:
- DBG_ERROR("AW: Missing unit translation to 100th mm!");
+ OSL_FAIL("AW: Missing unit translation to 100th mm!");
}
break;
}
default:
{
- DBG_ERROR("AW: Missing unit translation to 100th mm!");
+ OSL_FAIL("AW: Missing unit translation to 100th mm!");
}
}
}
@@ -369,13 +369,13 @@ void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetr
rMetric <<= (sal_uInt32)(MM_TO_TWIPS(*(sal_uInt32*)rMetric.getValue()));
break;
default:
- DBG_ERROR("AW: Missing unit translation to 100th mm!");
+ OSL_FAIL("AW: Missing unit translation to 100th mm!");
}
break;
}
default:
{
- DBG_ERROR("AW: Missing unit translation to PoolMetrics!");
+ OSL_FAIL("AW: Missing unit translation to PoolMetrics!");
}
}
}
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 5cc3b16..e4727c0 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -428,7 +428,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
if( !xServiceFactory.is() )
{
- DBG_ERROR( "got no service manager" );
+ OSL_FAIL( "got no service manager" );
break;
}
@@ -438,7 +438,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
if( !xWriter.is() )
{
- DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" );
+ OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" );
break;
}
@@ -475,7 +475,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
}
catch( uno::Exception& )
{
- DBG_ERROR("exception during xml export");
+ OSL_FAIL("exception during xml export");
}
}
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 4fdbaf6..760246d 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -174,14 +174,14 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() );
if( !xServiceFactory.is() )
{
- DBG_ERROR( "SvxXMLXTableImport::load: got no service manager" );
+ OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" );
break;
}
uno::Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ) ) ), uno::UNO_QUERY );
if( !xParser.is() )
{
- DBG_ERROR( "com.sun.star.xml.sax.Parser service missing" );
+ OSL_FAIL( "com.sun.star.xml.sax.Parser service missing" );
break;
}
@@ -198,14 +198,14 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
if( !xSource.is() )
{
- DBG_ERROR( "got no data source from medium" );
+ OSL_FAIL( "got no data source from medium" );
break;
}
uno::Reference< XInterface > xPipe( xServiceFactory->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ) );
if( !xPipe.is() )
{
- DBG_ERROR( "XMLReader::Read: com.sun.star.io.Pipe service missing" );
+ OSL_FAIL( "XMLReader::Read: com.sun.star.io.Pipe service missing" );
break;
}
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index d1c8cc1..7973b5c 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1649,7 +1649,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
case svSep:
break; // Opcodes
default:
- DBG_ERROR("FormulaCompiler:: GetStringFromToken errUnknownVariable");
+ OSL_FAIL("FormulaCompiler:: GetStringFromToken errUnknownVariable");
} // of switch
}
}
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 87cb865..7c67b11 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -872,7 +872,7 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
sp = sal::static_int_cast<short>( sp - nParams );
if ( sp < 0 )
{
- DBG_ERROR( "FormulaTokenArray::HasMatrixDoubleRefOps: sp < 0" );
+ OSL_FAIL( "FormulaTokenArray::HasMatrixDoubleRefOps: sp < 0" );
sp = 0;
}
pStack[sp++] = pResult;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index e6d9715..da6bc8c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -581,7 +581,7 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
}
catch(const uno::Exception& )
{
- DBG_ERROR("Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
@@ -971,7 +971,7 @@ String FormulaDlg_Impl::RepairFormula(const String& aFormula)
}
catch(const uno::Exception& )
{
- DBG_ERROR("Exception caught!");
+ OSL_FAIL("Exception caught!");
}
return aResult;
}
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index c107252..4e77054 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -704,7 +704,7 @@ namespace svt
break;
default:
- DBG_ERROR( "OControlAccess::implSetControlProperty: invalid property id!" );
+ OSL_FAIL( "OControlAccess::implSetControlProperty: invalid property id!" );
}
}
@@ -780,7 +780,7 @@ namespace svt
break;
default:
- DBG_ERROR( "OControlAccess::implGetControlProperty: invalid property id!" );
+ OSL_FAIL( "OControlAccess::implGetControlProperty: invalid property id!" );
}
return aReturn;
}
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 26888c7..3982ed0 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -143,7 +143,7 @@ namespace svt
break;
default:
- DBG_ERROR( "AsyncPickerAction::execute: unknown action!" );
+ OSL_FAIL( "AsyncPickerAction::execute: unknown action!" );
break;
}
@@ -208,7 +208,7 @@ namespace svt
break;
default:
- DBG_ERROR( "AsyncPickerAction::OnActionDone: unknown action!" );
+ OSL_FAIL( "AsyncPickerAction::OnActionDone: unknown action!" );
break;
}
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index ea67a5e..7cf414f 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -169,7 +169,7 @@ namespace svt
}
else
{
- DBG_ERROR( "OCommonPicker::disposing: where did this come from?" );
+ OSL_FAIL( "OCommonPicker::disposing: where did this come from?" );
}
}
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 5b8bb25..5b33754 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -165,7 +165,7 @@ namespace svt
}
catch( Exception& )
{
- DBG_ERROR( "SmartContent::bindTo: unexpected exception caught!" );
+ OSL_FAIL( "SmartContent::bindTo: unexpected exception caught!" );
}
}
else
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index e3f24cc..7ecfa10 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -313,7 +313,7 @@ namespace
}
catch( const Exception& )
{
- DBG_ERROR( "lcl_getHomeDirectory: caught an exception!" );
+ OSL_FAIL( "lcl_getHomeDirectory: caught an exception!" );
}
return 0 < _rHomeDir.Len();
}
@@ -1299,7 +1299,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
break;
default:
- DBG_ERROR("SvtFileDialog, OpenHdl_Impl: invalid mode!");
+ OSL_FAIL("SvtFileDialog, OpenHdl_Impl: invalid mode!");
}
// Interessenten benachrichtigen.
@@ -1994,7 +1994,7 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode
}
catch( const Exception& )
{
- DBG_ERROR( "iodlg::displayIOException: caught an exception!" );
+ OSL_FAIL( "iodlg::displayIOException: caught an exception!" );
}
}
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index 217a447..6f2daea 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -502,7 +502,7 @@ void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyN
//*****************************************************************************************************************
void AddonsOptions_Impl::Commit()
{
- DBG_ERROR( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" );
+ OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" );
}
//*****************************************************************************************************************
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 6f7a019..7ae3def 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -146,7 +146,7 @@ void SvMetaName::Load( SvPersistStream & rStm )
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aName;
@@ -429,7 +429,7 @@ void SvMetaReference::Load( SvPersistStream & rStm )
if( nMask >= 0x2 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 )
@@ -472,7 +472,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> pModule;
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 1c14469..91356dd 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -98,7 +98,7 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
if( n & ~0x03 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "format error" );
+ OSL_FAIL( "format error" );
}
return rStm;
}
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 049830c..bcadfc0 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -51,7 +51,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
if( nMask >= 0x08 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aAutomation;
@@ -94,7 +94,7 @@ void SvMetaClass::Load( SvPersistStream & rStm )
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aAttrList;
@@ -324,7 +324,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
{
if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
{
- DBG_ERROR( "Neuer Slot : " );
+ OSL_FAIL( "Neuer Slot : " );
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
}
@@ -336,7 +336,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
// values have to match
if( pS->GetSlotId().GetValue() != rAttr.GetSlotId().GetValue() )
{
- DBG_ERROR( "Gleicher Name in MetaClass : " );
+ OSL_FAIL( "Gleicher Name in MetaClass : " );
DBG_ERROR( pS->GetName().GetBuffer() );
DBG_ERROR( pS->GetSlotId().GetBuffer() );
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
@@ -355,7 +355,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
UINT32 nId2 = rAttr.GetSlotId().GetValue();
if( nId1 == nId2 && nId1 != 0 )
{
- DBG_ERROR( "Gleiche Id in MetaClass : " );
+ OSL_FAIL( "Gleiche Id in MetaClass : " );
DBG_ERROR( ByteString::CreateFromInt32( pS->GetSlotId().GetValue() ).GetBuffer() );
DBG_ERROR( pS->GetSlotId().GetBuffer() );
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
@@ -397,13 +397,13 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
case WRITE_ODL:
{
- DBG_ERROR( "Not supported anymore!" );
+ OSL_FAIL( "Not supported anymore!" );
break;
}
case WRITE_C_SOURCE:
case WRITE_C_HEADER:
{
- DBG_ERROR( "Not supported anymore!" );
+ OSL_FAIL( "Not supported anymore!" );
break;
}
case WRITE_DOCU:
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 837d770..5b7c921 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -868,7 +868,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
// names may differ, because explicitly given
if ( pKnownSlot->GetName() != GetName() )
{
- DBG_ERROR("Illegal definition!");
+ OSL_FAIL("Illegal definition!");
rInStm.Seek( nTokPos );
return FALSE;
}
@@ -1022,7 +1022,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
if ( m == rBase.GetAttrList().Count() )
{
- DBG_ERROR("Invalid EnumSlot!");
+ OSL_FAIL("Invalid EnumSlot!");
xEnumSlot = Clone();
ULONG nValue;
if ( rBase.FindId(aSId , &nValue) )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index b0a9730..510f0ee 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -376,7 +376,7 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
pBaseType->GetType() == TYPE_STRUCT ||
pBaseType->GetType() == TYPE_ENUM )
{
- DBG_ERROR( "Falscher Parametertyp!" );
+ OSL_FAIL( "Falscher Parametertyp!" );
}
else
rOutStm << pBaseType->GetBasicPostfix().GetBuffer();
@@ -1784,7 +1784,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
if( nMask >= 0x02 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue );
@@ -1842,7 +1842,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
if( nMask >= 0x04 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aEnumValueList;
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index dd127f1..6432f4f 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -178,7 +178,7 @@ void ConvDicNameContainer::FlushDics() const
}
catch(Exception &)
{
- DBG_ERROR( "flushing of conversion dictionary failed" );
+ OSL_FAIL( "flushing of conversion dictionary failed" );
}
}
}
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 90caf97..a5ddc9b 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -426,7 +426,7 @@ void GrammarCheckingIterator::ProcessResult(
}
catch (lang::IllegalArgumentException &)
{
- DBG_ERROR( "commitMultiTextMarkup: IllegalArgumentException exception caught" );
+ OSL_FAIL( "commitMultiTextMarkup: IllegalArgumentException exception caught" );
}
}
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index b9fe0d4..089e81c 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -316,7 +316,7 @@ void SAL_CALL
break;
}
default:
- DBG_ERROR( "unknown property" );
+ OSL_FAIL( "unknown property" );
}
if (pbVal)
rEvt.NewValue >>= *pbVal;
@@ -361,7 +361,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
case UPH_IS_SPELL_WITH_DIGITS : pbResVal = &bResIsSpellWithDigits; break;
case UPH_IS_SPELL_CAPITALIZATION : pbResVal = &bResIsSpellCapitalization; break;
default:
- DBG_ERROR( "unknown property" );
+ OSL_FAIL( "unknown property" );
}
if (pbResVal)
pVal[i].Value >>= *pbResVal;
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 381c5ef..38b6785 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -376,7 +376,7 @@ void SAL_CALL
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
- DBG_ERROR( "wrong number of arguments in sequence" );
+ OSL_FAIL( "wrong number of arguments in sequence" );
}
}
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 757fcc5..8d3c121 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -109,7 +109,7 @@ String lcl_GetVersionString()
if ( aVersion.Len() == 0 )
{
- DBG_ERROR( "No BUILDID in bootstrap file found" );
+ OSL_FAIL( "No BUILDID in bootstrap file found" );
}
aVersion.Erase( 0, aVersion.Search( ':' ) + 1 );
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index c3eab26..3867404 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -144,7 +144,7 @@ Reference< XLibraryContainer > SfxBasicManagerHolder::getLibraryContainer( Conta
case SCRIPTS: return mxBasicContainer.get();
case DIALOGS: return mxDialogContainer.get();
}
- DBG_ERROR( "SfxBasicManagerHolder::getLibraryContainer: illegal container type!" );
+ OSL_FAIL( "SfxBasicManagerHolder::getLibraryContainer: illegal container type!" );
return NULL;
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index d82de22..d1e1595 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -500,7 +500,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
}
#ifdef DBG_UTIL
if ( !bRet )
- DBG_ERROR( "Putting options failed!" );
+ OSL_FAIL( "Putting options failed!" );
#endif
}
pRanges++;
@@ -665,7 +665,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
BOOL bReset = ((const SfxBoolItem *)pItem)->GetValue();
if ( bReset )
{
- DBG_ERROR( "Not implemented, may be EOL!" );
+ OSL_FAIL( "Not implemented, may be EOL!" );
} }
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), TRUE, &pItem))
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 73e6217..18b885d 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -134,7 +134,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
return;
}
- DBG_ERROR( "Kein ChildWindow fuer diesen Context!" );
+ OSL_FAIL( "Kein ChildWindow fuer diesen Context!" );
}
//--------------------------------------------------------------------
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index f0cfd15..a6f8121 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -295,7 +295,7 @@ SfxModule* SfxApplication::GetModule_Impl()
return pModule;
else
{
- DBG_ERROR( "No module!" );
+ OSL_FAIL( "No module!" );
return NULL;
}
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index bd5be6a..a3b44b9 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1090,7 +1090,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
catch( const ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "OfficeApplication::ExecuteApp_Impl(SID_ONLINE_REGISTRATION): caught an exception!" );
+ OSL_FAIL( "OfficeApplication::ExecuteApp_Impl(SID_ONLINE_REGISTRATION): caught an exception!" );
}
}
break;
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index b1d2261..63da5fa 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -504,7 +504,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
if ( !pCon )
{
- DBG_ERROR( "Kein geeigneter Context gefunden!" );
+ OSL_FAIL( "Kein geeigneter Context gefunden!" );
return;
}
@@ -539,7 +539,7 @@ FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const
}
else
{
- DBG_ERROR("Kein FloatingWindow-Context!");
+ OSL_FAIL("Kein FloatingWindow-Context!");
return NULL;
}
}
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 4ef56e0..23711d6 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -623,7 +623,7 @@ DdeData* ImplDdeItem::Get( ULONG nFormat )
BOOL ImplDdeItem::Put( const DdeData* )
{
- DBG_ERROR( "ImplDdeItem::Put not implemented" );
+ OSL_FAIL( "ImplDdeItem::Put not implemented" );
return FALSE;
}
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 05ae3d8..77d7c57 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -207,7 +207,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId)
{
pImpl->pFactArr->Remove( nFactory );
- DBG_ERROR("ChildWindow registered multiple times!");
+ OSL_FAIL("ChildWindow registered multiple times!");
return;
}
}
@@ -236,7 +236,7 @@ void SfxModule::RegisterChildWindowContext( USHORT nId,
}
}
- DBG_ERROR( "No ChildWindow for this Context!" );
+ OSL_FAIL( "No ChildWindow for this Context!" );
}
//-------------------------------------------------------------------------
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index a5f4963..c312a88 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -402,7 +402,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
}
catch( Exception& )
{
- DBG_ERROR( "ContentListBox_Impl::RequestingChilds(): unexpected exception" );
+ OSL_FAIL( "ContentListBox_Impl::RequestingChilds(): unexpected exception" );
}
}
@@ -732,7 +732,7 @@ void IndexTabPage_Impl::InitializeIndex()
}
catch( Exception& )
{
- DBG_ERROR( "IndexTabPage_Impl::InitializeIndex(): unexpected exception" );
+ OSL_FAIL( "IndexTabPage_Impl::InitializeIndex(): unexpected exception" );
}
aIndexCB.SetUpdateMode( TRUE );
@@ -2342,7 +2342,7 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const
}
catch( Exception& )
{
- DBG_ERROR( "SfxHelpTextWindow_Impl::getCursor(): unexpected exception" );
+ OSL_FAIL( "SfxHelpTextWindow_Impl::getCursor(): unexpected exception" );
}
return xCursor;
@@ -2410,7 +2410,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, SelectHdl, Timer*, EMPTYARG )
}
catch( Exception& )
{
- DBG_ERROR( "SfxHelpTextWindow_Impl::SelectHdl(): unexpected exception" );
+ OSL_FAIL( "SfxHelpTextWindow_Impl::SelectHdl(): unexpected exception" );
}
return 1;
@@ -2506,7 +2506,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg )
}
catch( Exception& )
{
- DBG_ERROR( "SfxHelpTextWindow_Impl::SelectHdl(): unexpected exception" );
+ OSL_FAIL( "SfxHelpTextWindow_Impl::SelectHdl(): unexpected exception" );
}
return 0;
@@ -3184,7 +3184,7 @@ void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL ,
}
catch( Exception& )
{
- DBG_ERROR( "SfxHelpWindow_Impl::OpenDoneHdl(): unexpected exception" );
+ OSL_FAIL( "SfxHelpWindow_Impl::OpenDoneHdl(): unexpected exception" );
}
// When the SearchPage opens the help doc, then select all words, which are equal to its text
@@ -3395,7 +3395,7 @@ void SfxHelpWindow_Impl::DoAction( USHORT nActionId )
}
catch( Exception& )
{
- DBG_ERROR( "SfxHelpWindow_Impl::DoAction(): unexpected exception" );
+ OSL_FAIL( "SfxHelpWindow_Impl::DoAction(): unexpected exception" );
}
}
break;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index aff440e..4097661 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -660,7 +660,7 @@ void SfxWorkWindow::Lock_Impl( BOOL bLock )
--m_nLock;
if ( m_nLock<0 )
{
- DBG_ERROR("Lock count underflow!");
+ OSL_FAIL("Lock count underflow!");
m_nLock = 0;
}
@@ -1066,7 +1066,7 @@ void SfxWorkWindow::AlignChild_Impl( Window& rWindow,
pChild->bResize = TRUE;
}
else {
- DBG_ERROR( "aligning unregistered child" );
+ OSL_FAIL( "aligning unregistered child" );
}
}
@@ -1094,7 +1094,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
delete pChild;
}
else {
- DBG_ERROR( "releasing unregistered child" );
+ OSL_FAIL( "releasing unregistered child" );
}
}
@@ -2256,11 +2256,11 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
if ( n < nCount )
{
- DBG_ERROR("The ChildWindow is not in context!");
+ OSL_FAIL("The ChildWindow is not in context!");
}
else
{
- DBG_ERROR("The ChildWindow is not registered!");
+ OSL_FAIL("The ChildWindow is not registered!");
}
#endif
}
@@ -2501,11 +2501,11 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
if ( n<nCount )
{
- DBG_ERROR("The ChildWindow is not in context!");
+ OSL_FAIL("The ChildWindow is not in context!");
}
else
{
- DBG_ERROR("The ChildWindow is not registered");
+ OSL_FAIL("The ChildWindow is not registered");
}
#endif
}
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 202ea4e..42e2bdd 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -770,7 +770,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
USHORT nIndex = aName.SearchAscii(": ");
if ( nIndex != STRING_NOTFOUND )
{
- DBG_ERROR("Old filter name used!");
+ OSL_FAIL("Old filter name used!");
aName = rName.Copy( nIndex + 2 );
}
@@ -1038,7 +1038,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
sal_Int32 nStartRealName = sFilterName.indexOf( DEFINE_CONST_UNICODE(": "), 0 );
if( nStartRealName != -1 )
{
- DBG_ERROR("Old format, not supported!");
+ OSL_FAIL("Old format, not supported!");
sFilterName = sFilterName.copy( nStartRealName+2 );
}
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 7e72588..7e69cf8 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -130,19 +130,19 @@ SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const
SfxPoolItem* SfxEventNamesItem::Create(SvStream &, USHORT) const
{
- DBG_ERROR("not streamable!");
+ OSL_FAIL("not streamable!");
return new SfxEventNamesItem(Which());
}
SvStream& SfxEventNamesItem::Store(SvStream &rStream, USHORT ) const
{
- DBG_ERROR("not streamable!");
+ OSL_FAIL("not streamable!");
return rStream;
}
USHORT SfxEventNamesItem::GetVersion( USHORT ) const
{
- DBG_ERROR("not streamable!");
+ OSL_FAIL("not streamable!");
return 0;
}
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 0e59378..7eeb380 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1294,7 +1294,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
delete pNewItem;
}
else {
- DBG_ERROR( "Toggle only for Enums and Bools allowed" );
+ OSL_FAIL( "Toggle only for Enums and Bools allowed" );
}
}
else if ( SFX_ITEM_DONTCARE == eState )
@@ -1318,12 +1318,12 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
aReq.AppendItem( *pNewItem );
}
else {
- DBG_ERROR( "Toggle only for Enums and Bools allowed" );
+ OSL_FAIL( "Toggle only for Enums and Bools allowed" );
}
delete pNewItem;
}
else {
- DBG_ERROR( "suspicious Toggle-Slot" );
+ OSL_FAIL( "suspicious Toggle-Slot" );
}
}
@@ -1770,7 +1770,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
}
catch (...)
{
- DBG_ERROR("C++ exception caught!");
+ OSL_FAIL("C++ exception caught!");
pImp->bInNextJob = sal_False;
}
@@ -1967,7 +1967,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
{
if ( pImp->pSubBindings && pImp->pSubBindings->pDispatcher != pOldDispat )
{
- DBG_ERROR( "SubBindings already set before activating!" );
+ OSL_FAIL( "SubBindings already set before activating!" );
pImp->pSubBindings->ENTERREGISTRATIONS();
}
LEAVEREGISTRATIONS();
@@ -1977,7 +1977,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
ENTERREGISTRATIONS();
if ( pImp->pSubBindings && pImp->pSubBindings->pDispatcher != pOldDispat )
{
- DBG_ERROR( "SubBindings still set even when deactivating!" );
+ OSL_FAIL( "SubBindings still set even when deactivating!" );
pImp->pSubBindings->LEAVEREGISTRATIONS();
}
}
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 2bb4d93..2027dc6 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -553,7 +553,7 @@ void SfxMacroConfig::ReleaseSlotId(sal_uInt16 nId)
}
}
- DBG_ERROR("Macro-SlotId is not found!");
+ OSL_FAIL("Macro-SlotId is not found!");
}
//==========================================================================
@@ -572,7 +572,7 @@ void SfxMacroConfig::RegisterSlotId(sal_uInt16 nId)
}
}
- DBG_ERROR("Macro-SlotId is not found!");
+ OSL_FAIL("Macro-SlotId is not found!");
}
//==========================================================================
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index c95e098..eefffe9 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -45,7 +45,7 @@ SfxSlotKind SfxSlot::GetKind() const
return (SfxSlotKind) SFX_KIND_ENUM;
else
{
- DBG_ERROR( "invalid slot kind detected" );
+ OSL_FAIL( "invalid slot kind detected" );
return SFX_KIND_ENUM;
}
}
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index c7717e4..1447b65 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -219,7 +219,7 @@ String SfxSlotPool::SeekGroup( USHORT nNo )
aResId.SetRT(RSC_STRING);
if ( !aResId.GetResMgr()->IsAvailable(aResId) )
{
- DBG_ERROR( "GroupId-Name not defined in SFX!" );
+ OSL_FAIL( "GroupId-Name not defined in SFX!" );
return String();
}
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index a09969a..aec2be3 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -230,7 +230,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
{
if ( pNext->GetSlotId() <= pIter->GetSlotId() )
- DBG_ERROR ("Wrong order!");
+ OSL_FAIL("Wrong order!");
if ( pIter->GetKind() == SFX_KIND_ENUM )
{
@@ -363,7 +363,7 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
{
if(pGenoType)
return pGenoType->GetRealSlot(pSlot);
- DBG_ERROR("unknown Slot");
+ OSL_FAIL("unknown Slot");
return 0;
}
@@ -383,7 +383,7 @@ const SfxSlot* SfxInterface::GetRealSlot( USHORT nSlotId ) const
{
if(pGenoType)
return pGenoType->GetRealSlot(nSlotId);
- DBG_ERROR("fremder Slot");
+ OSL_FAIL("fremder Slot");
return 0;
}
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 328b2aa..39b4083 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -536,7 +536,7 @@ const SfxPoolItem* SfxRequest::GetItem
return pItem;
// Item da aber falsch => Programmierfehler
- DBG_ERROR( "invalid argument type" );
+ OSL_FAIL( "invalid argument type" );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list