[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_goodies binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc filter/source lotuswordpro/source oox/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Mar 2 06:02:59 PST 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 2
binfilter/bf_basic/source/classes/sb.cxx | 6 -
binfilter/bf_basic/source/classes/sbunoobj.cxx | 2
binfilter/bf_basic/source/classes/sbxmod.cxx | 8 -
binfilter/bf_basic/source/comp/sbcomp.cxx | 2
binfilter/bf_basic/source/sbx/sbxvalue.cxx | 2
binfilter/bf_forms/source/component/forms_Button.cxx | 4
binfilter/bf_forms/source/component/forms_CheckBox.cxx | 8 -
binfilter/bf_forms/source/component/forms_Columns.cxx | 4
binfilter/bf_forms/source/component/forms_ComboBox.cxx | 4
binfilter/bf_forms/source/component/forms_Currency.cxx | 2
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 20 +--
binfilter/bf_forms/source/component/forms_File.cxx | 2
binfilter/bf_forms/source/component/forms_Filter.cxx | 2
binfilter/bf_forms/source/component/forms_FormComponent.cxx | 4
binfilter/bf_forms/source/component/forms_FormattedField.cxx | 8 -
binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx | 2
binfilter/bf_forms/source/component/forms_Grid.cxx | 4
binfilter/bf_forms/source/component/forms_GroupBox.cxx | 2
binfilter/bf_forms/source/component/forms_GroupManager.cxx | 4
binfilter/bf_forms/source/component/forms_Hidden.cxx | 2
binfilter/bf_forms/source/component/forms_ImageButton.cxx | 2
binfilter/bf_forms/source/component/forms_ImageControl.cxx | 2
binfilter/bf_forms/source/component/forms_ListBox.cxx | 8 -
binfilter/bf_forms/source/component/forms_RadioButton.cxx | 4
binfilter/bf_forms/source/component/forms_imgprod.cxx | 2
binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx | 6 -
binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx | 4
binfilter/bf_goodies/source/base3d/goodies_b3dgeom.cxx | 2
binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx | 16 +-
binfilter/bf_goodies/source/base3d/goodies_hmatrix.cxx | 6 -
binfilter/bf_sc/source/core/data/sc_attarray.cxx | 8 -
binfilter/bf_sc/source/core/data/sc_attrib.cxx | 12 +-
binfilter/bf_sc/source/core/data/sc_cell.cxx | 8 -
binfilter/bf_sc/source/core/data/sc_cell2.cxx | 4
binfilter/bf_sc/source/core/data/sc_column.cxx | 4
binfilter/bf_sc/source/core/data/sc_column2.cxx | 12 +-
binfilter/bf_sc/source/core/data/sc_conditio.cxx | 6 -
binfilter/bf_sc/source/core/data/sc_dociter.cxx | 4
binfilter/bf_sc/source/core/data/sc_docpool.cxx | 2
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 2
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 18 +--
binfilter/bf_sc/source/core/data/sc_documen4.cxx | 6 -
binfilter/bf_sc/source/core/data/sc_documen8.cxx | 4
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 4
binfilter/bf_sc/source/core/data/sc_document.cxx | 44 ++++----
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 12 +-
binfilter/bf_sc/source/core/data/sc_dpsave.cxx | 2
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx | 4
binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx | 24 ++--
binfilter/bf_sc/source/core/data/sc_drwlayer.cxx | 2
binfilter/bf_sc/source/core/data/sc_global.cxx | 4
binfilter/bf_sc/source/core/data/sc_global2.cxx | 2
binfilter/bf_sc/source/core/data/sc_olinetab.cxx | 8 -
binfilter/bf_sc/source/core/data/sc_patattr.cxx | 4
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 2
binfilter/bf_sc/source/core/data/sc_stlpool.cxx | 2
binfilter/bf_sc/source/core/data/sc_table1.cxx | 4
binfilter/bf_sc/source/core/data/sc_table2.cxx | 30 ++---
binfilter/bf_sc/source/core/data/sc_table5.cxx | 2
binfilter/bf_sc/source/core/data/sc_userdat.cxx | 2
binfilter/bf_sc/source/core/data/sc_validat.cxx | 2
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_chartarr.cxx | 4
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 22 ++--
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 4
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 2
binfilter/bf_sc/source/core/tool/sc_detfunc.cxx | 8 -
binfilter/bf_sc/source/core/tool/sc_editutil.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_interpr3.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr5.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr6.cxx | 2
binfilter/bf_sc/source/core/tool/sc_rangeseq.cxx | 2
binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx | 2
binfilter/bf_sc/source/core/tool/sc_rechead.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_token.cxx | 8 -
binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx | 8 -
binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx | 24 ++--
binfilter/bf_sc/source/filter/xml/sc_XMLExportDataPilot.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx | 6 -
binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeResizer.cxx | 6 -
binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx | 6 -
binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx | 4
binfilter/bf_sc/source/filter/xml/sc_xmlnexpi.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx | 4
binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx | 2
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 2
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 12 +-
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 4
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 6 -
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 24 ++--
binfilter/bf_sc/source/ui/docshell/sc_docsh3.cxx | 8 -
binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 44 ++++----
binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 14 +-
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 18 +--
binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx | 10 -
binfilter/bf_sc/source/ui/unoobj/sc_fmtuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_servuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 6 -
binfilter/bf_sc/source/ui/view/sc_printfun.cxx | 6 -
binfilter/bf_sc/source/ui/view/sc_viewdata.cxx | 8 -
binfilter/bf_sch/source/core/sch_charttyp.cxx | 6 -
binfilter/bf_sch/source/core/sch_chaxis.cxx | 16 +-
binfilter/bf_sch/source/core/sch_chtmod2a.cxx | 4
binfilter/bf_sch/source/core/sch_chtmode1.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 12 +-
binfilter/bf_sch/source/core/sch_chtmode4.cxx | 4
binfilter/bf_sch/source/core/sch_chtmode8.cxx | 4
binfilter/bf_sch/source/core/sch_chtmode9.cxx | 4
binfilter/bf_sch/source/core/sch_memchrt.cxx | 10 -
binfilter/bf_sch/source/core/sch_objfac.cxx | 2
binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx | 8 -
binfilter/bf_sch/source/ui/app/sch_schlib.cxx | 2
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 16 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 18 +--
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 6 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 24 ++--
binfilter/bf_sd/source/core/sd_drawdoc2.cxx | 2
binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx | 6 -
binfilter/bf_sd/source/filter/sd_sdfilter.cxx | 4
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 8 -
binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx | 2
binfilter/bf_sd/source/ui/view/sd_frmview.cxx | 4
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 2
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 12 +-
binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx | 4
binfilter/bf_sfx2/source/control/sfx2_request.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 22 ++--
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 4
binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx | 4
binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx | 2
binfilter/bf_so3/source/dialog/insdlg.cxx | 2
binfilter/bf_so3/source/inplace/applet2.cxx | 2
binfilter/bf_so3/source/inplace/outplace.cxx | 2
binfilter/bf_so3/source/misc/factory.cxx | 2
binfilter/bf_so3/source/persist/persist.cxx | 2
binfilter/bf_so3/source/persist/svstor.cxx | 2
binfilter/bf_so3/source/solink/impldde.cxx | 2
binfilter/bf_starmath/source/starmath_cfgitem.cxx | 2
binfilter/bf_starmath/source/starmath_format.cxx | 2
binfilter/bf_starmath/source/starmath_mathml.cxx | 2
binfilter/bf_starmath/source/starmath_node.cxx | 2
binfilter/bf_starmath/source/starmath_symbol.cxx | 2
binfilter/bf_starmath/source/starmath_utility.cxx | 2
binfilter/bf_svtools/source/config/svt_cmdoptions.cxx | 2
binfilter/bf_svtools/source/config/svt_dynamicmenuoptions.cxx | 2
binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx | 2
binfilter/bf_svtools/source/config/svt_lingucfg.cxx | 2
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 4
binfilter/bf_svtools/source/config/svt_saveopt.cxx | 6 -
binfilter/bf_svtools/source/config/svt_searchopt.cxx | 6 -
binfilter/bf_svtools/source/config/svt_undoopt.cxx | 4
binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx | 6 -
binfilter/bf_svtools/source/filter.vcl/wmf/svt_enhwmf.cxx | 2
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx | 2
binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx | 6 -
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx | 2
binfilter/bf_svtools/source/items/svt_globalnameitem.cxx | 2
binfilter/bf_svtools/source/items/svt_intitem.cxx | 2
binfilter/bf_svtools/source/items/svt_ptitem.cxx | 4
binfilter/bf_svtools/source/items/svt_rectitem.cxx | 4
binfilter/bf_svtools/source/items/svt_style.cxx | 6 -
binfilter/bf_svtools/source/items/svt_szitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_bintitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_cenumitm.cxx | 4
binfilter/bf_svtools/source/items1/svt_cintitem.cxx | 8 -
binfilter/bf_svtools/source/items1/svt_cntwall.cxx | 4
binfilter/bf_svtools/source/items1/svt_cstitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx | 2
binfilter/bf_svtools/source/items1/svt_custritm.cxx | 4
binfilter/bf_svtools/source/items1/svt_dateitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_dtritem.cxx | 2
binfilter/bf_svtools/source/items1/svt_itempool.cxx | 6 -
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 6 -
binfilter/bf_svtools/source/items1/svt_lckbitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_nranges.cxx | 2
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 2
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 4
binfilter/bf_svtools/source/items1/svt_slstitm.cxx | 2
binfilter/bf_svtools/source/items1/svt_tfrmitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_visitem.cxx | 2
binfilter/bf_svtools/source/misc1/svt_inettype.cxx | 2
binfilter/bf_svtools/source/notify/svt_brdcst.cxx | 3
binfilter/bf_svtools/source/notify/svt_cancel.cxx | 2
binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx | 16 +-
binfilter/bf_svtools/source/numbers/svt_numhead.cxx | 8 -
binfilter/bf_svtools/source/numbers/svt_supservs.cxx | 2
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 2
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 20 +--
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 6 -
binfilter/bf_svtools/source/uno/svt_unoevent.cxx | 2
binfilter/bf_svtools/source/uno/svt_unoimap.cxx | 4
binfilter/bf_svx/source/editeng/svx_editdoc.cxx | 8 -
binfilter/bf_svx/source/editeng/svx_editdoc2.cxx | 4
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 48 ++++----
binfilter/bf_svx/source/editeng/svx_editundo.cxx | 8 -
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 6 -
binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx | 2
binfilter/bf_svx/source/form/svx_fmobj.cxx | 2
binfilter/bf_svx/source/form/svx_fmpage.cxx | 2
binfilter/bf_svx/source/form/svx_fmtools.cxx | 2
binfilter/bf_svx/source/inc/fmshimp.hxx | 2
binfilter/bf_svx/source/items/svx_algitem.cxx | 4
binfilter/bf_svx/source/items/svx_frmitems.cxx | 36 +++---
binfilter/bf_svx/source/items/svx_pageitem.cxx | 2
binfilter/bf_svx/source/items/svx_paraitem.cxx | 4
binfilter/bf_svx/source/items/svx_textitem.cxx | 2
binfilter/bf_svx/source/outliner/svx_outliner.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 6 -
binfilter/bf_svx/source/svdraw/svx_svdio.cxx | 10 -
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 8 -
binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdopath.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdotext.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 6 -
binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx | 22 ++--
binfilter/bf_svx/source/unodraw/svx_unoipset.cxx | 12 +-
binfilter/bf_svx/source/unodraw/svx_unopage.cxx | 6 -
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx | 8 -
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unoshape.cxx | 12 +-
binfilter/bf_svx/source/unoedit/svx_unoedsrc.cxx | 2
binfilter/bf_svx/source/unoedit/svx_unofored.cxx | 2
binfilter/bf_svx/source/unoedit/svx_unoforou.cxx | 2
binfilter/bf_svx/source/xml/svx_xmleohlp.cxx | 2
binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx | 2
binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx | 6 -
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 8 -
binfilter/bf_svx/source/xoutdev/svx_xattr2.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 2
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 2
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 6 -
binfilter/bf_sw/source/core/fields/sw_chpfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 12 +-
binfilter/bf_sw/source/core/fields/sw_ddefld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 54 +++++-----
binfilter/bf_sw/source/core/fields/sw_expfld.cxx | 10 -
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 4
binfilter/bf_sw/source/core/fields/sw_flddropdown.cxx | 4
binfilter/bf_sw/source/core/fields/sw_macrofld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 6 -
binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_usrfld.cxx | 4
binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx | 2
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 10 -
binfilter/bf_sw/source/core/para/sw_paratr.cxx | 2
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 10 -
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unomap.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx | 10 -
binfilter/bf_sw/source/core/unocore/sw_unoredlines.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 16 +-
binfilter/bf_sw/source/core/unocore/sw_unotext.cxx | 2
binfilter/bf_sw/source/core/view/sw_viewimp.cxx | 2
binfilter/bf_sw/source/filter/excel/sw_excread.cxx | 2
binfilter/bf_sw/source/filter/lotus/sw_lotread.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx | 12 +-
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx | 12 +-
binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx | 4
binfilter/bf_sw/source/ui/config/sw_modcfg.cxx | 2
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 6 -
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 4
binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx | 14 +-
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 10 -
binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 20 +--
binfilter/bf_xmloff/source/core/xmloff_DocumentSettingsContext.cxx | 12 +-
binfilter/bf_xmloff/source/core/xmloff_ProgressBarHelper.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_facreg.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_animexp.cxx | 6 -
binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx | 12 +-
binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx | 20 +--
binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx | 12 +-
binfilter/bf_xmloff/source/draw/xmloff_ximpstyl.cxx | 2
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx | 4
binfilter/bf_xmloff/source/script/xmloff_XMLEventExport.cxx | 6 -
binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_XMLConstantsPropertyHandler.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_XMLIsPercentagePropertyHandler.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_numehelp.cxx | 12 +-
binfilter/bf_xmloff/source/style/xmloff_xmlaustp.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 6 -
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 6 -
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_xmltabe.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLRedlineExport.cxx | 6 -
binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx | 6 -
binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx | 24 ++--
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 14 +-
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx | 6 -
binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx | 6 -
binfilter/inc/bf_goodies/bucket.hxx | 2
binfilter/inc/bf_sc/miscuno.hxx | 8 -
binfilter/inc/bf_svtools/filerec.hxx | 2
filter/source/flash/swfwriter1.cxx | 4
filter/source/graphicfilter/eos2met/eos2met.cxx | 2
filter/source/graphicfilter/epict/epict.cxx | 16 +-
filter/source/graphicfilter/eps/eps.cxx | 4
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/msocximex.cxx | 6 -
filter/source/msfilter/msoleexp.cxx | 6 -
filter/source/msfilter/svdfppt.cxx | 50 ++++-----
filter/source/pdf/pdfexport.cxx | 4
filter/source/svg/svgexport.cxx | 2
filter/source/svg/svgwriter.cxx | 4
filter/source/xsltdialog/typedetectionexport.cxx | 6 -
filter/source/xsltdialog/typedetectionimport.cxx | 2
filter/source/xsltdialog/xmlfileview.cxx | 2
filter/source/xsltdialog/xmlfilterjar.cxx | 8 -
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 26 ++--
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 4
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 2
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 14 +-
lotuswordpro/source/filter/lwpoleobject.cxx | 2
lotuswordpro/source/filter/schxmlwrapper.cxx | 16 +-
oox/source/export/chartexport.cxx | 6 -
360 files changed, 1085 insertions(+), 1084 deletions(-)
New commits:
commit d172c2b350d76554d1973043e7bbdaf68b3071b9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Mar 2 09:03:49 2011 +0100
Add osl/diagnose.h include
diff --git a/binfilter/bf_svtools/source/notify/svt_brdcst.cxx b/binfilter/bf_svtools/source/notify/svt_brdcst.cxx
index bd31616..7eaaf01 100644
--- a/binfilter/bf_svtools/source/notify/svt_brdcst.cxx
+++ b/binfilter/bf_svtools/source/notify/svt_brdcst.cxx
@@ -29,6 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <bf_svtools/hint.hxx>
#include <bf_svtools/smplhint.hxx>
commit 2a93e6d5e9b384a5ebc31a98b8916fa9e6adc8e8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 19:06:21 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 35dba07..873d1f6 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -1732,7 +1732,7 @@ void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
// Libraries sollte nicht zu modified fuehren
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/binfilter/bf_basic/source/classes/sb.cxx b/binfilter/bf_basic/source/classes/sb.cxx
index 3267183..49b4ef4 100644
--- a/binfilter/bf_basic/source/classes/sb.cxx
+++ b/binfilter/bf_basic/source/classes/sb.cxx
@@ -373,7 +373,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbMethod* pImplMethod = pIfaceMethod->getImplMethod();
if( !pImplMethod )
{
- DBG_ERROR( "No ImplMethod" );
+ OSL_FAIL( "No ImplMethod" );
continue;
}
@@ -383,7 +383,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 =
@@ -741,7 +741,7 @@ SbModule* StarBASIC::FindModule( const String& rName )
// Init-Code aller Module ausfuehren (auch in inserteten Bibliotheken)
void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
{
- DBG_ERROR( "StarBASIC::InitAllModules: dead code!" );
+ OSL_FAIL( "StarBASIC::InitAllModules: dead code!" );
// Alle Objekte ueberpruefen, ob es sich um ein Basic handelt
// Wenn ja, auch dort initialisieren
for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index e1e1f23..e4df3ea 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -1275,7 +1275,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/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index 8035f08..7f09c4e 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -417,7 +417,7 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
// Ausfuehren eines BASIC-Unterprogramms
USHORT SbModule::Run( SbMethod* /*pMeth*/ )
{
- DBG_ERROR( "SbModule::Run: dead code!" );
+ OSL_FAIL( "SbModule::Run: dead code!" );
return 0;
}
@@ -432,7 +432,7 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol
const BYTE* SbModule::FindNextStmnt( const BYTE* /*p*/, USHORT& /*nLine*/, USHORT& /*nCol*/,
BOOL /*bFollowJumps*/, const SbiImage* /*pImg*/ ) const
{
- DBG_ERROR( "SbModule::FindNextStmnt: dead code!" );
+ OSL_FAIL( "SbModule::FindNextStmnt: dead code!" );
return NULL;
}
@@ -467,7 +467,7 @@ BOOL SbModule::IsBP( USHORT ) const
BOOL SbModule::SetBP( USHORT /*nLine*/ )
{
- DBG_ERROR( "SbModule::SetBP: dead code!" );
+ OSL_FAIL( "SbModule::SetBP: dead code!" );
return FALSE;
}
@@ -731,7 +731,7 @@ SbxInfo* SbMethod::GetInfo()
// abgeschossen werden kann. Rueckgabewert wird als String geliefert.
ErrCode SbMethod::Call( SbxValue* /*pRet*/ )
{
- DBG_ERROR( "SbMethod::Call: dead code!" );
+ OSL_FAIL( "SbMethod::Call: dead code!" );
return SbERR_NO_METHOD;
}
diff --git a/binfilter/bf_basic/source/comp/sbcomp.cxx b/binfilter/bf_basic/source/comp/sbcomp.cxx
index 544f2de..51ae8c6 100644
--- a/binfilter/bf_basic/source/comp/sbcomp.cxx
+++ b/binfilter/bf_basic/source/comp/sbcomp.cxx
@@ -45,7 +45,7 @@ namespace binfilter {
BOOL SbModule::Compile()
{
- DBG_ERROR( "SbModule::Compile: dead code!" );
+ OSL_FAIL( "SbModule::Compile: dead code!" );
return FALSE;
}
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index 34a1fdd..a96f369 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -769,7 +769,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/binfilter/bf_forms/source/component/forms_Button.cxx b/binfilter/bf_forms/source/component/forms_Button.cxx
index 572e402..d511d1d 100644
--- a/binfilter/bf_forms/source/component/forms_Button.cxx
+++ b/binfilter/bf_forms/source/component/forms_Button.cxx
@@ -216,7 +216,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
break;
default:
- DBG_ERROR("OButtonModel::read : unknown version !");
+ OSL_FAIL("OButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
m_sTargetURL = ::rtl::OUString();
m_sTargetFrame = ::rtl::OUString();
@@ -354,7 +354,7 @@ IMPL_LINK( OButtonControl, OnClick, void*, EMPTYARG )
#endif
catch( const Exception& )
{
- DBG_ERROR( "OButtonControl::OnClick: caught a exception other than RuntimeException!" );
+ OSL_FAIL( "OButtonControl::OnClick: caught a exception other than RuntimeException!" );
}
}
}
diff --git a/binfilter/bf_forms/source/component/forms_CheckBox.cxx b/binfilter/bf_forms/source/component/forms_CheckBox.cxx
index eccfed8..fb05cc4 100644
--- a/binfilter/bf_forms/source/component/forms_CheckBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_CheckBox.cxx
@@ -184,7 +184,7 @@ void OCheckBoxModel::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(
m_xColumnUpdate->updateBoolean(sal_False);
break;
default:
- DBG_ERROR("OCheckBoxModel::_commit : invalid value !");
+ OSL_FAIL("OCheckBoxModel::_commit : invalid value !");
}
}
}
@@ -338,7 +338,7 @@ void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>&
readCommonProperties(_rxInStream);
break;
default :
- DBG_ERROR("OCheckBoxModel::read : unknown version !");
+ OSL_FAIL("OCheckBoxModel::read : unknown version !");
m_sReferenceValue = ::rtl::OUString();
m_nDefaultChecked = 0;
defaultCommonProperties();
@@ -431,12 +431,12 @@ sal_Bool OCheckBoxModel::_commit()
m_xColumnUpdate->updateBoolean(sal_False);
break;
default:
- DBG_ERROR("OCheckBoxModel::_commit : invalid value !");
+ OSL_FAIL("OCheckBoxModel::_commit : invalid value !");
}
}
catch(Exception&)
{
- DBG_ERROR("OCheckBoxModel::_commit : could not commit !");
+ OSL_FAIL("OCheckBoxModel::_commit : could not commit !");
}
}
return sal_True;
diff --git a/binfilter/bf_forms/source/component/forms_Columns.cxx b/binfilter/bf_forms/source/component/forms_Columns.cxx
index 8e5c009..13e2dfa 100644
--- a/binfilter/bf_forms/source/component/forms_Columns.cxx
+++ b/binfilter/bf_forms/source/component/forms_Columns.cxx
@@ -354,14 +354,14 @@ void OGridColumn::setOwnProperties(Sequence<Property>& aDescriptor)
//------------------------------------------------------------------------------
Reference<XPropertySetInfo> SAL_CALL OGridColumn::getPropertySetInfo() throw(RuntimeException)
{
- DBG_ERROR("OGridColumn::getPropertySetInfo() : Dummy Called");
+ OSL_FAIL("OGridColumn::getPropertySetInfo() : Dummy Called");
return Reference<XPropertySetInfo> ();
}
//------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper& OGridColumn::getInfoHelper()
{
- DBG_ERROR("OGridColumn::getInfoHelper() : Dummy Called");
+ OSL_FAIL("OGridColumn::getInfoHelper() : Dummy Called");
Sequence<Property> aDescriptor, aAggProperties;
static OPropertyArrayAggregationHelper aDescAry(aDescriptor, aAggProperties);
diff --git a/binfilter/bf_forms/source/component/forms_ComboBox.cxx b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
index 03fe133..70bfcb1 100644
--- a/binfilter/bf_forms/source/component/forms_ComboBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
@@ -354,7 +354,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
if (nVersion > 0x0006)
{
- DBG_ERROR("OComboBoxModel::read : invalid (means unknown) version !");
+ OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !");
m_aListSource = ::rtl::OUString();
m_aBoundColumn <<= (sal_Int16)0;
m_aDefaultText = ::rtl::OUString();
@@ -445,7 +445,7 @@ void OComboBoxModel::loadData()
Reference<XServiceInfo> xServiceInfo(xConnection, UNO_QUERY);
if (!xServiceInfo.is() || !xServiceInfo->supportsService(SRV_SDB_CONNECTION))
{
- DBG_ERROR("OComboBoxModel::loadData : invalid connection !");
+ OSL_FAIL("OComboBoxModel::loadData : invalid connection !");
return;
}
diff --git a/binfilter/bf_forms/source/component/forms_Currency.cxx b/binfilter/bf_forms/source/component/forms_Currency.cxx
index e2f0a95..6283398 100644
--- a/binfilter/bf_forms/source/component/forms_Currency.cxx
+++ b/binfilter/bf_forms/source/component/forms_Currency.cxx
@@ -138,7 +138,7 @@ void OCurrencyModel::implConstruct()
}
catch(Exception&)
{
- DBG_ERROR( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" );
+ OSL_FAIL( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" );
}
}
}
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 19cf3c6..f1590f8 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -1130,13 +1130,13 @@ void ODatabaseForm::onError(const SQLErrorEvent& _rEvent)
//------------------------------------------------------------------------------
void ODatabaseForm::onError(SQLException& /*_rException*/, const ::rtl::OUString& /*_rContextDescription*/)
{
- DBG_ERROR( "ODatabaseForm::onError: dead code!" );
+ OSL_FAIL( "ODatabaseForm::onError: dead code!" );
}
//------------------------------------------------------------------------------
void ODatabaseForm::createParameterInfo()
{
- DBG_ERROR( "ODatabaseForm::createParameterInfo: why is this still used in binfilter?!!" );
+ OSL_FAIL( "ODatabaseForm::createParameterInfo: why is this still used in binfilter?!!" );
}
//------------------------------------------------------------------------------
@@ -1148,7 +1148,7 @@ bool ODatabaseForm::hasValidParent() const
Reference<XResultSet> xResultSet(m_xParent, UNO_QUERY);
if (!xResultSet.is())
{
- DBG_ERROR("ODatabaseForm::hasValidParent() : no parent resultset !");
+ OSL_FAIL("ODatabaseForm::hasValidParent() : no parent resultset !");
return false;
}
try
@@ -1179,7 +1179,7 @@ bool ODatabaseForm::fillParameters(::osl::ResettableMutexGuard& _rClearForNotifi
Reference<XParameters> xExecutionParams;
if (!query_aggregation( m_xAggregate, xExecutionParams))
{
- DBG_ERROR("ODatabaseForm::fillParameters : invalid row set (doesn't support parameters) !");
+ OSL_FAIL("ODatabaseForm::fillParameters : invalid row set (doesn't support parameters) !");
// normally the row set should support parameters ...
return true;
}
@@ -1723,7 +1723,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl
bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAllowDelete);
break;
default:
- DBG_ERROR("ODatabaseForm::convertFastPropertyValue : unknown property !");
+ OSL_FAIL("ODatabaseForm::convertFastPropertyValue : unknown property !");
}
return bModified;
}
@@ -1791,7 +1791,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A
m_bAllowDelete = getBOOL(rValue);
break;
default:
- DBG_ERROR("ODatabaseForm::setFastPropertyValue_NoBroadcast : unknown property !");
+ OSL_FAIL("ODatabaseForm::setFastPropertyValue_NoBroadcast : unknown property !");
}
}
@@ -2303,7 +2303,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
}
}
else
- DBG_ERROR("ODatabaseForm::submit_Impl : wrong encoding !");
+ OSL_FAIL("ODatabaseForm::submit_Impl : wrong encoding !");
}
@@ -2808,7 +2808,7 @@ void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInterac
}
catch(SQLException& /*e*/)
{
- DBG_ERROR("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception ?");
+ OSL_FAIL("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception ?");
}
if (bSuccess)
@@ -3642,7 +3642,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
eTranslated = bEscapeProcessing ? DataSelectionType_SQL : DataSelectionType_SQLPASSTHROUGH;
}
break;
- default : DBG_ERROR("ODatabaseForm::write : wrong CommandType !");
+ default : OSL_FAIL("ODatabaseForm::write : wrong CommandType !");
}
}
_rxOutStream->writeShort((sal_Int16)eTranslated); // former DataSelectionType
@@ -3748,7 +3748,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, makeAny((sal_Bool)bEscapeProcessing));
}
break;
- default : DBG_ERROR("ODatabaseForm::read : wrong CommandType !");
+ default : OSL_FAIL("ODatabaseForm::read : wrong CommandType !");
}
if (m_xAggregateSet.is())
m_xAggregateSet->setPropertyValue(PROPERTY_COMMANDTYPE, makeAny(nCommandType));
diff --git a/binfilter/bf_forms/source/component/forms_File.cxx b/binfilter/bf_forms/source/component/forms_File.cxx
index 5073ea0..9c7538b 100644
--- a/binfilter/bf_forms/source/component/forms_File.cxx
+++ b/binfilter/bf_forms/source/component/forms_File.cxx
@@ -252,7 +252,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS
readHelpTextCompatibly(_rxInStream);
break;
default:
- DBG_ERROR("OFileControlModel::read : unknown version !");
+ OSL_FAIL("OFileControlModel::read : unknown version !");
m_sDefaultValue = ::rtl::OUString();
}
diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index 25b9321..b942218 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -691,7 +691,7 @@ namespace frm
}
else
{
- DBG_ERROR( "OFilterControl::initialize: unrecognized argument!" );
+ OSL_FAIL( "OFilterControl::initialize: unrecognized argument!" );
continue;
}
diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index d0b0b2b..9b51748 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -1180,7 +1180,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
rValue >>= m_aControlSource;
break;
case PROPERTY_ID_BOUNDFIELD:
- DBG_ERROR("OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !");
+ OSL_FAIL("OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !");
throw com::sun::star::lang::IllegalArgumentException();
break;
case PROPERTY_ID_CONTROLLABEL:
@@ -1553,7 +1553,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
}
catch(Exception&)
{
- DBG_ERROR("OBoundControlModel::reset : XColumn::getString and wasNull are expected to always succeed !");
+ OSL_FAIL("OBoundControlModel::reset : XColumn::getString and wasNull are expected to always succeed !");
}
if (bIsNull)
diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index 337bea4..99dc481 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -641,7 +641,7 @@ Reference<XNumberFormatsSupplier> OFormattedModel::calcFormFormatsSupplier() co
if (!xNextParentForm.is())
{
- DBG_ERROR("OFormattedModel::calcFormFormatsSupplier : have no ancestor which is a form !");
+ OSL_FAIL("OFormattedModel::calcFormFormatsSupplier : have no ancestor which is a form !");
return NULL;
}
@@ -983,7 +983,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
case 2:
break;
case 3:
- DBG_ERROR("FmXFormattedModel::read : unknown effective value type !");
+ OSL_FAIL("FmXFormattedModel::read : unknown effective value type !");
}
}
@@ -1003,7 +1003,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
}
break;
default :
- DBG_ERROR("OFormattedModel::read : unknown version !");
+ OSL_FAIL("OFormattedModel::read : unknown version !");
// dann bleibt das Format des aggregierten Sets, wie es bei der Erzeugung ist : void
defaultCommonEditProperties();
break;
@@ -1093,7 +1093,7 @@ void OFormattedModel::_reset( void )
{
if (!m_xAggregateSet.is())
{
- DBG_ERROR("OFormattedModel::_reset : no aggregate !");
+ OSL_FAIL("OFormattedModel::_reset : no aggregate !");
return;
}
Any aValue = m_xAggregateSet->getPropertyValue(PROPERTY_EFFECTIVE_DEFAULT);
diff --git a/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx b/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
index ea5d771..cb1be42 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
@@ -385,7 +385,7 @@ void OFormattedFieldWrapper::ensureAggregate()
Reference< XServiceInfo > xSI(m_xAggregate, UNO_QUERY);
if (!xSI.is())
{
- DBG_ERROR("OFormattedFieldWrapper::ensureAggregate: the aggregate has nbo XServiceInfo!");
+ OSL_FAIL("OFormattedFieldWrapper::ensureAggregate: the aggregate has nbo XServiceInfo!");
m_xAggregate.clear();
}
}
diff --git a/binfilter/bf_forms/source/component/forms_Grid.cxx b/binfilter/bf_forms/source/component/forms_Grid.cxx
index 80380ec..2cf4d66 100644
--- a/binfilter/bf_forms/source/component/forms_Grid.cxx
+++ b/binfilter/bf_forms/source/component/forms_Grid.cxx
@@ -217,7 +217,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* )
}
catch( const Exception& )
{
- DBG_ERROR( "OGridControlModel::cloneColumns: caught an exception while cloning the columns!" );
+ OSL_FAIL( "OGridControlModel::cloneColumns: caught an exception while cloning the columns!" );
}
}
@@ -382,7 +382,7 @@ Reference<XPropertySet> OGridControlModel::createColumn(sal_Int32 nTypeId) cons
case TYPE_TIMEFIELD: xReturn = new TimeFieldColumn(OControlModel::m_xServiceFactory); break;
case TYPE_FORMATTEDFIELD: xReturn = new FormattedFieldColumn(OControlModel::m_xServiceFactory); break;
default:
- DBG_ERROR("OGridControlModel::createColumn: Unknown Column");
+ OSL_FAIL("OGridControlModel::createColumn: Unknown Column");
break;
}
return xReturn;
diff --git a/binfilter/bf_forms/source/component/forms_GroupBox.cxx b/binfilter/bf_forms/source/component/forms_GroupBox.cxx
index c9d93a6..708b3d0 100644
--- a/binfilter/bf_forms/source/component/forms_GroupBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_GroupBox.cxx
@@ -162,7 +162,7 @@ void SAL_CALL OGroupBoxModel::read(const Reference<stario::XObjectInputStream>&
if (nVersion > 0x0002)
{
- DBG_ERROR("OGroupBoxModel::read : unknown version !");
+ OSL_FAIL("OGroupBoxModel::read : unknown version !");
}
};
diff --git a/binfilter/bf_forms/source/component/forms_GroupManager.cxx b/binfilter/bf_forms/source/component/forms_GroupManager.cxx
index 244d3df..cb80072 100644
--- a/binfilter/bf_forms/source/component/forms_GroupManager.cxx
+++ b/binfilter/bf_forms/source/component/forms_GroupManager.cxx
@@ -213,12 +213,12 @@ void OGroup::RemoveComponent( const Reference<XPropertySet>& rxElement )
}
else
{
- DBG_ERROR( "OGroup::RemoveComponent: Component nicht in Gruppe" );
+ OSL_FAIL( "OGroup::RemoveComponent: Component nicht in Gruppe" );
}
}
else
{
- DBG_ERROR( "OGroup::RemoveComponent: Component nicht in Gruppe" );
+ OSL_FAIL( "OGroup::RemoveComponent: Component nicht in Gruppe" );
}
}
diff --git a/binfilter/bf_forms/source/component/forms_Hidden.cxx b/binfilter/bf_forms/source/component/forms_Hidden.cxx
index 80a9862..283fefa 100644
--- a/binfilter/bf_forms/source/component/forms_Hidden.cxx
+++ b/binfilter/bf_forms/source/component/forms_Hidden.cxx
@@ -193,7 +193,7 @@ void SAL_CALL OHiddenModel::read(const Reference<stario::XObjectInputStream>& _r
{
case 1 : { ::rtl::OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break;
case 2 : _rxInStream >> m_sHiddenValue; break;
- default : DBG_ERROR("OHiddenModel::read : unknown version !"); m_sHiddenValue = ::rtl::OUString();
+ default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = ::rtl::OUString();
}
OControlModel::read(_rxInStream);
}
diff --git a/binfilter/bf_forms/source/component/forms_ImageButton.cxx b/binfilter/bf_forms/source/component/forms_ImageButton.cxx
index a13971f..1102c0a 100644
--- a/binfilter/bf_forms/source/component/forms_ImageButton.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageButton.cxx
@@ -187,7 +187,7 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t
break;
default :
- DBG_ERROR("OImageButtonModel::read : unknown version !");
+ OSL_FAIL("OImageButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
m_sTargetURL = ::rtl::OUString();
m_sTargetFrame = ::rtl::OUString();
diff --git a/binfilter/bf_forms/source/component/forms_ImageControl.cxx b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
index 042f33e..c82b095 100644
--- a/binfilter/bf_forms/source/component/forms_ImageControl.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
@@ -397,7 +397,7 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
readCommonProperties(_rxInStream);
break;
default :
- DBG_ERROR("OImageControlModel::read : unknown version !");
+ OSL_FAIL("OImageControlModel::read : unknown version !");
m_bReadOnly = sal_False;
defaultCommonProperties();
break;
diff --git a/binfilter/bf_forms/source/component/forms_ListBox.cxx b/binfilter/bf_forms/source/component/forms_ListBox.cxx
index b1443c3..e47ac23 100644
--- a/binfilter/bf_forms/source/component/forms_ListBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ListBox.cxx
@@ -430,7 +430,7 @@ void SAL_CALL OListBoxModel::read(const Reference<stario::XObjectInputStream>& _
if (nVersion > 0x0004)
{
- DBG_ERROR("OListBoxModel::read : invalid (means unknown) version !");
+ OSL_FAIL("OListBoxModel::read : invalid (means unknown) version !");
m_aListSourceSeq.realloc(0);
m_aBoundColumn <<= (sal_Int16)0;
m_aValueSeq.realloc(0);
@@ -537,7 +537,7 @@ void OListBoxModel::loadData()
Reference<XServiceInfo> xServiceInfo(xConnection, UNO_QUERY);
if (!xServiceInfo.is() || !xServiceInfo->supportsService(SRV_SDB_CONNECTION))
{
- DBG_ERROR("OListBoxModel::loadData : invalid connection !");
+ OSL_FAIL("OListBoxModel::loadData : invalid connection !");
return;
}
@@ -546,7 +546,7 @@ void OListBoxModel::loadData()
Reference<XResultSet> xListCursor(xContentSetProperties, UNO_QUERY);
if (!xListCursor.is())
{
- DBG_ERROR("OListBoxModel::loadData: could not instantiate a RowSet!");
+ OSL_FAIL("OListBoxModel::loadData: could not instantiate a RowSet!");
return;
}
@@ -750,7 +750,7 @@ void OListBoxModel::loadData()
}
catch(Exception&)
{
- DBG_ERROR("OListBoxModel::loadData: could not obtain the field type and/or format key of the bound column!");
+ OSL_FAIL("OListBoxModel::loadData: could not obtain the field type and/or format key of the bound column!");
}
if (!bHaveFormat)
diff --git a/binfilter/bf_forms/source/component/forms_RadioButton.cxx b/binfilter/bf_forms/source/component/forms_RadioButton.cxx
index 8561399..91016cf 100644
--- a/binfilter/bf_forms/source/component/forms_RadioButton.cxx
+++ b/binfilter/bf_forms/source/component/forms_RadioButton.cxx
@@ -411,7 +411,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn
readCommonProperties(_rxInStream);
break;
default :
- DBG_ERROR("ORadioButtonModel::read : unknown version !");
+ OSL_FAIL("ORadioButtonModel::read : unknown version !");
m_sReferenceValue = ::rtl::OUString();
m_nDefaultChecked = 0;
defaultCommonProperties();
@@ -503,7 +503,7 @@ sal_Bool ORadioButtonModel::_commit()
}
catch(Exception&)
{
- DBG_ERROR("ORadioButtonModel::_commit : could not commit !");
+ OSL_FAIL("ORadioButtonModel::_commit : could not commit !");
}
}
return sal_True;
diff --git a/binfilter/bf_forms/source/component/forms_imgprod.cxx b/binfilter/bf_forms/source/component/forms_imgprod.cxx
index fdc6fc7..414029c 100644
--- a/binfilter/bf_forms/source/component/forms_imgprod.cxx
+++ b/binfilter/bf_forms/source/component/forms_imgprod.cxx
@@ -163,7 +163,7 @@ ErrCode ImgProdLockBytes::SetSize( sal_Size nSize )
return SvLockBytes::SetSize( nSize );
else
{
- DBG_ERROR( "ImgProdLockBytes::SetSize not supported for xInputStream..." );
+ OSL_FAIL( "ImgProdLockBytes::SetSize not supported for xInputStream..." );
return ERRCODE_IO_CANTWRITE;
}
}
diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 3c4fe23..e9358a2 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -274,7 +274,7 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
}
catch( const Exception& )
{
- DBG_ERROR( "OInterfaceContainer::transformEvents: caught an exception!" );
+ OSL_FAIL( "OInterfaceContainer::transformEvents: caught an exception!" );
}
}
@@ -426,7 +426,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
}
catch( const Exception& )
{
- DBG_ERROR( "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" );
+ OSL_FAIL( "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" );
// create a placeholder
xElement = xElement.query( lcl_createPlaceHolder( m_xServiceFactory ) );
if ( !xElement.is() )
@@ -894,7 +894,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
}
catch( const Exception& )
{
- DBG_ERROR( "OInterfaceContainer::insertByName: caught an exception!" );
+ OSL_FAIL( "OInterfaceContainer::insertByName: caught an exception!" );
}
implInsert( m_aItems.size(), xElementProps, sal_True, aElementMetaData.get(), sal_True );
}
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx
index efa9012..7115bae 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dcompo.cxx
@@ -121,7 +121,7 @@ BOOL B3dEdgeListBucket::ImplCareForSpace() {
}
B3dEdgeList& B3dEdgeListBucket::operator[] (UINT32 nPos) {
if(nPos >= nCount) {
- DBG_ERROR("Access to Bucket out of range!");
+ OSL_FAIL("Access to Bucket out of range!");
return *((B3dEdgeList*)aMemArray[0]);
}
return *((B3dEdgeList*)(aMemArray[(UINT16)(nPos >> nBlockShift)] + ((nPos & nMask) << nShift)));
@@ -197,7 +197,7 @@ BOOL B3dEdgeEntryBucket::ImplCareForSpace() {
}
B3dEdgeEntry& B3dEdgeEntryBucket::operator[] (UINT32 nPos) {
if(nPos >= nCount) {
- DBG_ERROR("Access to Bucket out of range!");
+ OSL_FAIL("Access to Bucket out of range!");
return *((B3dEdgeEntry*)aMemArray[0]);
}
return *((B3dEdgeEntry*)(aMemArray[(UINT16)(nPos >> nBlockShift)] + ((nPos & nMask) << nShift)));
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dgeom.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dgeom.cxx
index 7f02013..7cd495e 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dgeom.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dgeom.cxx
@@ -106,7 +106,7 @@ BOOL GeometryIndexValueBucket::ImplCareForSpace() {
}
GeometryIndexValue& GeometryIndexValueBucket::operator[] (UINT32 nPos) {
if(nPos >= nCount) {
- DBG_ERROR("Access to Bucket out of range!");
+ OSL_FAIL("Access to Bucket out of range!");
return *((GeometryIndexValue*)aMemArray[0]);
}
return *((GeometryIndexValue*)(aMemArray[(UINT16)(nPos >> nBlockShift)] + ((nPos & nMask) << nShift)));
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
index 314083f..a25f24c 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
@@ -334,7 +334,7 @@ void B3dLightGroup::SetIntensity(const Color rNew,
}
#ifdef DBG_UTIL
else
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
@@ -351,7 +351,7 @@ const Color B3dLightGroup::GetIntensity(Base3DMaterialValue eMat,
{
eNum = Base3DLight0;
#ifdef DBG_UTIL
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
return aLight[eNum].GetIntensity(eMat);
@@ -372,7 +372,7 @@ void B3dLightGroup::SetPosition(const Vector3D& rNew, Base3DLightNumber eNum)
}
#ifdef DBG_UTIL
else
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
@@ -391,7 +391,7 @@ void B3dLightGroup::SetDirection(const Vector3D& rNew, Base3DLightNumber eNum)
}
#ifdef DBG_UTIL
else
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
@@ -407,7 +407,7 @@ const Vector3D& B3dLightGroup::GetDirection(Base3DLightNumber eNum)
{
eNum = Base3DLight0;
#ifdef DBG_UTIL
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
return aLight[eNum].GetPosition();
@@ -427,7 +427,7 @@ void B3dLightGroup::Enable(BOOL bNew, Base3DLightNumber eNum)
}
#ifdef DBG_UTIL
else
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
@@ -443,7 +443,7 @@ BOOL B3dLightGroup::IsEnabled(Base3DLightNumber eNum)
{
eNum = Base3DLight0;
#ifdef DBG_UTIL
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
return aLight[eNum].IsEnabled();
@@ -461,7 +461,7 @@ B3dLight& B3dLightGroup::GetLightObject(Base3DLightNumber eNum)
{
eNum = Base3DLight0;
#ifdef DBG_UTIL
- DBG_ERROR("Access to Light out of range");
+ OSL_FAIL("Access to Light out of range");
#endif
}
return aLight[eNum];
diff --git a/binfilter/bf_goodies/source/base3d/goodies_hmatrix.cxx b/binfilter/bf_goodies/source/base3d/goodies_hmatrix.cxx
index 010b7d4..d592c45 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_hmatrix.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_hmatrix.cxx
@@ -683,18 +683,18 @@ void Matrix4D::Ortho(double fLeft, double fRight, double fBottom,
{
if(fNear == fFar)
{
- DBG_ERROR("Near and far clipping plane in Ortho definition are identical");
+ OSL_FAIL("Near and far clipping plane in Ortho definition are identical");
fFar = fNear + 1.0;
}
if(fLeft == fRight)
{
- DBG_ERROR("Left and right in Ortho definition are identical");
+ OSL_FAIL("Left and right in Ortho definition are identical");
fLeft -= 1.0;
fRight += 1.0;
}
if(fTop == fBottom)
{
- DBG_ERROR("Top and bottom in Ortho definition are identical");
+ OSL_FAIL("Top and bottom in Ortho definition are identical");
fBottom -= 1.0;
fTop += 1.0;
}
diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
index ee7449f..3acdd33 100644
--- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
@@ -457,7 +457,7 @@ namespace binfilter {
/*N*/ USHORT nStart=0;
/*N*/ if (!Search( nStartRow, nPos ))
/*N*/ {
-/*N*/ DBG_ERROR("Search-Fehler");
+/*N*/ OSL_FAIL("Search-Fehler");
/*N*/ return;
/*N*/ }
/*N*/
@@ -540,7 +540,7 @@ namespace binfilter {
/*N*/ USHORT nStart=0;
/*N*/ if (!Search( nStartRow, nPos ))
/*N*/ {
-/*N*/ DBG_ERROR("Search-Fehler");
+/*N*/ OSL_FAIL("Search-Fehler");
/*N*/ return;
/*N*/ }
/*N*/
@@ -666,7 +666,7 @@ namespace binfilter {
/*N*/ USHORT nStart=0;
/*N*/ if (!Search( nStartRow, nPos ))
/*N*/ {
-/*N*/ DBG_ERROR("Search-Fehler");
+/*N*/ OSL_FAIL("Search-Fehler");
/*N*/ return;
/*N*/ }
/*N*/
@@ -1609,7 +1609,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (!pNewPattern)
/*N*/ {
/*?*/ // da is was schiefgelaufen
-/*?*/ DBG_ERROR("ScAttrArray::Load: Surrogat nicht im Pool");
+/*?*/ OSL_FAIL("ScAttrArray::Load: Surrogat nicht im Pool");
/*?*/ pNewPattern = pDocument->GetDefPattern();
/*N*/ }
/*N*/ ScDocumentPool::CheckRef( *pNewPattern );
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index 050b851..b0593cb 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -234,7 +234,7 @@ using namespace ::com::sun::star;
/*N*/ case MID_4 :
/*N*/ rVal <<= (sal_Bool ) bHidePrint; break;
/*N*/ default:
-/*N*/ DBG_ERROR("Wrong MemberID!");
+/*N*/ OSL_FAIL("Wrong MemberID!");
/*N*/ return false;
/*N*/ }
/*N*/
@@ -260,7 +260,7 @@ using namespace ::com::sun::star;
/*N*/ bRet = true;
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("exception - wrong argument");
+/*N*/ OSL_FAIL("exception - wrong argument");
/*N*/ break;
/*N*/ }
/*N*/ case MID_1 :
@@ -272,7 +272,7 @@ using namespace ::com::sun::star;
/*N*/ case MID_4 :
/*N*/ bRet = (rVal >>= bVal); if (bRet) bHidePrint=bVal; break;
/*N*/ default:
-/*N*/ DBG_ERROR("Wrong MemberID!");
+/*N*/ OSL_FAIL("Wrong MemberID!");
/*N*/ }
/*N*/
/*N*/ return bRet;
@@ -435,7 +435,7 @@ using namespace ::com::sun::star;
/*N*/ break;
/*N*/
/*N*/ default:
-/*N*/ DBG_ERROR( "ScRangeItem::Create: Unknown Version!" );
+/*N*/ OSL_FAIL( "ScRangeItem::Create: Unknown Version!" );
/*N*/ }
/*N*/
/*N*/ return ( new ScRangeItem( Which(), aNewRange, nNewFlags ) );
@@ -678,7 +678,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if (!bRet)
/*N*/ {
-/*N*/ DBG_ERROR("exception - wrong argument");
+/*N*/ OSL_FAIL("exception - wrong argument");
/*N*/ }
/*N*/
/*N*/ return bRet;
@@ -1029,7 +1029,7 @@ using namespace ::com::sun::star;
/*N*/ case SC_HF_CENTERAREA: delete pCenterArea; pCenterArea = pNew; break;
/*N*/ case SC_HF_RIGHTAREA: delete pRightArea; pRightArea = pNew; break;
/*N*/ default:
-/*N*/ DBG_ERROR( "New Area?" );
+/*N*/ OSL_FAIL( "New Area?" );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index de3a9ae..76bc4e7 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -119,7 +119,7 @@ static const sal_Char msgDbgInfinity[] =
/*N*/ case CELLTYPE_NOTE:
/*N*/ return new ScNoteCell(*(const ScNoteCell*)this);
/*N*/ default:
-/*N*/ DBG_ERROR("Unbekannter Zellentyp");
+/*N*/ OSL_FAIL("Unbekannter Zellentyp");
/*N*/ return NULL;
/*N*/ }
/*N*/ }
@@ -152,7 +152,7 @@ static const sal_Char msgDbgInfinity[] =
/*N*/ delete (ScNoteCell*) this;
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR("Unbekannter Zellentyp");
+/*N*/ OSL_FAIL("Unbekannter Zellentyp");
/*N*/ break;
/*N*/ }
/*N*/ }
@@ -518,7 +518,7 @@ static const sal_Char msgDbgInfinity[] =
/*N*/ return FALSE; // unterschiedlich lang oder unterschiedliche Tokens
/*N*/ }
/*N*/ default:
-/*N*/ DBG_ERROR("huch, was fuer Zellen???");
+/*N*/ OSL_FAIL("huch, was fuer Zellen???");
/*N*/ }
/*N*/ return FALSE;
/*N*/ }
@@ -918,7 +918,7 @@ static const sal_Char msgDbgInfinity[] =
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("ScFormulaCell::GetFormula: Keine Matrix");
+/*N*/ OSL_FAIL("ScFormulaCell::GetFormula: Keine Matrix");
/*N*/ }
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index a5c60bd..0c64d86 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -228,7 +228,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("ScFormulaCell::GetEnglishFormula: Keine Matrix");
+/*N*/ OSL_FAIL("ScFormulaCell::GetEnglishFormula: Keine Matrix");
/*N*/ }
/*N*/ }
/*N*/ else
@@ -285,7 +285,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*?*/ }
/*?*/ else
/*?*/ {
-/*?*/ DBG_ERROR("ScFormulaCell::GetEnglishFormula: Keine Matrix");
+/*?*/ OSL_FAIL("ScFormulaCell::GetEnglishFormula: Keine Matrix");
/*?*/ }
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sc/source/core/data/sc_column.cxx b/binfilter/bf_sc/source/core/data/sc_column.cxx
index ec3cadb..31263c6 100644
--- a/binfilter/bf_sc/source/core/data/sc_column.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column.cxx
@@ -359,7 +359,7 @@ namespace binfilter {
/*N*/ rFound = FALSE;
/*N*/ if (!rMark.IsMultiMarked())
/*N*/ {
-/*N*/ DBG_ERROR("ScColumn::GetSelectionStyle ohne Selektion");
+/*N*/ OSL_FAIL("ScColumn::GetSelectionStyle ohne Selektion");
/*N*/ return NULL;
/*N*/ }
/*N*/
@@ -784,7 +784,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("CopyToColumn: bMarked, aber keine Markierung");
+/*N*/ OSL_FAIL("CopyToColumn: bMarked, aber keine Markierung");
/*N*/ return;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx
index 19537d1..32e618b 100644
--- a/binfilter/bf_sc/source/core/data/sc_column2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column2.cxx
@@ -170,7 +170,7 @@ namespace binfilter {
/*N*/ }
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR( "Falscher Zellentyp" );
+/*N*/ OSL_FAIL( "Falscher Zellentyp" );
/*N*/ rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
/*N*/ return;
/*N*/ }
@@ -312,7 +312,7 @@ namespace binfilter {
/*?*/ rStream << (BYTE) CELLTYPE_NOTE;
/*?*/ ScNoteCell aDummyCell;
/*?*/ aDummyCell.Save( rStream );
-/*?*/ DBG_ERROR( "Falscher Zellentyp" );
+/*?*/ OSL_FAIL( "Falscher Zellentyp" );
/*?*/ }
/*?*/ break;
/*N*/ }
@@ -336,7 +336,7 @@ namespace binfilter {
/*N*/ pItems[nPos].pCell->LoadNote(rStream);
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("falsche Pos in ScColumn::LoadNotes");
+/*N*/ OSL_FAIL("falsche Pos in ScColumn::LoadNotes");
/*N*/ rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
/*N*/ }
/*N*/ }
@@ -495,7 +495,7 @@ namespace binfilter {
/*N*/ break;
/*N*/ default:
/*N*/ {
-/*N*/ DBG_ERROR("unbekannter Sub-Record in ScColumn::Load");
+/*N*/ OSL_FAIL("unbekannter Sub-Record in ScColumn::Load");
/*N*/ ScReadHeader aDummyHeader( rStream );
/*N*/ }
/*N*/ }
@@ -1597,10 +1597,10 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ // else
-/*N*/ // DBG_ERROR("ScColumn::EndListening - kein Broadcaster");
+/*N*/ // OSL_FAIL("ScColumn::EndListening - kein Broadcaster");
/*N*/ }
/*N*/ // else
-/*N*/ // DBG_ERROR("ScColumn::EndListening - keine Zelle");
+/*N*/ // OSL_FAIL("ScColumn::EndListening - keine Zelle");
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_conditio.cxx b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
index 9e387e5..b74a6d8 100644
--- a/binfilter/bf_sc/source/core/data/sc_conditio.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
@@ -686,7 +686,7 @@ namespace binfilter {
/*N*/ bValid = !::rtl::math::approxEqual( nComp1, 0.0 );
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR("unbekannte Operation bei ScConditionEntry");
+/*N*/ OSL_FAIL("unbekannte Operation bei ScConditionEntry");
/*N*/ break;
/*N*/ }
/*N*/ return bValid;
@@ -792,7 +792,7 @@ namespace binfilter {
/*N*/ pDoc->GetFormatTable()->GetInputLineString(nVal2, nNumFmt, aRet);
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("GetExpression: falscher Index");
+/*N*/ OSL_FAIL("GetExpression: falscher Index");
/*N*/
/*N*/ return aRet;
/*N*/ }
@@ -1329,7 +1329,7 @@ namespace binfilter {
/*N*/ if ((*this)[i]->GetKey() == nKey)
/*N*/ return (*this)[i];
/*N*/
-/*N*/ DBG_ERROR("ScConditionalFormatList: Eintrag nicht gefunden");
+/*N*/ OSL_FAIL("ScConditionalFormatList: Eintrag nicht gefunden");
/*N*/ return NULL;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_dociter.cxx b/binfilter/bf_sc/source/core/data/sc_dociter.cxx
index 52bcf77..57a7022 100644
--- a/binfilter/bf_sc/source/core/data/sc_dociter.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dociter.cxx
@@ -411,7 +411,7 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/
/*N*/ if (!pDoc->pTab[nTab])
/*N*/ {
-/*N*/ DBG_ERROR("Tabelle nicht gefunden");
+/*N*/ OSL_FAIL("Tabelle nicht gefunden");
/*N*/ nStartCol = nCol = MAXCOL+1;
/*N*/ nStartRow = nRow = MAXROW+1;
/*N*/ nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst
@@ -453,7 +453,7 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/
/*N*/ if (!pDoc->pTab[nTab])
/*N*/ {
-/*N*/ DBG_ERROR("Tabelle nicht gefunden");
+/*N*/ OSL_FAIL("Tabelle nicht gefunden");
/*N*/ nStartCol = nCol = MAXCOL+1;
/*N*/ nStartRow = nRow = MAXROW+1;
/*N*/ nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst
diff --git a/binfilter/bf_sc/source/core/data/sc_docpool.cxx b/binfilter/bf_sc/source/core/data/sc_docpool.cxx
index 85744d8..5a8e756 100644
--- a/binfilter/bf_sc/source/core/data/sc_docpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_docpool.cxx
@@ -556,7 +556,7 @@ namespace binfilter {
/*N*/ {
/*?*/ if ( nRef != (ULONG) SC_SAFE_POOLREF )
/*?*/ {
-/*?*/ DBG_ERROR("Wer fummelt da an meinen Ref-Counts herum");
+/*?*/ OSL_FAIL("Wer fummelt da an meinen Ref-Counts herum");
/*?*/ SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF );
/*?*/ }
/*?*/ return; // nicht herunterzaehlen
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 8019db3..060b87d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -692,7 +692,7 @@ namespace binfilter {
/*N*/ break;
/*N*/ default:
/*N*/ {
-/*N*/ DBG_ERROR("unbekannter Sub-Record in ScDocument::Load");
+/*N*/ OSL_FAIL("unbekannter Sub-Record in ScDocument::Load");
/*N*/ ScReadHeader aDummyHdr( rStream );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index fccf2fe..0fe5ed3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -395,7 +395,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
/*N*/ else
-/*?*/ DBG_ERROR("No Uno broadcaster");
+/*?*/ OSL_FAIL("No Uno broadcaster");
/*N*/ }
/*N*/ void ScDocument::BroadcastUno( const SfxHint &rHint )
@@ -494,7 +494,7 @@ using namespace ::com::sun::star;
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->UpdateOutlineCol( nStartCol, nEndCol, bShow );
/*N*/
-/*N*/ DBG_ERROR("missing tab");
+/*N*/ OSL_FAIL("missing tab");
/*N*/ return FALSE;
/*N*/ }
@@ -503,7 +503,7 @@ using namespace ::com::sun::star;
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->UpdateOutlineRow( nStartRow, nEndRow, bShow );
/*N*/
-/*N*/ DBG_ERROR("missing tab");
+/*N*/ OSL_FAIL("missing tab");
/*N*/ return FALSE;
/*N*/ }
@@ -523,7 +523,7 @@ using namespace ::com::sun::star;
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->CreateQueryParam(nCol1, nRow1, nCol2, nRow2, rQueryParam);
/*N*/
-/*N*/ DBG_ERROR("missing tab");
+/*N*/ OSL_FAIL("missing tab");
/*N*/ return FALSE;
/*N*/ }
@@ -549,7 +549,7 @@ using namespace ::com::sun::star;
/*N*/ ScTable* pTable = pTab[nTab];
/*N*/ if (!pTable)
/*N*/ {
-/*N*/ DBG_ERROR("GetRange ohne Tabelle");
+/*N*/ OSL_FAIL("GetRange ohne Tabelle");
/*N*/ return ScRange();
/*N*/ }
/*N*/
@@ -675,7 +675,7 @@ using namespace ::com::sun::star;
/*N*/ ScTable* pTable = pTab[nVisibleTab];
/*N*/ if (!pTable)
/*N*/ {
-/*N*/ DBG_ERROR("SetEmbedded ohne Tabelle");
+/*N*/ OSL_FAIL("SetEmbedded ohne Tabelle");
/*N*/ return;
/*N*/ }
/*N*/
@@ -721,7 +721,7 @@ using namespace ::com::sun::star;
/*N*/ if (pTab[nTab])
/*N*/ return pTab[nTab]->IsProtected();
/*N*/
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return FALSE;
/*N*/ }
@@ -736,7 +736,7 @@ using namespace ::com::sun::star;
/*N*/ if (pTab[nTab])
/*N*/ return pTab[nTab]->GetPassword();
/*N*/
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return aProtectPass;
/*N*/ }
@@ -800,7 +800,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ if (nTab > MAXTAB || !pTab[nTab])
/*N*/ {
-/*N*/ DBG_ERROR("GetMMRect: falsche Tabelle");
+/*N*/ OSL_FAIL("GetMMRect: falsche Tabelle");
/*N*/ return Rectangle(0,0,0,0);
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_documen4.cxx b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
index 64c1f5f..9aebbd9 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen4.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
@@ -125,7 +125,7 @@ namespace binfilter {
/*N*/ if (i == MAXTAB + 1)
/*N*/ {
/*N*/ Sound::Beep();
-/*N*/ DBG_ERROR("ScDocument::InsertMatrixFormula Keine Tabelle markiert");
+/*N*/ OSL_FAIL("ScDocument::InsertMatrixFormula Keine Tabelle markiert");
/*N*/ return;
/*N*/ }
/*N*/
@@ -241,7 +241,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (nTab<=MAXTAB && pTab[nTab])
/*N*/ pTab[nTab]->DoColResize( nCol1, nCol2, nAdd );
/*N*/ else
-/*N*/ DBG_ERROR("DoColResize: falsche Tabelle");
+/*N*/ OSL_FAIL("DoColResize: falsche Tabelle");
/*N*/ }
/*N*/ void ScDocument::InvalidateTableArea()
@@ -407,7 +407,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (pCondFormList)
/*N*/ return pCondFormList->GetFormat( nIndex );
/*N*/ else
-/*N*/ DBG_ERROR("pCondFormList ist 0");
+/*N*/ OSL_FAIL("pCondFormList ist 0");
/*N*/ }
/*N*/
/*N*/ return NULL;
diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
index 1f2c329..aefc868 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
@@ -85,7 +85,7 @@ namespace binfilter {
/*N*/
/*N*/ if ( pDocOptions->GetStdPrecision() > 20 ) //!!! ist 20 als Maximum konstant ???
/*N*/ {
-/*?*/ DBG_ERROR( "Document options corrupted. Setting to defaults." );
+/*?*/ OSL_FAIL( "Document options corrupted. Setting to defaults." );
/*?*/ pDocOptions->ResetDocOptions();
/*N*/ }
/*N*/
@@ -605,7 +605,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ if (!pShell)
/*N*/ {
-/*N*/ DBG_ERROR("AreaLinks koennen nicht ohne Shell geladen werden");
+/*N*/ OSL_FAIL("AreaLinks koennen nicht ohne Shell geladen werden");
/*N*/ return;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
index 7a9c88b..471336e 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
@@ -226,7 +226,7 @@ namespace binfilter {
/*?*/ // Manchmal sind beim Kopieren/Verschieben/Undo von Tabellen zuviele
/*?*/ // (leere) Pages in der Tabelle stehengeblieben. Weg damit!
/*?*/
-/*?*/ DBG_ERROR("zuviele Draw-Pages in der Datei");
+/*?*/ OSL_FAIL("zuviele Draw-Pages in der Datei");
/*?*/
/*?*/ for (USHORT i=nTableCount; i<nPageCount; i++)
/*?*/ pDrawLayer->DeletePage(nTableCount);
@@ -247,7 +247,7 @@ namespace binfilter {
/*N*/ if ( pObject->ISA(SdrUnoObj) && pObject->GetLayer() != SC_LAYER_CONTROLS )
/*N*/ {
/*?*/ pObject->NbcSetLayer(SC_LAYER_CONTROLS);
-/*?*/ DBG_ERROR("Control war auf falschem Layer");
+/*?*/ OSL_FAIL("Control war auf falschem Layer");
/*N*/ }
/*N*/ pObject = aIter.Next();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index bec4729..8785366 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -845,7 +845,7 @@ namespace binfilter {
/*N*/ nMaxTableNumber = nTab2 + 1;
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("InitUndo");
+/*N*/ OSL_FAIL("InitUndo");
/*N*/ }
/*N*/ void ScDocument::CopyToDocument(USHORT nCol1, USHORT nRow1, USHORT nTab1,
@@ -1383,7 +1383,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ rpCell = pTab[nTab]->GetCell( nCol, nRow );
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("GetCell ohne Tabelle");
+/*N*/ OSL_FAIL("GetCell ohne Tabelle");
/*N*/ rpCell = NULL;
/*N*/ }
/*N*/ }
@@ -1395,7 +1395,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if ( pTab[nTab] )
/*N*/ return pTab[nTab]->GetCell( rPos );
/*N*/
-/*N*/ DBG_ERROR("GetCell ohne Tabelle");
+/*N*/ OSL_FAIL("GetCell ohne Tabelle");
/*N*/ return NULL;
/*N*/ }
@@ -1583,7 +1583,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetColWidth( nCol );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1592,7 +1592,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetOriginalWidth( nCol );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1603,7 +1603,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetOriginalHeight( nRow );
-/*N*/ DBG_ERROR("Wrong table number");
+/*N*/ OSL_FAIL("Wrong table number");
/*N*/ return 0;
/*N*/ }
@@ -1612,7 +1612,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetRowHeight( nRow );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1621,7 +1621,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetHiddenRowCount( nRow );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1639,7 +1639,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetOptimalColWidth( nCol, pDev, nPPTX, nPPTY,
/*N*/ rZoomX, rZoomY, bFormula, pMarkData, bSimpleTextImport );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1656,7 +1656,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->SetOptimalHeight( nStartRow, nEndRow, nExtra,
/*N*/ pDev, nPPTX, nPPTY, rZoomX, rZoomY, bShrink );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return FALSE;
/*N*/ }
@@ -1692,7 +1692,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetColFlags( nCol );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1700,7 +1700,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetRowFlags( nRow );
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ return 0;
/*N*/ }
@@ -1825,7 +1825,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (pTemp)
/*N*/ return pTemp;
/*N*/ else
-/*N*/ DBG_ERROR( "Attribut Null" );
+/*N*/ OSL_FAIL( "Attribut Null" );
/*N*/ }
/*N*/ return &xPoolHelper->GetDocPool()->GetDefaultItem( nWhich );
/*N*/ }
@@ -1985,7 +1985,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (pTab[nTab])
/*N*/ return pTab[nTab]->ApplyFlags( nStartCol, nStartRow, nEndCol, nEndRow, nFlags );
/*N*/
-/*N*/ DBG_ERROR("ApplyFlags: falsche Tabelle");
+/*N*/ OSL_FAIL("ApplyFlags: falsche Tabelle");
/*N*/ return FALSE;
/*N*/ }
@@ -2149,7 +2149,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if ( nTab <= MAXTAB && pTab[nTab] )
/*N*/ pTab[nTab]->LockTable();
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ }
@@ -2158,7 +2158,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if ( nTab <= MAXTAB && pTab[nTab] )
/*N*/ pTab[nTab]->UnlockTable();
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ }
@@ -2179,7 +2179,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return pTab[nTab]->IsBlockEditable( nStartCol, nStartRow, nEndCol,
/*N*/ nEndRow, pOnlyNotBecauseOfMatrix );
/*N*/
-/*N*/ DBG_ERROR("Falsche Tabellennummer");
+/*N*/ OSL_FAIL("Falsche Tabellennummer");
/*N*/ if ( pOnlyNotBecauseOfMatrix )
/*N*/ *pOnlyNotBecauseOfMatrix = FALSE;
/*N*/ return FALSE;
@@ -2333,7 +2333,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("ExtendOverlapped: falscher Bereich");
+/*N*/ OSL_FAIL("ExtendOverlapped: falscher Bereich");
/*N*/
/*N*/ return bFound;
/*N*/ }
@@ -2353,7 +2353,7 @@ DBG_BF_ASSERT(0, "STRIP");
DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("ExtendMerge: falscher Bereich");
+/*N*/ OSL_FAIL("ExtendMerge: falscher Bereich");
/*N*/
/*N*/ return bFound;
/*N*/ }
@@ -2682,7 +2682,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ xPoolHelper->GetEditPool()->Load( rStream );
/*N*/ break;
/*?*/ default:
-/*?*/ DBG_ERROR("unbekannter Sub-Record in ScDocument::LoadPool");
+/*?*/ OSL_FAIL("unbekannter Sub-Record in ScDocument::LoadPool");
/*N*/ }
/*N*/ }
/*N*/
@@ -2690,7 +2690,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ bRet = TRUE;
/*N*/ }
/*N*/ else
-/*?*/ DBG_ERROR("LoadPool: SCID_POOLS nicht gefunden");
+/*?*/ OSL_FAIL("LoadPool: SCID_POOLS nicht gefunden");
/*N*/
/*N*/ if (!bStylesFound)
/*?*/ xPoolHelper->GetStylePool()->CreateStandardStyles();
@@ -2837,7 +2837,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if ( nTab <= MAXTAB && pTab[nTab] )
/*N*/ return pTab[nTab]->GetPageSize();
/*N*/
-/*N*/ DBG_ERROR("falsche Tab");
+/*N*/ OSL_FAIL("falsche Tab");
/*N*/ return Size();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index ef885bc..cb6626a 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -271,7 +271,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ DBG_ASSERT( !pImpDesc && !pServDesc, "DPSource could not be created" );
/*N*/ if (!pSheetDesc)
/*N*/ {
-/*?*/ DBG_ERROR("no source descriptor");
+/*?*/ OSL_FAIL("no source descriptor");
/*?*/ pSheetDesc = new ScSheetSourceDesc; // dummy defaults
/*N*/ }
/*N*/ ScSheetDPData* pData = new ScSheetDPData( pDoc, *pSheetDesc );
@@ -294,7 +294,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*?*/ catch(uno::Exception&)
/*?*/ {
-/*?*/ DBG_ERROR("exception in refresh");
+/*?*/ OSL_FAIL("exception in refresh");
/*?*/ }
/*?*/ }
/*?*/
@@ -367,7 +367,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/
-/*?*/ DBG_ERROR("FirstSubTotal: NULL");
+/*?*/ OSL_FAIL("FirstSubTotal: NULL");
/*?*/ return 0;
/*N*/ }
@@ -567,7 +567,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (!pSheetDesc)
/*N*/ {
-/*N*/ DBG_ERROR("no source descriptor");
+/*N*/ OSL_FAIL("no source descriptor");
/*N*/ ((ScDPObject*)this)->pSheetDesc = new ScSheetSourceDesc; // dummy defaults
/*N*/ }
/*N*/
@@ -629,7 +629,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ break;
/*N*/
/*N*/ default:
-/*N*/ DBG_ERROR("unknown source type");
+/*N*/ OSL_FAIL("unknown source type");
/*N*/ }
/*N*/
/*N*/ rStream >> aOutRange;
@@ -1005,7 +1005,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ if ( nVer != SC_DP_VERSION_CURRENT )
/*N*/ {
-/*N*/ DBG_ERROR("skipping unknown version of data pilot obejct");
+/*N*/ OSL_FAIL("skipping unknown version of data pilot obejct");
/*N*/ if ( rStream.GetError() == SVSTREAM_OK )
/*N*/ rStream.SetError( SCWARN_IMPORT_INFOLOST );
/*N*/ return FALSE;
diff --git a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
index e75680b..be09ce1 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
@@ -794,7 +794,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
-/*N*/ DBG_ERROR("exception in WriteToSource");
+/*N*/ OSL_FAIL("exception in WriteToSource");
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index 7f89cf0..66c2cbd 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -134,7 +134,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else if ( nColumn >= pImpl->nColCount )
/*N*/ {
-/*?*/ DBG_ERROR("getDimensionName: invalid dimension");
+/*?*/ OSL_FAIL("getDimensionName: invalid dimension");
/*?*/ return String();
/*N*/ }
/*N*/ else
@@ -167,7 +167,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else if ( nDim >= pImpl->nColCount )
/*N*/ {
-/*?*/ DBG_ERROR("IsDateDimension: invalid dimension");
+/*?*/ OSL_FAIL("IsDateDimension: invalid dimension");
/*?*/ return FALSE;
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
index 7b4a9f1..43dce69 100644
--- a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
@@ -281,7 +281,7 @@ using namespace ::com::sun::star;
/*?*/ }
/*?*/ }
/*?*/
-/*?*/ DBG_ERROR("GetSourceDim: wrong dim");
+/*?*/ OSL_FAIL("GetSourceDim: wrong dim");
/*?*/ return nDim;
/*N*/ }
@@ -297,13 +297,13 @@ using namespace ::com::sun::star;
/*?*/ void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& )
/*?*/ throw(uno::RuntimeException)
/*?*/ {
-/*?*/ DBG_ERROR("not implemented"); //! exception?
+/*?*/ OSL_FAIL("not implemented"); //! exception?
/*?*/ }
/*?*/ void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& )
/*?*/ throw(uno::RuntimeException)
/*?*/ {
-/*?*/ DBG_ERROR("not implemented"); //! exception?
+/*?*/ OSL_FAIL("not implemented"); //! exception?
/*?*/ }
@@ -379,7 +379,7 @@ using namespace ::com::sun::star;
/*N*/ setRepeatIfEmpty( lcl_GetBoolFromAny( aValue ) );
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("unknown property");
+/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
/*N*/ }
/*N*/ }
@@ -402,7 +402,7 @@ using namespace ::com::sun::star;
/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("unknown property");
+/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
/*N*/ }
/*N*/ return aRet;
@@ -647,7 +647,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("unknown property");
+/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
/*N*/ }
/*N*/ }
@@ -685,7 +685,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("unknown property");
+/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
/*N*/ }
/*N*/ return aRet;
@@ -859,7 +859,7 @@ using namespace ::com::sun::star;
/*?*/ void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& ) throw(uno::RuntimeException)
/*?*/ {
-/*?*/ DBG_ERROR("not implemented"); //! exception?
+/*?*/ OSL_FAIL("not implemented"); //! exception?
/*?*/ }
// -----------------------------------------------------------------------
@@ -883,7 +883,7 @@ using namespace ::com::sun::star;
/*?*/ case SC_DAPI_HIERARCHY_QUARTER: nLevCount = SC_DAPI_QUARTER_LEVELS; break;
/*?*/ case SC_DAPI_HIERARCHY_WEEK: nLevCount = SC_DAPI_WEEK_LEVELS; break;
/*?*/ default:
-/*?*/ DBG_ERROR("wrong hierarchy");
+/*?*/ OSL_FAIL("wrong hierarchy");
/*?*/ nLevCount = 0;
/*?*/ }
/*N*/ }
@@ -1063,7 +1063,7 @@ using namespace ::com::sun::star;
/*?*/ void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& ) throw(uno::RuntimeException)
/*?*/ {
-/*?*/ DBG_ERROR("not implemented"); //! exception?
+/*?*/ OSL_FAIL("not implemented"); //! exception?
/*?*/ }
/*N*/ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const
@@ -1118,7 +1118,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("unknown property");
+/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
/*N*/ }
/*N*/ }
@@ -1138,7 +1138,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR("unknown property");
+/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
/*N*/ }
/*N*/ return aRet;
diff --git a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
index a3f61aa..418fd19 100644
--- a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
@@ -323,7 +323,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ break;
/*N*/ default:
/*N*/ {
-/*N*/ DBG_ERROR("unbekannter Sub-Record in ScDrawLayer::Load");
+/*N*/ OSL_FAIL("unbekannter Sub-Record in ScDrawLayer::Load");
/*N*/ ScReadHeader aDummyHdr( rStream );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx b/binfilter/bf_sc/source/core/data/sc_global.cxx
index ab3e165..0d4e674 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -466,14 +466,14 @@ void global_InitAppOptions();
/*N*/ {
/*N*/ if (!pPool)
/*N*/ {
-/*?*/ DBG_ERROR("kein Pool bei ScGlobal::InitTextHeight");
+/*?*/ OSL_FAIL("kein Pool bei ScGlobal::InitTextHeight");
/*?*/ return;
/*N*/ }
/*N*/
/*N*/ const ScPatternAttr* pPattern = (const ScPatternAttr*)&pPool->GetDefaultItem(ATTR_PATTERN);
/*N*/ if (!pPattern)
/*N*/ {
-/*?*/ DBG_ERROR("kein Default-Pattern bei ScGlobal::InitTextHeight");
+/*?*/ OSL_FAIL("kein Default-Pattern bei ScGlobal::InitTextHeight");
/*?*/ return;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index 0c79d83..5faae84 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -450,7 +450,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& /*rOther*/ ) const
/*N*/
/*N*/ if ( nEntryCount < MAXQUERY )
/*N*/ {
-/*N*/ DBG_ERROR("ScQueryParam::Store - zuwenig Eintraege");
+/*N*/ OSL_FAIL("ScQueryParam::Store - zuwenig Eintraege");
/*N*/ ((ScQueryParam*)this)->Resize( MAXQUERY );
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
index fa7b810..b3f13c5 100644
--- a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
@@ -92,7 +92,7 @@ namespace binfilter {
/*N*/ short nNewPos = ((short) nStart) + nDelta;
/*N*/ if (nNewPos<0)
/*N*/ {
-/*N*/ DBG_ERROR("OutlineEntry < 0");
+/*N*/ OSL_FAIL("OutlineEntry < 0");
/*N*/ nNewPos = 0;
/*N*/ }
/*N*/ nStart = (USHORT) nNewPos;
@@ -103,7 +103,7 @@ namespace binfilter {
/*N*/ if (nNewSize)
/*N*/ nSize = nNewSize;
/*N*/ else
-/*N*/ DBG_ERROR("ScOutlineEntry Size == 0");
+/*N*/ OSL_FAIL("ScOutlineEntry Size == 0");
/*N*/ }
/*N*/ void ScOutlineEntry::SetPosSize( USHORT nNewPos, USHORT nNewSize )
@@ -589,12 +589,12 @@ namespace binfilter {
/*N*/ {
/*N*/ if (nSubLevel >= nDepth)
/*N*/ {
-/*N*/ DBG_ERROR("ScSubOutlineIterator::DeleteLast nach Ende");
+/*N*/ OSL_FAIL("ScSubOutlineIterator::DeleteLast nach Ende");
/*N*/ return;
/*N*/ }
/*N*/ if (nSubEntry == 0)
/*N*/ {
-/*N*/ DBG_ERROR("ScSubOutlineIterator::DeleteLast vor GetNext");
+/*N*/ OSL_FAIL("ScSubOutlineIterator::DeleteLast vor GetNext");
/*N*/ return;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_patattr.cxx b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
index d326645..6706f2b 100644
--- a/binfilter/bf_sc/source/core/data/sc_patattr.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
@@ -866,7 +866,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ {
/*N*/ if ( !pSrcStyle || !pDestPool || !pSrcPool )
/*N*/ {
-/*N*/ DBG_ERROR( "CopyStyleToPool: Invalid Arguments :-/" );
+/*N*/ OSL_FAIL( "CopyStyleToPool: Invalid Arguments :-/" );
/*N*/ return NULL;
/*N*/ }
/*N*/
@@ -1075,7 +1075,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR( "ScPatternAttr::SetStyleSheet( NULL ) :-|" );
+/*N*/ OSL_FAIL( "ScPatternAttr::SetStyleSheet( NULL ) :-|" );
/*N*/ GetItemSet().SetParent(NULL);
/*N*/ pStyle = NULL;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
index 5671f59..13e2eb4 100644
--- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
@@ -814,7 +814,7 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ if (!(pDataList->AtInsert(pDataList->GetCount(), pStrData)))
/*N*/ {
/*?*/ delete pStrData;
-/*?*/ DBG_ERROR("Fehler bei pDataList->AtInsert");
+/*?*/ OSL_FAIL("Fehler bei pDataList->AtInsert");
/*N*/ }
/*N*/
/*N*/ ++nDataCount;
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index ba59bef..66f1045 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -114,7 +114,7 @@ namespace binfilter {
/*N*/
/*N*/ if ( rName.EqualsAscii(STRING_STANDARD) && Find( rName, eFam ) != NULL )
/*N*/ {
-/*?*/ DBG_ERROR("renaming additional default style");
+/*?*/ OSL_FAIL("renaming additional default style");
/*?*/ size_t nCount = aStyles.size();
/*?*/ for ( size_t nAdd = 1; nAdd <= nCount; nAdd++ )
/*?*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index f16f8dd..9d27665 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -690,7 +690,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( !pColFlags || !pRowFlags )
/*N*/ {
-/*N*/ DBG_ERROR("keine ColInfo oder RowInfo in ExtendPrintArea");
+/*N*/ OSL_FAIL("keine ColInfo oder RowInfo in ExtendPrintArea");
/*N*/ return;
/*N*/ }
/*N*/
@@ -812,7 +812,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (nPos < nPrintRangeCount && pPrintRanges)
/*N*/ pPrintRanges[nPos] = rNew;
/*N*/ else
-/*N*/ DBG_ERROR("SetPrintRange falsch");
+/*N*/ OSL_FAIL("SetPrintRange falsch");
/*N*/ }
/*N*/ const ScRange* ScTable::GetPrintRange(USHORT nPos) const
diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx
index cd8a4a1..9bcc21a 100644
--- a/binfilter/bf_sc/source/core/data/sc_table2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx
@@ -530,7 +530,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (ValidColRow( nCol, nRow ))
/*N*/ return aCol[nCol].GetCell( nRow );
/*N*/
-/*N*/ DBG_ERROR("GetCell ausserhalb");
+/*N*/ OSL_FAIL("GetCell ausserhalb");
/*N*/ return NULL;
/*N*/ }
@@ -868,7 +868,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (nLockCount)
/*N*/ --nLockCount;
/*N*/ else
-/*N*/ DBG_ERROR("UnlockTable ohne LockTable");
+/*N*/ OSL_FAIL("UnlockTable ohne LockTable");
/*N*/ }
@@ -1074,7 +1074,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (!nNewWidth)
/*N*/ {
-/*N*/ // DBG_ERROR("Spaltenbreite 0 in SetColWidth");
+/*N*/ // OSL_FAIL("Spaltenbreite 0 in SetColWidth");
/*N*/ nNewWidth = STD_COL_WIDTH;
/*N*/ }
/*N*/
@@ -1090,7 +1090,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Spaltennummer oder keine Breiten");
+/*N*/ OSL_FAIL("Falsche Spaltennummer oder keine Breiten");
/*N*/ }
@@ -1100,7 +1100,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (!nNewHeight)
/*N*/ {
-/*?*/ DBG_ERROR("Zeilenhoehe 0 in SetRowHeight");
+/*?*/ OSL_FAIL("Zeilenhoehe 0 in SetRowHeight");
/*?*/ nNewHeight = ScGlobal::nStdRowHeight;
/*N*/ }
/*N*/
@@ -1116,7 +1116,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Zeilennummer oder keine Hoehen");
+/*N*/ OSL_FAIL("Falsche Zeilennummer oder keine Hoehen");
/*N*/ }
@@ -1129,7 +1129,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ nRecalcLvl++;
/*N*/ if (!nNewHeight)
/*N*/ {
-/*?*/ DBG_ERROR("Zeilenhoehe 0 in SetRowHeight");
+/*?*/ OSL_FAIL("Zeilenhoehe 0 in SetRowHeight");
/*?*/ nNewHeight = ScGlobal::nStdRowHeight;
/*N*/ }
/*N*/
@@ -1190,7 +1190,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ SetDrawPageSize();
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Zeilennummer oder keine Hoehen");
+/*N*/ OSL_FAIL("Falsche Zeilennummer oder keine Hoehen");
/*N*/
/*N*/ return bChanged;
/*N*/ }
@@ -1209,7 +1209,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ pRowFlags[nRow] &= ~CR_MANUALSIZE;
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Zeilennummer oder keine Zeilenflags");
+/*N*/ OSL_FAIL("Falsche Zeilennummer oder keine Zeilenflags");
/*N*/ }
@@ -1316,7 +1316,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Spaltennummer oder keine Flags");
+/*N*/ OSL_FAIL("Falsche Spaltennummer oder keine Flags");
/*N*/ }
@@ -1376,7 +1376,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (VALIDROW(nRow) && pRowFlags)
/*N*/ return ( pRowFlags[nRow] & CR_FILTERED ) != 0;
/*N*/
-/*N*/ DBG_ERROR("Falsche Zeilennummer oder keine Flags");
+/*N*/ OSL_FAIL("Falsche Zeilennummer oder keine Flags");
/*N*/ return FALSE;
/*N*/ }
@@ -1388,7 +1388,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (VALIDROW(nRow) && pRowFlags)
/*N*/ pRowFlags[nRow] = nNewFlags;
/*N*/ else
-/*N*/ DBG_ERROR("Falsche Zeilennummer oder keine Flags");
+/*N*/ OSL_FAIL("Falsche Zeilennummer oder keine Flags");
/*N*/ }
@@ -1688,7 +1688,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ break;
/*N*/ default:
/*N*/ {
-/*N*/ DBG_ERROR("unbekannter Sub-Record in ScTable::Load");
+/*N*/ OSL_FAIL("unbekannter Sub-Record in ScTable::Load");
/*N*/ ScReadHeader aDummyHeader( rStream );
/*N*/ }
/*N*/ }
@@ -1947,7 +1947,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ n += *pHeight;
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("GetRowOffset: Daten fehlen");
+/*N*/ OSL_FAIL("GetRowOffset: Daten fehlen");
/*N*/ return n;
/*N*/ }
@@ -1965,7 +1965,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ n += *pWidth;
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("GetColumnOffset: Daten fehlen");
+/*N*/ OSL_FAIL("GetColumnOffset: Daten fehlen");
/*N*/ return n;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_table5.cxx b/binfilter/bf_sc/source/core/data/sc_table5.cxx
index a5e189c..1f47af3 100644
--- a/binfilter/bf_sc/source/core/data/sc_table5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table5.cxx
@@ -57,7 +57,7 @@ namespace binfilter {
/*N*/ Find( aPageStyle, SFX_STYLE_FAMILY_PAGE );
/*N*/ if ( !pStyle )
/*N*/ {
-/*N*/ DBG_ERROR("UpdatePageBreaks: Style nicht gefunden");
+/*N*/ OSL_FAIL("UpdatePageBreaks: Style nicht gefunden");
/*N*/ return;
/*N*/ }
/*N*/ SfxItemSet* pStyleSet = &pStyle->GetItemSet();
diff --git a/binfilter/bf_sc/source/core/data/sc_userdat.cxx b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
index 61345c6..0b7db40 100644
--- a/binfilter/bf_sc/source/core/data/sc_userdat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
@@ -313,7 +313,7 @@ namespace binfilter {
/*N*/ else if ( pObjFactory->nIdentifier == SC_UD_IMAPDATA )
/*N*/ pObjFactory->pNewData = new ScIMapInfo;
/*N*/ else
-/*N*/ DBG_ERROR("MakeUserData: falsche ID");
+/*N*/ OSL_FAIL("MakeUserData: falsche ID");
/*N*/ }
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_validat.cxx b/binfilter/bf_sc/source/core/data/sc_validat.cxx
index 69ace85..9ab5dbd 100644
--- a/binfilter/bf_sc/source/core/data/sc_validat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_validat.cxx
@@ -250,7 +250,7 @@ namespace binfilter {
/*N*/ if ((*this)[i]->GetKey() == nKey)
/*N*/ return (*this)[i];
/*N*/
-/*N*/ DBG_ERROR("ScValidationDataList: Eintrag nicht gefunden");
+/*N*/ OSL_FAIL("ScValidationDataList: Eintrag nicht gefunden");
/*N*/ return NULL;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 4c5565f..702a143 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -778,12 +778,12 @@ public:
/*N*/ if ( nVarPos < aVarArg.getLength() )
/*N*/ aVarArg.getArray()[nVarPos] = rValue;
/*N*/ else
-/*N*/ DBG_ERROR("wrong argument number");
+/*N*/ OSL_FAIL("wrong argument number");
/*N*/ }
/*N*/ else if ( nPos < aArgs.getLength() )
/*N*/ aArgs.getArray()[nPos] = rValue;
/*N*/ else
-/*N*/ DBG_ERROR("wrong argument number");
+/*N*/ OSL_FAIL("wrong argument number");
/*N*/ }
/*N*/ }
@@ -812,7 +812,7 @@ public:
/*N*/ long nCallPos = pFuncData->GetCallerPos();
/*N*/ if (nCallPos>nUserLen) // should not happen
/*N*/ {
-/*N*/ DBG_ERROR("wrong CallPos");
+/*N*/ OSL_FAIL("wrong CallPos");
/*N*/ nCallPos = nUserLen;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
index cfcb1c5..adb7603 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
@@ -659,7 +659,7 @@ namespace binfilter {
/*N*/ SetExtraStrings( *pMemChart );
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("SchDLL::NewMemChart gibt 0 zurueck!");
+/*N*/ OSL_FAIL("SchDLL::NewMemChart gibt 0 zurueck!");
/*N*/
/*N*/ // Aufraeumen
/*N*/
@@ -823,7 +823,7 @@ namespace binfilter {
/*N*/ SetExtraStrings( *pMemChart );
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR("SchDLL::NewMemChart gibt 0 zurueck!");
+/*N*/ OSL_FAIL("SchDLL::NewMemChart gibt 0 zurueck!");
/*N*/
/*N*/ return pMemChart;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index 8c042c4..97bd41c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -485,7 +485,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ ((ScFormulaCell*)pCell)->Save( rStrm, rHdr );
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR( "ScChangeAction::StoreCell: unknown CellType" );
+/*N*/ OSL_FAIL( "ScChangeAction::StoreCell: unknown CellType" );
/*N*/ rStrm << (BYTE) CELLTYPE_NONE;
/*N*/ }
/*N*/ }
@@ -530,7 +530,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ pCell = NULL;
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR( "ScChangeAction::LoadCell: unknown CellType" );
+/*N*/ OSL_FAIL( "ScChangeAction::LoadCell: unknown CellType" );
/*N*/ rStrm.SetError( SVSTREAM_FILEFORMAT_ERROR );
/*N*/ pCell = NULL;
/*N*/ }
@@ -670,7 +670,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ if ( pContent )
/*N*/ pOfAction->AddContent( pContent );
/*N*/ else
-/*N*/ DBG_ERROR( "ScChangeActionDel::LoadLinks: missing Content" );
+/*N*/ OSL_FAIL( "ScChangeActionDel::LoadLinks: missing Content" );
/*N*/ }
/*N*/ }
/*N*/ return TRUE;
@@ -702,7 +702,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ aBigRange.aEnd.SetRow( nInt32Max );
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR( "ScChangeActionIns: Block not supported!" );
+/*N*/ OSL_FAIL( "ScChangeActionIns: Block not supported!" );
/*N*/ }
@@ -823,7 +823,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ aBigRange.aEnd.SetRow( nInt32Max );
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR( "ScChangeActionDel: Block not supported!" );
+/*N*/ OSL_FAIL( "ScChangeActionDel: Block not supported!" );
/*N*/ }
@@ -1840,7 +1840,7 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ pCell->GetFormula( rStr );
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR( "ScChangeActionContent::GetFormulaString: aPos != pCell->aPos" );
+/*N*/ OSL_FAIL( "ScChangeActionContent::GetFormulaString: aPos != pCell->aPos" );
/*N*/ ScFormulaCell* pNew = (ScFormulaCell*) pCell->Clone(
/*N*/ pCell->GetDocument(), aPos, TRUE ); // TRUE: bNoListening
/*N*/ pNew->GetFormula( rStr );
@@ -2417,7 +2417,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ pAct = new ScChangeActionContent( rStrm, aHdr, pDoc, nVer, this );
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR( "ScChangeTrack::Load: unknown GeneratedType" );
+/*N*/ OSL_FAIL( "ScChangeTrack::Load: unknown GeneratedType" );
/*N*/ pAct = NULL;
/*N*/ bOk = FALSE;
/*N*/ }
@@ -2479,7 +2479,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ pAct = new ScChangeActionReject( rStrm, aHdr, this );
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR( "ScChangeTrack::Load: unknown ScChangeActionType" );
+/*N*/ OSL_FAIL( "ScChangeTrack::Load: unknown ScChangeActionType" );
/*N*/ pAct = NULL;
/*N*/ bOk = FALSE;
/*N*/ }
@@ -2811,7 +2811,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ }
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR( "ScChangeTrack::AppendDeleteRange: Block not supported!" );
+/*N*/ OSL_FAIL( "ScChangeTrack::AppendDeleteRange: Block not supported!" );
/*N*/ SetInDeleteTop( FALSE );
/*N*/ }
/*N*/ }
@@ -3269,7 +3269,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ ((ScChangeActionMove*)pAct)->GetDelta( nDx, nDy, nDz );
/*N*/ break;
/*N*/ default:
-/*N*/ DBG_ERROR( "ScChangeTrack::UpdateReference: unknown Type" );
+/*N*/ OSL_FAIL( "ScChangeTrack::UpdateReference: unknown Type" );
/*N*/ }
/*N*/ if ( bUndo )
/*N*/ {
@@ -3852,7 +3852,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ delete pReject;
/*N*/ }
/*N*/ else
-/*N*/ DBG_ERROR( "ScChangeTrack::Reject: say what?" );
+/*N*/ OSL_FAIL( "ScChangeTrack::Reject: say what?" );
/*N*/
/*N*/ return bRejected;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index 005fc13..551be6b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -3022,7 +3022,7 @@ namespace binfilter {
/*N*/ rBuffer.append(pSymbolTable[eOp]);
/*N*/ else
/*N*/ {
-/*?*/ DBG_ERROR("Unbekannter OpCode");
+/*?*/ OSL_FAIL("Unbekannter OpCode");
/*?*/ rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
/*N*/ }
/*N*/ if( bNext ) switch( t->GetType() )
@@ -3150,7 +3150,7 @@ namespace binfilter {
/*N*/ case svMissing:
/*N*/ break; // Opcodes
/*N*/ default:
-/*N*/ DBG_ERROR("ScCompiler:: GetStringFromToken errUnknownVariable");
+/*N*/ OSL_FAIL("ScCompiler:: GetStringFromToken errUnknownVariable");
/*N*/ } // of switch
/*N*/ if( bSpaces )
/*?*/ rBuffer.append(sal_Unicode(' '));
diff --git a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
index 78235f7..e4adef6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
@@ -362,7 +362,7 @@ namespace binfilter {
/*N*/ break;
/*N*/ default:
/*N*/ {
-/*N*/ DBG_ERROR("unbekannte Funktion bei Consoli::CalcData");
+/*N*/ OSL_FAIL("unbekannte Funktion bei Consoli::CalcData");
/*N*/ fCount = -MAXDOUBLE;
/*N*/ }
/*N*/ break;
diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
index 66c5f5f..6b4d028 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
@@ -271,12 +271,12 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ // MAXCOL/ROW+1 ist erlaubt fuer Ende von Rahmen
/*N*/ if (nCol > MAXCOL+1)
/*N*/ {
-/*N*/ DBG_ERROR("falsche Col in ScDetectiveFunc::GetDrawPos");
+/*N*/ OSL_FAIL("falsche Col in ScDetectiveFunc::GetDrawPos");
/*N*/ nCol = MAXCOL+1;
/*N*/ }
/*N*/ if (nRow > MAXROW+1)
/*N*/ {
-/*N*/ DBG_ERROR("falsche Row in ScDetectiveFunc::GetDrawPos");
+/*N*/ OSL_FAIL("falsche Row in ScDetectiveFunc::GetDrawPos");
/*N*/ nRow = MAXROW+1;
/*N*/ }
/*N*/
@@ -331,7 +331,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ if (bStartAlien && bEndAlien)
/*N*/ {
-/*N*/ DBG_ERROR("bStartAlien && bEndAlien");
+/*N*/ OSL_FAIL("bStartAlien && bEndAlien");
/*N*/ return TRUE;
/*N*/ }
/*N*/
@@ -1257,7 +1257,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ else if ( eWhat == SC_DET_ARROWS ) // DetectiveRefresh
/*N*/ bDoThis = !bCaption && !bCircle; // don't include circles
/*N*/ else
-/*N*/ DBG_ERROR("wat?");
+/*N*/ OSL_FAIL("wat?");
/*N*/ }
/*N*/ if ( bDoThis )
/*N*/ ppObj[nDelCount++] = pObject;
diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
index 49e8e9a..f156ee4 100644
--- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
@@ -429,14 +429,14 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ aRet = ScGlobal::pLocaleData->getDate(aData.aDate);
/*N*/ else
/*N*/ {
-/*N*/ //DBG_ERROR("unbekannter Feldbefehl");
+/*N*/ //OSL_FAIL("unbekannter Feldbefehl");
/*N*/ aRet = '?';
/*N*/ }
/*N*/ }
/*N*/ else
/*N*/ {
// #i75599# no assertion - can happen with old files
-/*N*/ //DBG_ERROR("FieldData ist 0");
+/*N*/ //OSL_FAIL("FieldData ist 0");
/*N*/ aRet = '?';
/*N*/ }
/*N*/
@@ -494,7 +494,7 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ //DBG_ERROR("unbekannter Feldbefehl");
+/*N*/ //OSL_FAIL("unbekannter Feldbefehl");
/*N*/ aRet = '?';
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
index 293324d..edf0908 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
@@ -2560,7 +2560,7 @@ void ScInterpreter::ScPercentrank()
if ( nOldCount == 0 )
{
- DBG_ERROR("should not happen");
+ OSL_FAIL("should not happen");
fRes = 0.0;
}
else
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index 02b9fc6..b1e4ba3 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -467,7 +467,7 @@ void ScInterpreter:: ScKGV()
/*N*/ {
/*N*/ if (nMatCount == MAX_ANZ_MAT)
/*N*/ {
-/*N*/ DBG_ERROR("ScInterpreter::GetNewMat: Matrixueberlauf");
+/*N*/ OSL_FAIL("ScInterpreter::GetNewMat: Matrixueberlauf");
/*N*/ SetError(errCodeOverflow);
/*N*/ nMatInd = MAX_ANZ_MAT;
/*N*/ return NULL;
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx
index 1d103c8..65f1afa 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx
@@ -101,7 +101,7 @@ double ScInterpreter::GetGammaDist(double x, double alpha, double beta)
}
}
-// DBG_ERROR("GetGammaDist bricht nicht ab");
+// OSL_FAIL("GetGammaDist bricht nicht ab");
return 1.0; // should not happen ...
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeseq.cxx b/binfilter/bf_sc/source/core/tool/sc_rangeseq.cxx
index 32eb2c1..d91ece8 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeseq.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeseq.cxx
@@ -245,7 +245,7 @@ using namespace ::com::sun::star;
/*N*/ else if ( eType == CELLTYPE_FORMULA )
/*N*/ return ((ScFormulaCell&)rCell).GetValue(); // called only if result is value
/*N*/
-/*N*/ DBG_ERROR( "GetValueFromCell: wrong type" );
+/*N*/ OSL_FAIL( "GetValueFromCell: wrong type" );
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
index d9f403e..d07bb1e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
@@ -155,7 +155,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ DBG_ERROR( "ScRangeUtil::MakeRangeFromName" );
+/*N*/ OSL_FAIL( "ScRangeUtil::MakeRangeFromName" );
/*N*/ }
/*N*/
/*N*/ if( bResult )
diff --git a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
index 50dc0c6..114bd0c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
@@ -68,7 +68,7 @@ namespace binfilter {
/*N*/ if (nReadEnd <= nDataEnd)
/*N*/ return nDataEnd-nReadEnd;
/*N*/
-/*N*/ DBG_ERROR("Fehler bei ScReadHeader::BytesLeft");
+/*N*/ OSL_FAIL("Fehler bei ScReadHeader::BytesLeft");
/*N*/ return 0;
/*N*/ }
@@ -112,7 +112,7 @@ namespace binfilter {
/*N*/ rStream >> nID;
/*N*/ if (nID != SCID_SIZES)
/*N*/ {
-/*N*/ DBG_ERROR("SCID_SIZES nicht gefunden");
+/*N*/ OSL_FAIL("SCID_SIZES nicht gefunden");
/*N*/ if ( rStream.GetError() == SVSTREAM_OK )
/*N*/ rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
/*N*/
@@ -177,7 +177,7 @@ namespace binfilter {
/*N*/ if (nReadEnd <= nEntryEnd)
/*N*/ return nEntryEnd-nReadEnd;
/*N*/
-/*N*/ DBG_ERROR("Fehler bei ScMultipleReadHeader::BytesLeft");
+/*N*/ OSL_FAIL("Fehler bei ScMultipleReadHeader::BytesLeft");
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx
index 2508c29..39c7c6c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_token.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx
@@ -1399,7 +1399,7 @@ USHORT lcl_ScRawTokenOffset()
/*N*/ sp -= nParams;
/*N*/ if ( sp < 0 )
/*N*/ {
-/*N*/ DBG_ERROR( "ScTokenArray::HasMatrixDoubleRefOps: sp < 0" );
+/*N*/ OSL_FAIL( "ScTokenArray::HasMatrixDoubleRefOps: sp < 0" );
/*N*/ sp = 0;
/*N*/ }
/*N*/ pStack[sp++] = pResult;
@@ -1444,7 +1444,7 @@ USHORT lcl_ScRawTokenOffset()
/*?*/ rStream >> nOp;
/*?*/ if( nOp > MAXSTRLEN-1 )
/*?*/ {
-/*?*/ DBG_ERROR("Dokument huehnerich");
+/*?*/ OSL_FAIL("Dokument huehnerich");
/*?*/ USHORT nDiff = nOp - (MAXSTRLEN-1);
/*?*/ nOp = MAXSTRLEN-1;
/*?*/ rStream.Read( c, nOp );
@@ -1494,7 +1494,7 @@ USHORT lcl_ScRawTokenOffset()
/*N*/ aRef.Ref2.OldBoolsToNewFlags( aBools2 );
/*N*/ break;
/*N*/ }
-/*N*/ default: DBG_ERROR("Unknown Stack Variable");
+/*N*/ default: OSL_FAIL("Unknown Stack Variable");
/*N*/ break;
/*N*/ }
/*N*/ break;
@@ -1510,7 +1510,7 @@ USHORT lcl_ScRawTokenOffset()
/*?*/ // lieber ein rottes Dokument als stack overwrite
/*?*/ if( nOp > MAXSTRLEN-2 )
/*?*/ {
-/*?*/ DBG_ERROR("Dokument huehnerich");
+/*?*/ OSL_FAIL("Dokument huehnerich");
/*?*/ USHORT nDiff = nOp - (MAXSTRLEN-2);
/*?*/ nOp = MAXSTRLEN-2;
/*?*/ rStream.Read( c, nOp );
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx
index 7352b7f..26e8b15 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx
@@ -503,7 +503,7 @@ void ScChangeTrackingExportHelper::AddInsertionAttributes(const ScChangeAction*
break;
default :
{
- DBG_ERROR("wrong insertion type");
+ OSL_FAIL("wrong insertion type");
}
break;
}
@@ -563,12 +563,12 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel
{
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TYPE, XML_TABLE);
nPosition = nStartSheet;
- //DBG_ERROR("not implemented feature");
+ //OSL_FAIL("not implemented feature");
}
break;
default :
{
- DBG_ERROR("wrong deletion type");
+ OSL_FAIL("wrong deletion type");
}
break;
}
@@ -722,7 +722,7 @@ void ScChangeTrackingExportHelper::WorkWithChangeAction(ScChangeAction* pAction)
else if (pAction->GetType() == SC_CAT_REJECT)
WriteRejection(pAction);
else
- DBG_ERROR("not a writeable type");
+ OSL_FAIL("not a writeable type");
rExport.CheckAttrList();
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
index 8684ddf..d42aa3f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
@@ -247,7 +247,7 @@ sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const ::rtl::OUStrin
nResult = nValue;
}
else
- DBG_ERROR("wrong change action ID");
+ OSL_FAIL("wrong change action ID");
}
return nResult;
}
@@ -338,7 +338,7 @@ void ScXMLChangeTrackingImportHelper::SetInsertionCutOff(const sal_uInt32 nID, c
static_cast<ScMyDelAction*>(pCurrentAction)->pInsCutOff = new ScMyInsertionCutOff(nID, nPosition);
}
else
- DBG_ERROR("wrong action type");
+ OSL_FAIL("wrong action type");
}
void ScXMLChangeTrackingImportHelper::AddMoveCutOff(const sal_uInt32 nID, const sal_Int32 nStartPosition, const sal_Int32 nEndPosition)
@@ -349,7 +349,7 @@ void ScXMLChangeTrackingImportHelper::AddMoveCutOff(const sal_uInt32 nID, const
static_cast<ScMyDelAction*>(pCurrentAction)->aMoveCutOffs.push_front(ScMyMoveCutOff(nID, nStartPosition, nEndPosition));
}
else
- DBG_ERROR("wrong action type");
+ OSL_FAIL("wrong action type");
}
void ScXMLChangeTrackingImportHelper::SetMoveRanges(const ScBigRange& aSourceRange, const ScBigRange& aTargetRange)
@@ -359,7 +359,7 @@ void ScXMLChangeTrackingImportHelper::SetMoveRanges(const ScBigRange& aSourceRan
static_cast<ScMyMoveAction*>(pCurrentAction)->pMoveRanges = new ScMyMoveRanges(aSourceRange, aTargetRange);
}
else
- DBG_ERROR("wrong action type");
+ OSL_FAIL("wrong action type");
}
void ScXMLChangeTrackingImportHelper::GetMultiSpannedRange()
@@ -379,7 +379,7 @@ void ScXMLChangeTrackingImportHelper::GetMultiSpannedRange()
}
}
else
- DBG_ERROR("wrong action type");
+ OSL_FAIL("wrong action type");
}
void ScXMLChangeTrackingImportHelper::AddGenerated(ScMyCellInfo* pCellInfo, const ScBigRange& aBigRange)
@@ -395,7 +395,7 @@ void ScXMLChangeTrackingImportHelper::AddGenerated(ScMyCellInfo* pCellInfo, cons
static_cast<ScMyDelAction*>(pCurrentAction)->aGeneratedList.push_back(pGenerated);
}
else
- DBG_ERROR("try to insert a generated action to a wrong action");
+ OSL_FAIL("try to insert a generated action to a wrong action");
}
void ScXMLChangeTrackingImportHelper::EndChangeAction()
@@ -406,7 +406,7 @@ void ScXMLChangeTrackingImportHelper::EndChangeAction()
if (pCurrentAction && pCurrentAction->nActionNumber > 0)
aActions.push_back(pCurrentAction);
else
- DBG_ERROR("no current action");
+ OSL_FAIL("no current action");
pCurrentAction = NULL;
}
@@ -566,7 +566,7 @@ void ScXMLChangeTrackingImportHelper::SetDeletionDependences(ScMyDelAction* pAct
pDelAct->SetCutOffInsert(pInsAction, static_cast<sal_Int16>(pAction->pInsCutOff->nPosition));
}
else
- DBG_ERROR("no cut off insert action");
+ OSL_FAIL("no cut off insert action");
}
if (!pAction->aMoveCutOffs.empty())
{
@@ -585,7 +585,7 @@ void ScXMLChangeTrackingImportHelper::SetDeletionDependences(ScMyDelAction* pAct
static_cast<sal_Int16>(aItr->nEndPosition));
}
else
- DBG_ERROR("no cut off move action");
+ OSL_FAIL("no cut off move action");
aItr = pAction->aMoveCutOffs.erase(aItr);
}
}
@@ -683,7 +683,7 @@ void ScXMLChangeTrackingImportHelper::SetDependences(ScMyBaseAction* pAction)
SetContentDependences(static_cast<ScMyContentAction*>(pAction), static_cast<ScChangeActionContent*>(pAct));
}
else
- DBG_ERROR("could not find the action");
+ OSL_FAIL("could not find the action");
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list