[Libreoffice-commits] .: 5 commits - chart2/source sc/inc sc/source sc/workben
David Tardon
dtardon at kemper.freedesktop.org
Thu May 26 23:20:29 PDT 2011
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx | 3
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 3
chart2/source/controller/dialogs/DataBrowser.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 4
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/ChartController_Position.cxx | 4
chart2/source/controller/main/ChartController_TextEdit.cxx | 4
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/SelectionHelper.cxx | 2
chart2/source/tools/AxisHelper.cxx | 3
chart2/source/tools/ChartModelHelper.cxx | 7
chart2/source/tools/ChartViewHelper.cxx | 2
chart2/source/tools/NumberFormatterWrapper.cxx | 3
chart2/source/tools/ObjectIdentifier.cxx | 2
chart2/source/view/axes/Tickmarks.cxx | 3
chart2/source/view/axes/Tickmarks_Dates.cxx | 3
chart2/source/view/axes/Tickmarks_Equidistant.cxx | 5
chart2/source/view/axes/VAxisBase.cxx | 5
chart2/source/view/axes/VAxisOrGridBase.cxx | 3
chart2/source/view/axes/VCoordinateSystem.cxx | 4
chart2/source/view/axes/VPolarGrid.cxx | 2
chart2/source/view/charttypes/AreaChart.cxx | 5
chart2/source/view/charttypes/BarChart.cxx | 3
chart2/source/view/charttypes/BubbleChart.cxx | 3
chart2/source/view/charttypes/CandleStickChart.cxx | 3
chart2/source/view/charttypes/PieChart.cxx | 6
chart2/source/view/charttypes/Splines.cxx | 11 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 5
chart2/source/view/diagram/VDiagram.cxx | 19 -
chart2/source/view/main/ChartView.cxx | 4
chart2/source/view/main/PlotterBase.cxx | 7
chart2/source/view/main/ShapeFactory.cxx | 41 +--
chart2/source/view/main/VLegendSymbolFactory.cxx | 3
sc/inc/cell.hxx | 6
sc/inc/global.hxx | 2
sc/source/core/data/attarray.cxx | 10
sc/source/core/data/attrib.cxx | 24 +-
sc/source/core/data/autonamecache.cxx | 2
sc/source/core/data/bcaslot.cxx | 22 +-
sc/source/core/data/cell.cxx | 16 -
sc/source/core/data/cell2.cxx | 12 -
sc/source/core/data/column.cxx | 4
sc/source/core/data/column3.cxx | 8
sc/source/core/data/conditio.cxx | 6
sc/source/core/data/dociter.cxx | 10
sc/source/core/data/docpool.cxx | 6
sc/source/core/data/documen2.cxx | 18 -
sc/source/core/data/documen3.cxx | 20 -
sc/source/core/data/documen4.cxx | 8
sc/source/core/data/documen5.cxx | 18 -
sc/source/core/data/documen6.cxx | 2
sc/source/core/data/documen7.cxx | 20 -
sc/source/core/data/documen8.cxx | 10
sc/source/core/data/documen9.cxx | 16 -
sc/source/core/data/document.cxx | 12 -
sc/source/core/data/dpdimsave.cxx | 7
sc/source/core/data/dpgroup.cxx | 7
sc/source/core/data/dpobject.cxx | 34 +--
sc/source/core/data/dpoutput.cxx | 44 ++--
sc/source/core/data/dpsave.cxx | 27 +-
sc/source/core/data/dpshttab.cxx | 1
sc/source/core/data/dptabdat.cxx | 1
sc/source/core/data/dptablecache.cxx | 38 +--
sc/source/core/data/dptabres.cxx | 109 ++++------
sc/source/core/data/dptabsrc.cxx | 13 -
sc/source/core/data/drwlayer.cxx | 50 ++--
sc/source/core/data/fillinfo.cxx | 6
sc/source/core/data/funcdesc.cxx | 8
sc/source/core/data/global.cxx | 8
sc/source/core/data/globalx.cxx | 13 -
sc/source/core/data/markarr.cxx | 4
sc/source/core/data/markdata.cxx | 22 --
sc/source/core/data/olinetab.cxx | 1
sc/source/core/data/patattr.cxx | 6
sc/source/core/data/poolhelp.cxx | 2
sc/source/core/data/sheetevents.cxx | 10
sc/source/core/data/sortparam.cxx | 2
sc/source/core/data/stlpool.cxx | 4
sc/source/core/data/subtotalparam.cxx | 8
sc/source/core/data/table1.cxx | 8
sc/source/core/data/table2.cxx | 36 +--
sc/source/core/data/table3.cxx | 8
sc/source/core/data/table4.cxx | 8
sc/source/core/data/table5.cxx | 6
sc/source/core/data/table6.cxx | 2
sc/source/core/data/tabprotection.cxx | 1
sc/source/core/data/userdat.cxx | 1
sc/source/core/inc/core_pch.hxx | 1
sc/source/core/tool/addincfg.cxx | 2
sc/source/core/tool/addincol.cxx | 13 -
sc/source/core/tool/address.cxx | 2
sc/source/core/tool/appoptio.cxx | 24 +-
sc/source/core/tool/autoform.cxx | 10
sc/source/core/tool/charthelper.cxx | 2
sc/source/core/tool/chartlock.cxx | 2
sc/source/core/tool/chartpos.cxx | 2
sc/source/core/tool/chgtrack.cxx | 31 +-
sc/source/core/tool/compiler.cxx | 22 +-
sc/source/core/tool/consoli.cxx | 10
sc/source/core/tool/dbdata.cxx | 4
sc/source/core/tool/detdata.cxx | 2
sc/source/core/tool/detfunc.cxx | 22 +-
sc/source/core/tool/docoptio.cxx | 8
sc/source/core/tool/editutil.cxx | 2
sc/source/core/tool/filtopt.cxx | 6
sc/source/core/tool/inputopt.cxx | 6
sc/source/core/tool/interpr1.cxx | 14 -
sc/source/core/tool/interpr2.cxx | 8
sc/source/core/tool/interpr3.cxx | 29 +-
sc/source/core/tool/interpr4.cxx | 12 -
sc/source/core/tool/interpr6.cxx | 1
sc/source/core/tool/parclass.cxx | 3
sc/source/core/tool/printopt.cxx | 6
sc/source/core/tool/prnsave.cxx | 6
sc/source/core/tool/rangelst.cxx | 3
sc/source/core/tool/rangenam.cxx | 3
sc/source/core/tool/rangeseq.cxx | 3
sc/source/core/tool/rangeutl.cxx | 12 -
sc/source/core/tool/rechead.cxx | 8
sc/source/core/tool/refupdat.cxx | 6
sc/source/core/tool/scmatrix.cxx | 28 +-
sc/source/core/tool/token.cxx | 33 +--
sc/source/core/tool/viewopti.cxx | 14 -
sc/source/core/tool/zforauto.cxx | 1
sc/source/filter/dif/difexp.cxx | 6
sc/source/filter/dif/difimp.cxx | 39 +--
sc/source/filter/excel/colrowst.cxx | 6
sc/source/filter/excel/excdoc.cxx | 6
sc/source/filter/excel/excel.cxx | 10
sc/source/filter/excel/excform.cxx | 6
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/excrecds.cxx | 6
sc/source/filter/excel/exctools.cxx | 4
sc/source/filter/excel/expop2.cxx | 4
sc/source/filter/excel/fontbuff.cxx | 6
sc/source/filter/excel/frmbase.cxx | 10
sc/source/filter/excel/impop.cxx | 12 -
sc/source/filter/excel/namebuff.cxx | 16 -
sc/source/filter/excel/read.cxx | 12 -
sc/source/filter/excel/tokstack.cxx | 16 -
sc/source/filter/excel/xechart.cxx | 30 +-
sc/source/filter/excel/xecontent.cxx | 22 +-
sc/source/filter/excel/xeescher.cxx | 6
sc/source/filter/excel/xeformula.cxx | 42 +--
sc/source/filter/excel/xehelper.cxx | 16 -
sc/source/filter/excel/xelink.cxx | 28 +-
sc/source/filter/excel/xename.cxx | 10
sc/source/filter/excel/xepivot.cxx | 48 ++--
sc/source/filter/excel/xerecord.cxx | 2
sc/source/filter/excel/xeroot.cxx | 32 +-
sc/source/filter/excel/xestream.cxx | 26 +-
sc/source/filter/excel/xestring.cxx | 28 +-
sc/source/filter/excel/xestyle.cxx | 40 +--
sc/source/filter/excel/xetable.cxx | 54 ++--
sc/source/filter/excel/xeview.cxx | 4
sc/source/filter/excel/xichart.cxx | 34 +--
sc/source/filter/excel/xicontent.cxx | 30 +-
sc/source/filter/excel/xiescher.cxx | 64 ++---
sc/source/filter/excel/xihelper.cxx | 8
sc/source/filter/excel/xilink.cxx | 12 -
sc/source/filter/excel/xiname.cxx | 2
sc/source/filter/excel/xipage.cxx | 14 -
sc/source/filter/excel/xipivot.cxx | 82 +++----
sc/source/filter/excel/xiroot.cxx | 20 -
sc/source/filter/excel/xistream.cxx | 24 +-
sc/source/filter/excel/xistring.cxx | 4
sc/source/filter/excel/xistyle.cxx | 24 +-
sc/source/filter/excel/xiview.cxx | 4
sc/source/filter/excel/xladdress.cxx | 6
sc/source/filter/excel/xlchart.cxx | 36 +--
sc/source/filter/excel/xlescher.cxx | 4
sc/source/filter/excel/xlformula.cxx | 8
sc/source/filter/excel/xlpivot.cxx | 2
sc/source/filter/excel/xlroot.cxx | 16 -
sc/source/filter/excel/xlstyle.cxx | 14 -
sc/source/filter/excel/xltools.cxx | 10
sc/source/filter/excel/xlview.cxx | 2
sc/source/filter/ftools/fapihelper.cxx | 18 -
sc/source/filter/ftools/fprogressbar.cxx | 16 -
sc/source/filter/ftools/ftools.cxx | 4
sc/source/filter/html/htmlexp.cxx | 12 -
sc/source/filter/html/htmlimp.cxx | 6
sc/source/filter/html/htmlpars.cxx | 44 ++--
sc/source/filter/inc/XclExpChangeTrack.hxx | 1
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/filter/inc/filt_pch.hxx | 1
sc/source/filter/inc/ftools.hxx | 1
sc/source/filter/inc/namebuff.hxx | 3
sc/source/filter/inc/tokstack.hxx | 15 -
sc/source/filter/inc/tool.h | 4
sc/source/filter/inc/xlformula.hxx | 6
sc/source/filter/inc/xlroot.hxx | 4
sc/source/filter/inc/xltools.hxx | 4
sc/source/filter/lotus/expop.cxx | 28 +-
sc/source/filter/lotus/lotattr.cxx | 6
sc/source/filter/lotus/lotform.cxx | 14 -
sc/source/filter/lotus/lotimpop.cxx | 12 -
sc/source/filter/lotus/lotread.cxx | 10
sc/source/filter/lotus/op.cxx | 2
sc/source/filter/lotus/tool.cxx | 4
sc/source/filter/rtf/eeimpars.cxx | 2
sc/source/filter/rtf/rtfparse.cxx | 8
sc/source/filter/starcalc/scflt.cxx | 8
sc/source/filter/starcalc/scfobj.cxx | 4
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 30 +-
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 9
sc/source/filter/xcl97/xcl97esc.cxx | 5
sc/source/filter/xcl97/xcl97rec.cxx | 8
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 7
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 31 +-
sc/source/filter/xml/XMLConverter.cxx | 2
sc/source/filter/xml/XMLDDELinksContext.cxx | 9
sc/source/filter/xml/XMLExportDataPilot.cxx | 4
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 13 -
sc/source/filter/xml/XMLExportIterator.cxx | 5
sc/source/filter/xml/XMLExportSharedData.cxx | 5
sc/source/filter/xml/XMLStylesExportHelper.cxx | 33 +--
sc/source/filter/xml/XMLStylesImportHelper.cxx | 19 -
sc/source/filter/xml/XMLTableMasterPageExport.cxx | 3
sc/source/filter/xml/XMLTableShapeResizer.cxx | 1
sc/source/filter/xml/XMLTextPContext.cxx | 1
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 2
sc/source/filter/xml/sheetdata.cxx | 3
sc/source/filter/xml/xmlbodyi.cxx | 1
sc/source/filter/xml/xmlcelli.cxx | 28 +-
sc/source/filter/xml/xmlcvali.cxx | 1
sc/source/filter/xml/xmlexprt.cxx | 33 +--
sc/source/filter/xml/xmlimprt.cxx | 14 -
sc/source/filter/xml/xmlrowi.cxx | 2
sc/source/filter/xml/xmlstyle.cxx | 1
sc/source/filter/xml/xmlstyli.cxx | 5
sc/source/filter/xml/xmlsubti.cxx | 6
sc/source/filter/xml/xmlwrap.cxx | 31 +-
sc/source/ui/Accessibility/AccessibleCell.cxx | 3
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 1
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 12 -
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 15 -
sc/source/ui/Accessibility/AccessibleDocument.cxx | 37 +--
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 15 -
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 5
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 4
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 5
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 1
sc/source/ui/Accessibility/DrawModelBroadcaster.cxx | 1
sc/source/ui/app/drwtrans.cxx | 8
sc/source/ui/app/inputhdl.cxx | 10
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/scmod.cxx | 22 +-
sc/source/ui/app/seltrans.cxx | 12 -
sc/source/ui/app/transobj.cxx | 6
sc/source/ui/app/uiitems.cxx | 24 +-
sc/source/ui/attrdlg/attrdlg.cxx | 18 -
sc/source/ui/attrdlg/tabpages.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 8
sc/source/ui/dbgui/asciiopt.cxx | 5
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/csvcontrol.cxx | 3
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/csvsplits.cxx | 1
sc/source/ui/dbgui/csvtablebox.cxx | 15 -
sc/source/ui/dbgui/dapidata.cxx | 3
sc/source/ui/dbgui/fieldwnd.cxx | 3
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/dbgui/pvfundlg.cxx | 2
sc/source/ui/dbgui/pvlaydlg.cxx | 10
sc/source/ui/dbgui/scuiasciiopt.cxx | 15 -
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 6
sc/source/ui/dbgui/tpsubt.cxx | 18 -
sc/source/ui/dbgui/validate.cxx | 12 -
sc/source/ui/docshell/arealink.cxx | 6
sc/source/ui/docshell/autostyl.cxx | 2
sc/source/ui/docshell/dbdocfun.cxx | 10
sc/source/ui/docshell/dbdocimp.cxx | 5
sc/source/ui/docshell/docfunc.cxx | 14 -
sc/source/ui/docshell/docsh.cxx | 8
sc/source/ui/docshell/docsh3.cxx | 12 -
sc/source/ui/docshell/docsh4.cxx | 40 +--
sc/source/ui/docshell/docsh6.cxx | 2
sc/source/ui/docshell/docsh8.cxx | 40 +--
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/docshell/impex.cxx | 8
sc/source/ui/docshell/pagedata.cxx | 6
sc/source/ui/drawfunc/drawsh.cxx | 10
sc/source/ui/drawfunc/drawsh5.cxx | 4
sc/source/ui/drawfunc/drtxtob1.cxx | 8
sc/source/ui/drawfunc/futext3.cxx | 6
sc/source/ui/formdlg/formdata.cxx | 2
sc/source/ui/formdlg/formula.cxx | 6
sc/source/ui/inc/ui_pch.hxx | 1
sc/source/ui/inc/validate.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 4
sc/source/ui/miscdlgs/conflictsdlg.cxx | 16 -
sc/source/ui/miscdlgs/datafdlg.cxx | 2
sc/source/ui/miscdlgs/highred.cxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 4
sc/source/ui/miscdlgs/redcom.cxx | 2
sc/source/ui/miscdlgs/sharedocdlg.cxx | 4
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/miscdlgs/strindlg.cxx | 2
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 3
sc/source/ui/namedlg/namedlg.cxx | 2
sc/source/ui/navipi/content.cxx | 8
sc/source/ui/navipi/navcitem.cxx | 4
sc/source/ui/navipi/scenwnd.cxx | 2
sc/source/ui/optdlg/tpusrlst.cxx | 6
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 8
sc/source/ui/pagedlg/tptable.cxx | 2
sc/source/ui/styleui/styledlg.cxx | 46 ++--
sc/source/ui/undo/areasave.cxx | 1
sc/source/ui/undo/undoblk.cxx | 4
sc/source/ui/undo/undoblk3.cxx | 10
sc/source/ui/undo/undocell.cxx | 12 -
sc/source/ui/undo/undodat.cxx | 4
sc/source/ui/undo/undostyl.cxx | 4
sc/source/ui/undo/undotab.cxx | 4
sc/source/ui/undo/undoutil.cxx | 2
sc/source/ui/unoobj/afmtuno.cxx | 9
sc/source/ui/unoobj/appluno.cxx | 2
sc/source/ui/unoobj/celllistsource.cxx | 8
sc/source/ui/unoobj/cellsuno.cxx | 58 ++---
sc/source/ui/unoobj/cellvaluebinding.cxx | 26 +-
sc/source/ui/unoobj/chart2uno.cxx | 28 +-
sc/source/ui/unoobj/chartuno.cxx | 14 -
sc/source/ui/unoobj/convuno.cxx | 1
sc/source/ui/unoobj/cursuno.cxx | 26 +-
sc/source/ui/unoobj/dapiuno.cxx | 6
sc/source/ui/unoobj/datauno.cxx | 11 -
sc/source/ui/unoobj/docuno.cxx | 18 -
sc/source/ui/unoobj/fielduno.cxx | 18 -
sc/source/ui/unoobj/filtuno.cxx | 8
sc/source/ui/unoobj/fmtuno.cxx | 3
sc/source/ui/unoobj/funcuno.cxx | 7
sc/source/ui/unoobj/linkuno.cxx | 2
sc/source/ui/unoobj/listenercalls.cxx | 3
sc/source/ui/unoobj/miscuno.cxx | 1
sc/source/ui/unoobj/scdetect.hxx | 1
sc/source/ui/unoobj/servuno.cxx | 3
sc/source/ui/unoobj/shapeuno.cxx | 9
sc/source/ui/unoobj/styleuno.cxx | 2
sc/source/ui/unoobj/targuno.cxx | 2
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 4
sc/source/ui/view/auditsh.cxx | 2
sc/source/ui/view/cellsh.cxx | 2
sc/source/ui/view/cellsh1.cxx | 74 +++---
sc/source/ui/view/cellsh2.cxx | 36 +--
sc/source/ui/view/cellsh3.cxx | 28 +-
sc/source/ui/view/dbfunc4.cxx | 2
sc/source/ui/view/drawview.cxx | 10
sc/source/ui/view/editsh.cxx | 22 +-
sc/source/ui/view/formatsh.cxx | 8
sc/source/ui/view/galwrap.cxx | 8
sc/source/ui/view/gridwin.cxx | 8
sc/source/ui/view/gridwin2.cxx | 8
sc/source/ui/view/gridwin3.cxx | 2
sc/source/ui/view/gridwin4.cxx | 6
sc/source/ui/view/gridwin5.cxx | 4
sc/source/ui/view/hdrcont.cxx | 2
sc/source/ui/view/invmerge.cxx | 3
sc/source/ui/view/olinewin.cxx | 8
sc/source/ui/view/output.cxx | 2
sc/source/ui/view/output2.cxx | 6
sc/source/ui/view/pivotsh.cxx | 6
sc/source/ui/view/preview.cxx | 8
sc/source/ui/view/prevloc.cxx | 5
sc/source/ui/view/prevwsh.cxx | 12 -
sc/source/ui/view/printfun.cxx | 12 -
sc/source/ui/view/reffact.cxx | 10
sc/source/ui/view/scextopt.cxx | 4
sc/source/ui/view/select.cxx | 6
sc/source/ui/view/spelldialog.cxx | 2
sc/source/ui/view/spelleng.cxx | 2
sc/source/ui/view/tabcont.cxx | 2
sc/source/ui/view/tabview.cxx | 8
sc/source/ui/view/tabview2.cxx | 8
sc/source/ui/view/tabview3.cxx | 8
sc/source/ui/view/tabview5.cxx | 2
sc/source/ui/view/tabvwsh3.cxx | 6
sc/source/ui/view/tabvwsh4.cxx | 4
sc/source/ui/view/tabvwsha.cxx | 6
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/tabvwshe.cxx | 6
sc/source/ui/view/tabvwshf.cxx | 18 -
sc/source/ui/view/tabvwshg.cxx | 2
sc/source/ui/view/viewdata.cxx | 36 +--
sc/source/ui/view/viewfun4.cxx | 4
sc/source/ui/view/viewfun7.cxx | 6
sc/source/ui/view/viewfunc.cxx | 6
sc/source/ui/view/viewutil.cxx | 4
sc/workben/addin.cxx | 1
sc/workben/result.cxx | 1
sc/workben/test.cxx | 3
402 files changed, 2019 insertions(+), 2190 deletions(-)
New commits:
commit a48c6d350bebb3722935673d446170e2bc79e5e8
Author: Jacek Wolszczak <shutdownrunner at gmail.com>
Date: Sat May 21 18:05:48 2011 +0200
Follow-up of DBG_* removal
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 763df5e..00c945e 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -32,7 +32,6 @@
#include <math.h>
#include <svl/zforlist.hxx>
-#include <tools/debug.hxx>
#include "attrib.hxx"
#include "cell.hxx"
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 9eaacdd..79bb865 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -86,7 +86,7 @@ void NameBuffer::operator <<( const String &rNewString )
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
sal_uInt16 nShrCnt;
#endif
@@ -102,7 +102,7 @@ ShrfmlaBuffer::ShrfmlaBuffer( RootData* pRD ) :
ExcRoot( pRD ),
mnCurrIdx (nBase)
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
nShrCnt = 0;
#endif
}
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 80e9316..0668ca9 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -320,7 +320,7 @@ void TokenPool::GetElement( const sal_uInt16 nId )
{
switch( pType[ nId ] )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
case T_Id:
OSL_FAIL( "-TokenPool::GetElement(): hier hast Du nichts zu suchen!" );
break;
@@ -425,7 +425,7 @@ void TokenPool::GetElement( const sal_uInt16 nId )
void TokenPool::GetElementRek( const sal_uInt16 nId )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
nRek++;
OSL_ENSURE( nRek <= nP_Id, "*TokenPool::GetElement(): Rekursion loopt!?" );
#endif
@@ -541,7 +541,7 @@ void TokenPool::GetElementRek( const sal_uInt16 nId )
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
nRek--;
#endif
}
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 36f8592..1616693 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -187,7 +187,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc )
void XclExpString::SetFormats( const XclFormatRunVec& rFormats )
{
maFormats = rFormats;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
if( IsRich() )
{
XclFormatRunVec::const_iterator aCurr = maFormats.begin();
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 8846c5e..d7ac673 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2131,7 +2131,7 @@ XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const String& rStyleName ) :
mnLevel( EXC_STYLE_NOLEVEL )
{
OSL_ENSURE( maName.Len(), "XclExpStyle::XclExpStyle - empty style name" );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
sal_uInt8 nStyleId, nLevel; // do not use members for debug tests
OSL_ENSURE( !XclTools::GetBuiltInStyleId( nStyleId, nLevel, maName ),
"XclExpStyle::XclExpStyle - this is a built-in style" );
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index fc9105c..a0ee852 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
// Global data ================================================================
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
XclDebugObjCounter::~XclDebugObjCounter()
{
OSL_ENSURE( mnObjCnt == 0, "XclDebugObjCounter::~XclDebugObjCounter - wrong root object count" );
@@ -174,7 +174,7 @@ XclRootData::~XclRootData()
XclRoot::XclRoot( XclRootData& rRootData ) :
mrData( rRootData )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
++mrData.mnObjCnt;
#endif
@@ -188,14 +188,14 @@ XclRoot::XclRoot( XclRootData& rRootData ) :
XclRoot::XclRoot( const XclRoot& rRoot ) :
mrData( rRoot.mrData )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
++mrData.mnObjCnt;
#endif
}
XclRoot::~XclRoot()
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
--mrData.mnObjCnt;
#endif
}
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index a83737e..ef98f77 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -29,7 +29,6 @@
#ifndef SC_XCLEXPCHANGETRACK_HXX
#define SC_XCLEXPCHANGETRACK_HXX
-#include <tools/debug.hxx>
#include <tools/datetime.hxx>
#include <rtl/uuid.h>
#include "bigrange.hxx"
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index a719b70..f982a80 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -57,7 +57,6 @@
#include <tools/errcode.hxx>
#include <tools/ref.hxx>
#include <tools/link.hxx>
-#include <tools/debug.hxx>
#include <tools/time.hxx>
#include <tools/date.hxx>
#include <svl/svarray.hxx>
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 078a3c7..77a43d2 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -34,7 +34,6 @@
#include <limits>
#include <memory>
#include <tools/string.hxx>
-#include <tools/debug.hxx>
#include <sal/macros.h>
#include <oox/helper/helper.hxx>
#include <boost/noncopyable.hpp>
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index bbedf03..1f591ba 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -29,7 +29,6 @@
#ifndef SC_NAMEBUFF_HXX
#define SC_NAMEBUFF_HXX
-#include <tools/debug.hxx>
#include <tools/string.hxx>
#include "compiler.hxx"
#include "root.hxx"
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index a4f63bd..e0fcd92 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -30,7 +30,6 @@
#define SC_TOKSTACK_HXX
#include <string.h>
-#include <tools/debug.hxx>
#include "compiler.hxx"
#include "tokenarray.hxx"
@@ -178,7 +177,7 @@ class TokenPool
sal_uInt16 nElementAkt;
static const sal_uInt16 nScTokenOff;// Offset fuer SC-Token
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
sal_uInt16 nRek; // Rekursionszaehler
#endif
ScTokenArray* pScToken; // Tokenbastler
@@ -386,7 +385,7 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
if( nId )
{//...nur wenn nId > 0!
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
nRek = 0;
#endif
GetElement( ( sal_uInt16 ) nId - 1 );
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 2ca1789..d1e575e 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -50,7 +50,7 @@ class XclTokenArray;
// Global data ================================================================
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
/** Counts the number of created root objects. */
struct XclDebugObjCounter
{
@@ -75,7 +75,7 @@ struct RootData;//!
/** Stores global buffers and data needed elsewhere in the Excel filters. */
struct XclRootData
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
: public XclDebugObjCounter
#endif
{
diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx
index 31fe75f..2a5eb27 100644
--- a/sc/source/filter/lotus/expop.cxx
+++ b/sc/source/filter/lotus/expop.cxx
@@ -33,8 +33,6 @@
//------------------------------------------------------------------------
-#include <tools/debug.hxx>
-
#include "dociter.hxx"
#include "cell.hxx"
#include "document.hxx"
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index dc765ed..ff02dd4 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -81,7 +81,7 @@ ImportLotus::~ImportLotus()
delete pLotusRoot->pAttrTable;
delete pLotusRoot;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
pLotusRoot = NULL;
#endif
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index e24d076..9635f09 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -195,7 +195,7 @@ FltError ImportLotus::Read()
case S_END: // S_END
break;
// -----------------------------------------------------------
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
default:
OSL_FAIL( "*ImportLotus::Read(): State unbekannt!" );
eAkt = S_END;
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 182dcf9..daf8025 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1000,7 +1000,7 @@ sal_uLong Sc10Import::Import()
if (!nError) { ImportNameCollection(); pPrgrsBar->Progress(); }
pDoc->SetViewOptions( aSc30ViewOpt );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
if (nError)
{
OSL_FAIL( ByteString::CreateFromInt32( nError ).GetBuffer() );
@@ -1008,7 +1008,7 @@ sal_uLong Sc10Import::Import()
#endif
delete pPrgrsBar;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
pPrgrsBar = NULL;
#endif
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 91aac0f..600b3f9 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sc.hxx"
#include "XclImpChangeTrack.hxx"
-#include <tools/debug.hxx>
#include <sot/storage.hxx>
#include <svl/zforlist.hxx>
#include "chgviset.hxx"
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index b55b102..e9af803 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -46,7 +46,6 @@
#include <vcl/outdev.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <tools/debug.hxx>
#include <svx/sdasitm.hxx>
#include <sot/exchange.hxx>
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 2d9002b..181bb2f 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -41,7 +41,6 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
#include <com/sun/star/util/DateTime.hpp>
-#include <tools/debug.hxx>
#include <tools/datetime.hxx>
#include <svl/zforlist.hxx>
@@ -153,7 +152,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction
void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGeneratedAction)
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
sal_uInt32 nActionNumber(pGeneratedAction->GetActionNumber());
OSL_ENSURE(pChangeTrack->IsGenerated(nActionNumber), "a not generated action found");
#endif
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 475692e..84966bb 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -34,7 +34,6 @@
#include "document.hxx"
#include "chgviset.hxx"
#include "rangeutl.hxx"
-#include <tools/debug.hxx>
#include <tools/datetime.hxx>
#include <svl/zforlist.hxx>
#include <xmloff/xmluconv.hxx>
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index c0f691c..0cb4203 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -40,7 +40,6 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
-#include <tools/debug.hxx>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index b368d36..88f1a2c 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -59,7 +59,6 @@
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include <com/sun/star/sheet/XDatabaseRange.hpp>
#include <com/sun/star/table/TableOrientation.hpp>
-#include <tools/debug.hxx>
#include <comphelper/extract.hxx>
#include <map>
@@ -449,7 +448,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
if (aSortFields[0].IsCaseSensitive)
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
sal_Bool bCaseSensitive(aSortFields[0].IsCaseSensitive);
for (i = 1; i < nSortFields; ++i)
{
@@ -462,7 +461,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aSortFields[0].CollatorLocale.Country);
if (aSortFields[0].CollatorAlgorithm.getLength())
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ALGORITHM, aSortFields[0].CollatorAlgorithm);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
rtl::OUString sLanguage(aSortFields[0].CollatorLocale.Language);
rtl::OUString sCountry(aSortFields[0].CollatorLocale.Country);
rtl::OUString sAlgorithm(aSortFields[0].CollatorAlgorithm);
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index 7e05ace..9bd2243 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/sheet/CellFlags.hpp>
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <tools/debug.hxx>
#include <xmloff/xmlnmspe.hxx>
#include "dociter.hxx"
#include "convuno.hxx"
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx
index 96437d5..31e393c 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -34,7 +34,6 @@
// INCLUDE ---------------------------------------------------------------
#include "XMLExportSharedData.hxx"
#include "XMLExportIterator.hxx"
-#include <tools/debug.hxx>
using namespace com::sun::star;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 42a285a..7083ca6 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -42,7 +42,6 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/XMLEventExport.hxx>
#include <xmloff/nmspmap.hxx>
-#include <tools/debug.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XSheetCondition.hpp>
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 8aaa938..e381feb 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -34,7 +34,6 @@
// INCLUDE ---------------------------------------------------------------
#include "XMLStylesImportHelper.hxx"
#include "xmlimprt.hxx"
-#include <tools/debug.hxx>
#include <com/sun/star/util/NumberFormat.hpp>
using namespace com::sun::star;
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
index 6b94940..05ccbf8 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-#include <tools/debug.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
#include <com/sun/star/text/XText.hpp>
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index e0425c0..e960995 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -36,7 +36,6 @@
#include "XMLConverter.hxx"
#include "rangeutl.hxx"
#include "reftokenhelper.hxx"
-#include <tools/debug.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx
index 919c40f..07e3504 100644
--- a/sc/source/filter/xml/XMLTextPContext.cxx
+++ b/sc/source/filter/xml/XMLTextPContext.cxx
@@ -38,7 +38,6 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/nmspmap.hxx>
-#include <tools/debug.hxx>
#include <com/sun/star/text/XTextCursor.hpp>
using namespace com::sun::star;
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index 5a7b0dd..c2f08e7 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -35,7 +35,6 @@
#include <xmloff/xmlaustp.hxx>
#include <xmloff/nmspmap.hxx>
#include <tools/string.hxx>
-#include <tools/debug.hxx>
#include "sheetdata.hxx"
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 2828839..51ebd48 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -61,7 +61,6 @@
#include <xmloff/xmluconv.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <sal/types.h>
-#include <tools/debug.hxx>
#include <memory>
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 694f98b..ea6c8e3 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -45,7 +45,6 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/XMLEventsImportContext.hxx>
#include <com/sun/star/sheet/TableValidationVisibility.hpp>
-#include <tools/debug.hxx>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index fe9cd97..d5643d5 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -85,7 +85,6 @@
#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
#include "tools/color.hxx"
#include <rtl/math.hxx>
#include <svl/zforlist.hxx>
@@ -1111,7 +1110,7 @@ void ScXMLExport::WriteRowContent()
{
ScMyRowFormatRange aRange;
sal_Int32 nIndex(-1);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
sal_Int32 nPrevCol(0);
#endif
sal_Int32 nCols(0);
@@ -1120,7 +1119,7 @@ void ScXMLExport::WriteRowContent()
sal_Bool bIsFirst(sal_True);
while (pRowFormatRanges->GetNext(aRange))
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
OSL_ENSURE(bIsFirst || (!bIsFirst && (nPrevCol + nCols == aRange.nStartColumn)), "here are some columns missing");
#endif
if (bIsFirst)
@@ -1130,7 +1129,7 @@ void ScXMLExport::WriteRowContent()
bIsAutoStyle = aRange.bIsAutoStyle;
nCols = aRange.nRepeatColumns;
bIsFirst = false;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
nPrevCol = aRange.nStartColumn;
#endif
}
@@ -1157,7 +1156,7 @@ void ScXMLExport::WriteRowContent()
bIsAutoStyle = aRange.bIsAutoStyle;
nCols = aRange.nRepeatColumns;
nPrevValidationIndex = aRange.nValidationIndex;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
nPrevCol = aRange.nStartColumn;
#endif
}
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index bf5d8ec..f563417 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -48,7 +48,6 @@
#include <xmloff/attrlist.hxx>
#include <xmloff/contextid.hxx>
#include <xmloff/txtprmap.hxx>
-#include <tools/debug.hxx>
#include <com/sun/star/util/CellProtection.hpp>
#include <com/sun/star/table/CellOrientation.hpp>
#include <com/sun/star/table/CellVertJustify2.hpp>
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index b2c51d2..dd05438 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -45,7 +45,6 @@
#include <comphelper/extract.hxx>
#include <xmloff/xmlprcon.hxx>
#include <xmloff/xmluconv.hxx>
-#include <tools/debug.hxx>
#include "XMLTableHeaderFooterContext.hxx"
#include "XMLConverter.hxx"
#include "XMLTableShapeImportHelper.hxx"
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index e03a824..44b07b5 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -33,7 +33,6 @@
#include <rsc/rscsfx.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
-#include <tools/debug.hxx>
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
@@ -220,7 +219,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
else
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
ByteString aError( "SAX parse exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
OSL_FAIL( aError.GetBuffer() );
@@ -256,7 +255,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
else
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
ByteString aError( "SAX exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
OSL_FAIL( aError.GetBuffer() );
@@ -268,7 +267,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
}
catch( packages::zip::ZipIOException& r )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
ByteString aError( "Zip exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
OSL_FAIL( aError.GetBuffer() );
@@ -279,7 +278,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
}
catch( io::IOException& r )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
ByteString aError( "IO exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
OSL_FAIL( aError.GetBuffer() );
@@ -290,7 +289,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
}
catch( uno::Exception& r )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
ByteString aError( "uno exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
OSL_FAIL( aError.GetBuffer() );
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index e2e08da..96546a2 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -35,7 +35,6 @@
#include <usr/reflserv.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-#include <tools/debug.hxx>
#include <tools/date.hxx>
#include <svl/itemprop.hxx>
#include <usr/proptypehlp.hxx>
diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx
index fbe5231..90cb3e5 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -30,7 +30,6 @@
#pragma hdrstop
#endif
-#include <tools/debug.hxx>
#include <usr/ustring.hxx>
#include "result.hxx"
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx
index 4ffde2e..b7ef70e 100644
--- a/sc/workben/test.cxx
+++ b/sc/workben/test.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <tools/debug.hxx>
#include <svtools/libcall.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/window.hxx>
@@ -261,7 +260,7 @@ MyWindow::MyWindow( Window *pParent ) :
XSpreadsheetDocumentRef lcl_GetDocument()
{
XServiceManagerRef xProv = getGlobalServiceManager();
- DBG_ASSERT( xProv.is(), "Kein ServiceManager!" );
+ OSL_ENSURE( xProv.is(), "Kein ServiceManager!" );
XServiceRegistryRef xReg = (XServiceRegistry*)xProv->queryInterface(XServiceRegistry::getSmartUik());
if ( !xReg )
commit 5a255e345eeca19f266f14d235c2f98e6e2ff7b6
Author: Jacek Wolszczak <shutdownrunner at gmail.com>
Date: Sat May 21 16:01:56 2011 +0200
Replace DBG_* with OSL_* in sc/source/filter
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index cbf7a9f..579db1d 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -65,8 +65,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p
FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
const ScRange&rRange, const CharSet eCharSet, sal_uInt32 nDifOption )
{
- DBG_ASSERT( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range unsortiert!" );
- DBG_ASSERTWARNING( rRange.aStart.Tab() == rRange.aEnd.Tab(),
+ OSL_ENSURE( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range unsortiert!" );
+ OSL_ENSURE( rRange.aStart.Tab() == rRange.aEnd.Tab(),
"ScExportDif(): nur eine Tabelle bidde!" );
const CharSet eStreamCharSet = rOut.GetStreamCharSet();
@@ -124,7 +124,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
aPrgrsBar.SetState( 0 );
// TABLE
- DBG_ASSERT( pDoc->HasTable( nTab ), "*ScExportDif(): Tabelle nicht vorhanden!" );
+ OSL_ENSURE( pDoc->HasTable( nTab ), "*ScExportDif(): Tabelle nicht vorhanden!" );
aOS = pKeyTABLE;
aOS.AppendAscii( "\n0,1\n\"" );
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index f6cd26e..763df5e 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -129,7 +129,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
case T_UNKNOWN:
break;
default:
- DBG_ERRORFILE( "ScImportDif - missing enum" );
+ OSL_FAIL( "ScImportDif - missing enum" );
}
}
@@ -249,7 +249,7 @@ DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rD
eCharSet = e;
if ( rIn.GetStreamCharSet() != eCharSet )
{
- DBG_ERRORFILE( "CharSet passed overrides and modifies StreamCharSet" );
+ OSL_FAIL( "CharSet passed overrides and modifies StreamCharSet" );
rIn.SetStreamCharSet( eCharSet );
}
rIn.StartReadingUnicodeText( eCharSet );
@@ -378,7 +378,7 @@ TOPIC DifParser::GetNextTopic( void )
}
break;
case S_Data:
- DBG_ASSERT( aLine.Len() >= 2,
+ OSL_ENSURE( aLine.Len() >= 2,
"+GetNextTopic(): <String> ist zu kurz!" );
if( aLine.Len() > 2 )
aData = aLine.Copy( 1, aLine.Len() - 2 );
@@ -387,7 +387,7 @@ TOPIC DifParser::GetNextTopic( void )
eS = S_END;
break;
case S_END:
- DBG_ERRORFILE( "DifParser::GetNextTopic - unexpected state" );
+ OSL_FAIL( "DifParser::GetNextTopic - unexpected state" );
break;
case S_UNKNOWN:
// 2 Zeilen ueberlesen
@@ -398,7 +398,7 @@ TOPIC DifParser::GetNextTopic( void )
eS = S_END;
break;
default:
- DBG_ERRORFILE( "DifParser::GetNextTopic - missing enum" );
+ OSL_FAIL( "DifParser::GetNextTopic - missing enum" );
}
}
@@ -435,7 +435,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData )
}
else
{ // ...und zur Strafe mit'm Numberformatter...
- DBG_ASSERT( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" );
+ OSL_ENSURE( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" );
String aTestVal( pPossibleNumericData );
sal_uInt32 nFormat = 0;
double fTmpVal;
@@ -472,7 +472,7 @@ bool DifParser::LookAhead()
const sal_Unicode* pAktBuffer;
bool bValidStructure = false;
- DBG_ASSERT( aLookAheadLine.Len() == 0, "*DifParser::LookAhead(): LookAhead called twice in a row" );
+ OSL_ENSURE( aLookAheadLine.Len() == 0, "*DifParser::LookAhead(): LookAhead called twice in a row" );
rIn.ReadUniOrByteStringLine( aLookAheadLine );
pAktBuffer = aLookAheadLine.GetBuffer();
@@ -795,10 +795,10 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
}
break;
case S_END:
- DBG_ERRORFILE( "DifParser::ScanFloatVal - unexpected state" );
+ OSL_FAIL( "DifParser::ScanFloatVal - unexpected state" );
break;
default:
- DBG_ERRORFILE( "DifParser::ScanFloatVal - missing enum" );
+ OSL_FAIL( "DifParser::ScanFloatVal - missing enum" );
}
pStart++;
}
@@ -829,11 +829,11 @@ DifColumn::DifColumn ()
void DifColumn::SetLogical( SCROW nRow )
{
- DBG_ASSERT( ValidRow(nRow), "*DifColumn::SetLogical(): Row zu gross!" );
+ OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetLogical(): Row zu gross!" );
if( pAkt )
{
- DBG_ASSERT( nRow > 0, "*DifColumn::SetLogical(): weitere koennen nicht 0 sein!" );
+ OSL_ENSURE( nRow > 0, "*DifColumn::SetLogical(): weitere koennen nicht 0 sein!" );
nRow--;
@@ -854,15 +854,15 @@ void DifColumn::SetLogical( SCROW nRow )
void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat )
{
- DBG_ASSERT( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row zu gross!" );
+ OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row zu gross!" );
if( nNumFormat > 0 )
{
if(pAkt)
{
- DBG_ASSERT( nRow > 0,
+ OSL_ENSURE( nRow > 0,
"*DifColumn::SetNumFormat(): weitere koennen nicht 0 sein!" );
- DBG_ASSERT( nRow > pAkt->nEnd,
+ OSL_ENSURE( nRow > pAkt->nEnd,
"*DifColumn::SetNumFormat(): Noch 'mal von vorne?" );
if( pAkt->nNumFormat == nNumFormat && pAkt->nEnd == nRow - 1 )
@@ -902,7 +902,7 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab )
for (boost::ptr_vector<ENTRY>::const_iterator it = aEntries.begin(); it != aEntries.end(); ++it)
{
- DBG_ASSERT( it->nNumFormat > 0,
+ OSL_ENSURE( it->nNumFormat > 0,
"+DifColumn::Apply(): Numberformat darf hier nicht 0 sein!" );
rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, it->nNumFormat ) );
@@ -934,8 +934,8 @@ DifAttrCache::~DifAttrCache()
void DifAttrCache::SetLogical( const SCCOL nCol, const SCROW nRow )
{
- DBG_ASSERT( ValidCol(nCol), "-DifAttrCache::SetLogical(): Col zu gross!" );
- DBG_ASSERT( bPlain, "*DifAttrCache::SetLogical(): muss Plain sein!" );
+ OSL_ENSURE( ValidCol(nCol), "-DifAttrCache::SetLogical(): Col zu gross!" );
+ OSL_ENSURE( bPlain, "*DifAttrCache::SetLogical(): muss Plain sein!" );
if( !ppCols[ nCol ] )
ppCols[ nCol ] = new DifColumn;
@@ -945,8 +945,8 @@ void DifAttrCache::SetLogical( const SCCOL nCol, const SCROW nRow )
void DifAttrCache::SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_uInt32 nNumFormat )
{
- DBG_ASSERT( ValidCol(nCol), "-DifAttrCache::SetNumFormat(): Col zu gross!" );
- DBG_ASSERT( !bPlain, "*DifAttrCache::SetNumFormat(): sollte nicht Plain sein!" );
+ OSL_ENSURE( ValidCol(nCol), "-DifAttrCache::SetNumFormat(): Col zu gross!" );
+ OSL_ENSURE( !bPlain, "*DifAttrCache::SetNumFormat(): sollte nicht Plain sein!" );
if( !ppCols[ nCol ] )
ppCols[ nCol ] = new DifColumn;
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index 3eaf95e..61f393b 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -93,7 +93,7 @@ void XclImpColRowSettings::SetDefWidth( sal_uInt16 nDefWidth, bool bStdWidthRec
void XclImpColRowSettings::SetWidthRange( SCCOL nScCol1, SCCOL nScCol2, sal_uInt16 nWidth )
{
- DBG_ASSERT( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::SetColWidthRange - invalid column range" );
+ OSL_ENSURE( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::SetColWidthRange - invalid column range" );
nScCol2 = ::std::min( nScCol2, MAXCOL );
if (nScCol2 == 256)
// In BIFF8, the column range is 0-255, and the use of 256 probably
@@ -115,7 +115,7 @@ void XclImpColRowSettings::HideCol( SCCOL nScCol )
void XclImpColRowSettings::HideColRange( SCCOL nScCol1, SCCOL nScCol2 )
{
- DBG_ASSERT( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::HideColRange - invalid column range" );
+ OSL_ENSURE( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::HideColRange - invalid column range" );
nScCol2 = ::std::min( nScCol2, MAXCOL );
nScCol1 = ::std::min( nScCol1, nScCol2 );
for( ScfUInt8Vec::iterator aIt = maColFlags.begin() + nScCol1, aEnd = maColFlags.begin() + nScCol2 + 1; aIt != aEnd; ++aIt )
@@ -195,7 +195,7 @@ void XclImpColRowSettings::SetDefaultXF( SCCOL nScCol1, SCCOL nScCol2, sal_uInt1
{
/* assign the default column formatting here to ensure that
explicit cell formatting is not overwritten. */
- DBG_ASSERT( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::SetDefaultXF - invalid column index" );
+ OSL_ENSURE( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::SetDefaultXF - invalid column index" );
nScCol2 = ::std::min( nScCol2, MAXCOL );
nScCol1 = ::std::min( nScCol1, nScCol2 );
XclImpXFRangeBuffer& rXFRangeBuffer = GetXFRangeBuffer();
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 8d6d49f..180d57d 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -174,7 +174,7 @@ ExcTable::~ExcTable()
void ExcTable::Add( XclExpRecordBase* pRec )
{
- DBG_ASSERT( pRec, "-ExcTable::Add(): pRec ist NULL!" );
+ OSL_ENSURE( pRec, "-ExcTable::Add(): pRec ist NULL!" );
aRecList.AppendNewRecord( pRec );
}
@@ -421,8 +421,8 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
XclBiff eBiff = GetBiff();
ScDocument& rDoc = GetDoc();
- DBG_ASSERT( (mnScTab >= 0L) && (mnScTab <= MAXTAB), "-ExcTable::Table(): mnScTab - no ordinary table!" );
- DBG_ASSERT( nExcTab <= static_cast<sal_uInt16>(MAXTAB), "-ExcTable::Table(): nExcTab - no ordinary table!" );
+ OSL_ENSURE( (mnScTab >= 0L) && (mnScTab <= MAXTAB), "-ExcTable::Table(): mnScTab - no ordinary table!" );
+ OSL_ENSURE( nExcTab <= static_cast<sal_uInt16>(MAXTAB), "-ExcTable::Table(): nExcTab - no ordinary table!" );
// create a new OBJ list for this sheet (may be used by notes, autofilter, data validation)
if( eBiff == EXC_BIFF8 )
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 01d8e91..0c8e591 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -58,20 +58,20 @@
FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat )
{
// check the passed Calc document
- DBG_ASSERT( pDocument, "::ScImportExcel - no document" );
+ OSL_ENSURE( pDocument, "::ScImportExcel - no document" );
if( !pDocument ) return eERR_INTERN; // should not happen
/* Import all BIFF versions regardless on eFormat, needed for import of
external cells (file type detection returns Excel4.0). */
if( (eFormat != EIF_AUTO) && (eFormat != EIF_BIFF_LE4) && (eFormat != EIF_BIFF5) && (eFormat != EIF_BIFF8) )
{
- DBG_ERRORFILE( "::ScImportExcel - wrong file format specification" );
+ OSL_FAIL( "::ScImportExcel - wrong file format specification" );
return eERR_FORMAT;
}
// check the input stream from medium
SvStream* pMedStrm = rMedium.GetInStream();
- DBG_ASSERT( pMedStrm, "::ScImportExcel - medium without input stream" );
+ OSL_ENSURE( pMedStrm, "::ScImportExcel - medium without input stream" );
if( !pMedStrm ) return eERR_OPEN; // should not happen
#if OSL_DEBUG_LEVEL > 0
@@ -278,12 +278,12 @@ FltError ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocumen
return eERR_NI;
// check the passed Calc document
- DBG_ASSERT( pDocument, "::ScImportExcel - no document" );
+ OSL_ENSURE( pDocument, "::ScImportExcel - no document" );
if( !pDocument ) return eERR_INTERN; // should not happen
// check the output stream from medium
SvStream* pMedStrm = rMedium.GetOutStream();
- DBG_ASSERT( pMedStrm, "::ScExportExcel5 - medium without output stream" );
+ OSL_ENSURE( pMedStrm, "::ScExportExcel5 - medium without output stream" );
if( !pMedStrm ) return eERR_OPEN; // should not happen
FltError eRet = eERR_UNKN_BIFF;
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index e53bf27..698b48d 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1322,7 +1322,7 @@ ConvErr ExcelToSc::ConvertExternName( const ScTokenArray*& /*rpArray*/, XclImpSt
sal_Bool ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen )
{
- DBG_ASSERT_BIFF( GetBiff() == EXC_BIFF5 );
+ OSL_ENSURE_BIFF( GetBiff() == EXC_BIFF5 );
if( GetBiff() != EXC_BIFF5 )
return false;
@@ -1823,13 +1823,13 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn )
pMatrix->GetDimensions( nC, nR);
if( nC != nCols || nR != nRows )
{
- DBG_ERRORFILE( "ExcelToSc::ReadExtensionArray - matrix size mismatch" );
+ OSL_FAIL( "ExcelToSc::ReadExtensionArray - matrix size mismatch" );
pMatrix = NULL;
}
}
else
{
- DBG_ERRORFILE( "ExcelToSc::ReadExtensionArray - missing matrix" );
+ OSL_FAIL( "ExcelToSc::ReadExtensionArray - missing matrix" );
}
for( nR = 0 ; nR < nRows; nR++ )
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 223dd7b..9de4f41 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -267,7 +267,7 @@ void ImportExcel8::Boundsheet( void )
SCTAB nScTab = static_cast< SCTAB >( nBdshtTab );
if( nScTab > 0 )
{
- DBG_ASSERT( !pD->HasTable( nScTab ), "ImportExcel8::Boundsheet - sheet exists already" );
+ OSL_ENSURE( !pD->HasTable( nScTab ), "ImportExcel8::Boundsheet - sheet exists already" );
pD->MakeTable( nScTab );
}
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 60b0ca7..f6cede5 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -431,7 +431,7 @@ ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) :
ExcBundlesheetBase( rRootData, _nTab )
{
String sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab );
- DBG_ASSERT( sTabName.Len() < 256, "ExcBundlesheet::ExcBundlesheet - table name too long" );
+ OSL_ENSURE( sTabName.Len() < 256, "ExcBundlesheet::ExcBundlesheet - table name too long" );
aName = ByteString( sTabName, rRootData.pER->GetTextEncoding() );
}
@@ -610,7 +610,7 @@ void ExcFilterCondition::Save( XclExpStream& rStrm )
rStrm << fVal;
break;
case EXC_AFTYPE_STRING:
- DBG_ASSERT( pText, "ExcFilterCondition::Save() -- pText is NULL!" );
+ OSL_ENSURE( pText, "ExcFilterCondition::Save() -- pText is NULL!" );
rStrm << (sal_uInt32)0 << (sal_uInt8) pText->Len() << (sal_uInt16)0 << (sal_uInt8)0;
break;
case EXC_AFTYPE_BOOLERR:
@@ -662,7 +662,7 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm )
{
if( nType == EXC_AFTYPE_STRING )
{
- DBG_ASSERT( pText, "ExcFilterCondition::SaveText() -- pText is NULL!" );
+ OSL_ENSURE( pText, "ExcFilterCondition::SaveText() -- pText is NULL!" );
pText->WriteFlagField( rStrm );
pText->WriteBuffer( rStrm );
}
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index c74fbf0..2e4a7d1 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -133,7 +133,7 @@ void XclImpOutlineBuffer::MakeScOutline()
if (nPos >= mnEndPos)
{
// Don't go beyond the max allowed position.
- DBG_ASSERT(aOutlineStack.empty(), "XclImpOutlineBuffer::MakeScOutline: outline stack not empty but expected to be.");
+ OSL_ENSURE(aOutlineStack.empty(), "XclImpOutlineBuffer::MakeScOutline: outline stack not empty but expected to be.");
break;
}
sal_uInt8 nLevel = itr->second;
@@ -145,7 +145,7 @@ void XclImpOutlineBuffer::MakeScOutline()
}
else
{
- DBG_ASSERT(nLevel < nCurLevel, "XclImpOutlineBuffer::MakeScOutline: unexpected level!");
+ OSL_ENSURE(nLevel < nCurLevel, "XclImpOutlineBuffer::MakeScOutline: unexpected level!");
for (sal_uInt8 i = 0; i < nCurLevel - nLevel; ++i)
{
if (aOutlineStack.empty())
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index e758867..4c2f95c 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -79,10 +79,10 @@ ExportBiff5::~ExportBiff5()
FltError ExportBiff5::Write()
{
SfxObjectShell* pDocShell = GetDocShell();
- DBG_ASSERT( pDocShell, "ExportBiff5::Write - no document shell" );
+ OSL_ENSURE( pDocShell, "ExportBiff5::Write - no document shell" );
SotStorageRef xRootStrg = GetRootStorage();
- DBG_ASSERT( xRootStrg.Is(), "ExportBiff5::Write - no root storage" );
+ OSL_ENSURE( xRootStrg.Is(), "ExportBiff5::Write - no root storage" );
bool bWriteBasicCode = false;
bool bWriteBasicStrg = false;
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 67856c5..10efcd4 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -96,7 +96,7 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet )
void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const String& rName )
{
- DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetName(): Array zu klein!" );
+ OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetName(): Array zu klein!" );
if( nIndex < nSize )
{
register ENTRY* pEntry = pData + nIndex;
@@ -110,7 +110,7 @@ void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const String& rName )
void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight )
{
- DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array zu klein!" );
+ OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array zu klein!" );
if( nIndex < nSize )
pData[ nIndex ].Height( *( new SvxFontHeightItem( ( sal_uLong ) nHeight * 20, 100, ATTR_FONT_HEIGHT ) ) );
}
@@ -118,7 +118,7 @@ void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeig
void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType )
{
- DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetType(): Array zu klein!" );
+ OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetType(): Array zu klein!" );
if( nIndex < nSize )
{
register ENTRY* pEntry = pData + nIndex;
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index aaa3070..7643c2f 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -55,7 +55,7 @@ void _ScRangeListTabs::Append( ScSingleRefData a, SCTAB nTab, const bool b )
}
else
{
- DBG_ASSERT( ValidTab(a.nTab), "-_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze!" );
+ OSL_ENSURE( ValidTab(a.nTab), "-_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze!" );
}
if( nTab == SCTAB_MAX)
@@ -122,9 +122,9 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCTAB nTab, bool b )
}
else
{
- DBG_ASSERT( ValidTab(a.Ref1.nTab),
+ OSL_ENSURE( ValidTab(a.Ref1.nTab),
"-_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze!" );
- DBG_ASSERT( a.Ref1.nTab == a.Ref2.nTab,
+ OSL_ENSURE( a.Ref1.nTab == a.Ref2.nTab,
"+_ScRangeListTabs::Append(): 3D-Ranges werden in SC nicht unterstuetzt!" );
}
@@ -157,7 +157,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCTAB nTab, bool b )
const ScRange* _ScRangeListTabs::First( SCTAB n )
{
- DBG_ASSERT( ValidTab(n), "-_ScRangeListTabs::First(): Und tschuessssssss!" );
+ OSL_ENSURE( ValidTab(n), "-_ScRangeListTabs::First(): Und tschuessssssss!" );
TabRangeType::iterator itr = maTabRanges.find(n);
if (itr == maTabRanges.end())
@@ -184,7 +184,7 @@ ConverterBase::ConverterBase( sal_uInt16 nNewBuffer ) :
eStatus( ConvOK ),
nBufferSize( nNewBuffer )
{
- DBG_ASSERT( nNewBuffer > 0, "ConverterBase::ConverterBase - nNewBuffer == 0!" );
+ OSL_ENSURE( nNewBuffer > 0, "ConverterBase::ConverterBase - nNewBuffer == 0!" );
pBuffer = new sal_Char[ nNewBuffer ];
}
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 7baccb9..31b4444 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -472,7 +472,7 @@ void ImportExcel::Columndefault( void )
aIn >> nColMic >> nColMac;
- DBG_ASSERT( aIn.GetRecLeft() == (sal_Size)(nColMac - nColMic) * 3 + 2,
+ OSL_ENSURE( aIn.GetRecLeft() == (sal_Size)(nColMac - nColMic) * 3 + 2,
"ImportExcel::Columndefault - wrong record size" );
nColMac--;
@@ -518,7 +518,7 @@ void ImportExcel::Array25( void )
static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
- DBG_ASSERT( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" );
+ OSL_ENSURE( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" );
ScMarkData aMarkData;
aMarkData.SelectOneTable( GetCurrScTab() );
@@ -707,7 +707,7 @@ void ImportExcel::Boundsheet( void )
SCTAB nScTab = static_cast< SCTAB >( nBdshtTab );
if( nScTab > 0 )
{
- DBG_ASSERT( !pD->HasTable( nScTab ), "ImportExcel::Boundsheet - sheet exists already" );
+ OSL_ENSURE( !pD->HasTable( nScTab ), "ImportExcel::Boundsheet - sheet exists already" );
pD->MakeTable( nScTab );
}
@@ -817,7 +817,7 @@ void ImportExcel::Shrfmla( void )
pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
- DBG_ASSERT( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray ist NULL!" );
+ OSL_ENSURE( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray ist NULL!" );
pExcRoot->pShrfmlaBuff->Store( ScRange( static_cast<SCCOL>(nFirstCol),
static_cast<SCROW>(nFirstRow), GetCurrScTab(),
@@ -958,7 +958,7 @@ void ImportExcel::Bof3( void )
maStrm.Ignore( 2 );
maStrm >> nSubType;
- DBG_ASSERT( nSubType != 0x0100, "*ImportExcel::Bof3(): Biff3 als Workbook?!" );
+ OSL_ENSURE( nSubType != 0x0100, "*ImportExcel::Bof3(): Biff3 als Workbook?!" );
if( nSubType == 0x0100 ) // Book
pExcRoot->eDateiTyp = Biff3W;
else if( nSubType == 0x0020 ) // Chart
@@ -988,7 +988,7 @@ void ImportExcel::Array34( void )
static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
- DBG_ASSERT( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" );
+ OSL_ENSURE( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" );
ScMarkData aMarkData;
aMarkData.SelectOneTable( GetCurrScTab() );
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 5d4db3a..9eaacdd 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -79,7 +79,7 @@ NameBuffer::~NameBuffer()
//void NameBuffer::operator <<( const SpString &rNewString )
void NameBuffer::operator <<( const String &rNewString )
{
- DBG_ASSERT( Count() + nBase < 0xFFFF,
+ OSL_ENSURE( Count() + nBase < 0xFFFF,
"*NameBuffer::GetLastIndex(): Ich hab' die Nase voll!" );
List::Insert( new StringHashEntry( rNewString ), LIST_APPEND );
@@ -122,7 +122,7 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
{
String aName( CreateName( rRange.aStart ) );
- DBG_ASSERT( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): Gleich wird mir schlecht...!" );
+ OSL_ENSURE( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): Gleich wird mir schlecht...!" );
ScRangeData* pData = new ScRangeData( pExcRoot->pIR->GetDocPtr(), aName, rToken, rRange.aStart, RT_SHARED );
const ScAddress& rMaxPos = pExcRoot->pIR->GetMaxPos();
@@ -191,7 +191,7 @@ sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const sal
sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex )
{
- DBG_ASSERT( nExcIndex,
+ OSL_ENSURE( nExcIndex,
"*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" );
nExcIndex--;
@@ -248,7 +248,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
{
- DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" );
+ OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" );
Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
if( pRet )
@@ -260,7 +260,7 @@ sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, String& rAppl, String& rDoc ) const
{
- DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" );
+ OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" );
Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
if( pRet )
@@ -331,7 +331,7 @@ void ExtNameBuff::AddName( const String& rName, sal_Int16 nRefIdx )
const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx ) const
{
- DBG_ASSERT( nNameIdx > 0, "ExtNameBuff::GetNameByIndex() - invalid name index" );
+ OSL_ENSURE( nNameIdx > 0, "ExtNameBuff::GetNameByIndex() - invalid name index" );
ExtNameMap::const_iterator aIt = maExtNames.find( nRefIdx );
return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : 0;
}
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 018faaa..679aa53 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -93,7 +93,7 @@ FltError ImportExcel::Read( void )
sal_uInt16 nOpcode;
sal_uInt16 nBofLevel = 0;
- DBG_ASSERT( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
+ OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
@@ -723,7 +723,7 @@ FltError ImportExcel::Read( void )
ePrev = eAkt;
eAkt = Z_Biffn0;
}
- DBG_ASSERT( pExcRoot->eDateiTyp != Biff5W,
+ OSL_ENSURE( pExcRoot->eDateiTyp != Biff5W,
"+ImportExcel::Read(): Doppel-Whopper-Workbook!" );
break;
@@ -885,11 +885,11 @@ FltError ImportExcel8::Read( void )
switch( nRecId )
{
case EXC_ID_USERSVIEWBEGIN:
- DBG_ASSERT( !bInUserView, "ImportExcel8::Read - nested user view settings" );
+ OSL_ENSURE( !bInUserView, "ImportExcel8::Read - nested user view settings" );
bInUserView = true;
break;
case EXC_ID_USERSVIEWEND:
- DBG_ASSERT( bInUserView, "ImportExcel8::Read - not in user view settings" );
+ OSL_ENSURE( bInUserView, "ImportExcel8::Read - not in user view settings" );
bInUserView = false;
break;
}
@@ -902,7 +902,7 @@ FltError ImportExcel8::Read( void )
{
if( nRecId == EXC_ID5_BOF )
{
- DBG_ASSERT( GetBiff() == EXC_BIFF8, "ImportExcel8::Read - wrong BIFF version" );
+ OSL_ENSURE( GetBiff() == EXC_BIFF8, "ImportExcel8::Read - wrong BIFF version" );
Bof5();
if( pExcRoot->eDateiTyp == Biff8W )
{
@@ -1053,7 +1053,7 @@ FltError ImportExcel8::Read( void )
GetTracer().TraceChartOnlySheet();
break;
case Biff8W: // workbook
- DBG_ERRORFILE( "ImportExcel8::Read - double workbook globals" );
+ OSL_FAIL( "ImportExcel8::Read - double workbook globals" );
// run through
case Biff8V: // VB module
default:
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 08dab68..80e9316 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -312,7 +312,7 @@ void TokenPool::GrowMatrix( void )
void TokenPool::GetElement( const sal_uInt16 nId )
{
- DBG_ASSERT( nId < nElementAkt, "*TokenPool::GetElement(): Id zu gross!?" );
+ OSL_ENSURE( nId < nElementAkt, "*TokenPool::GetElement(): Id zu gross!?" );
if( pType[ nId ] == T_Id )
GetElementRek( nId );
@@ -427,12 +427,12 @@ void TokenPool::GetElementRek( const sal_uInt16 nId )
{
#ifdef DBG_UTIL
nRek++;
- DBG_ASSERT( nRek <= nP_Id, "*TokenPool::GetElement(): Rekursion loopt!?" );
+ OSL_ENSURE( nRek <= nP_Id, "*TokenPool::GetElement(): Rekursion loopt!?" );
#endif
- DBG_ASSERT( nId < nElementAkt, "*TokenPool::GetElementRek(): Id zu gross!?" );
+ OSL_ENSURE( nId < nElementAkt, "*TokenPool::GetElementRek(): Id zu gross!?" );
- DBG_ASSERT( pType[ nId ] == T_Id, "-TokenPool::GetElementRek(): nId nicht Id-Folge!" );
+ OSL_ENSURE( pType[ nId ] == T_Id, "-TokenPool::GetElementRek(): nId nicht Id-Folge!" );
sal_uInt16 nAnz = pSize[ nId ];
@@ -613,7 +613,7 @@ const TokenId TokenPool::Store( const String& rString )
//...ansonsten nur kopieren
*ppP_Str[ nP_StrAkt ] = rString;
- DBG_ASSERT( sizeof( xub_StrLen ) <= 2, "*TokenPool::Store(): StrLen doesn't match!" );
+ OSL_ENSURE( sizeof( xub_StrLen ) <= 2, "*TokenPool::Store(): StrLen doesn't match!" );
pSize[ nElementAkt ] = ( sal_uInt16 ) ppP_Str[ nP_StrAkt ]->Len();
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 00c6acb..ae2a73e 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -282,7 +282,7 @@ void XclExpChRootData::InitializeFutureRecBlock( XclExpStream& rStrm )
// write all unwritten CHFRBLOCKBEGIN records
for( XclChFrBlockVector::const_iterator aIt = maUnwrittenFrBlocks.begin(), aEnd = maUnwrittenFrBlocks.end(); aIt != aEnd; ++aIt )
{
- DBG_ASSERT( aIt->mnType != EXC_CHFRBLOCK_TYPE_UNKNOWN, "XclExpChRootData::InitializeFutureRecBlock - unknown future record block type" );
+ OSL_ENSURE( aIt->mnType != EXC_CHFRBLOCK_TYPE_UNKNOWN, "XclExpChRootData::InitializeFutureRecBlock - unknown future record block type" );
lclWriteChFrBlockRecord( rStrm, *aIt, true );
}
// move all record infos to vector of written blocks
@@ -293,7 +293,7 @@ void XclExpChRootData::InitializeFutureRecBlock( XclExpStream& rStrm )
void XclExpChRootData::FinalizeFutureRecBlock( XclExpStream& rStrm )
{
- DBG_ASSERT( !maUnwrittenFrBlocks.empty() || !maWrittenFrBlocks.empty(), "XclExpChRootData::FinalizeFutureRecBlock - no future record level found" );
+ OSL_ENSURE( !maUnwrittenFrBlocks.empty() || !maWrittenFrBlocks.empty(), "XclExpChRootData::FinalizeFutureRecBlock - no future record level found" );
if( !maUnwrittenFrBlocks.empty() )
{
// no future record has been written, just forget the topmost level
@@ -362,7 +362,7 @@ bool XclExpChRoot::IsSystemColor( const Color& rColor, sal_uInt16 nSysColorIdx )
void XclExpChRoot::SetSystemColor( Color& rColor, sal_uInt32& rnColorId, sal_uInt16 nSysColorIdx ) const
{
- DBG_ASSERT( GetPalette().IsSystemColor( nSysColorIdx ), "XclExpChRoot::SetSystemColor - invalid color index" );
+ OSL_ENSURE( GetPalette().IsSystemColor( nSysColorIdx ), "XclExpChRoot::SetSystemColor - invalid color index" );
rColor = GetPalette().GetDefColor( nSysColorIdx );
rnColorId = XclExpPalette::GetColorIdFromIndex( nSysColorIdx );
}
@@ -532,7 +532,7 @@ void XclExpChLineFormat::SetDefault( XclChFrameType eDefFrameType )
maData.mnPattern = EXC_CHLINEFORMAT_NONE;
break;
default:
- DBG_ERRORFILE( "XclExpChLineFormat::SetDefault - unknown frame type" );
+ OSL_FAIL( "XclExpChLineFormat::SetDefault - unknown frame type" );
}
}
@@ -652,7 +652,7 @@ void XclExpChAreaFormat::SetDefault( XclChFrameType eDefFrameType )
maData.mnPattern = EXC_PATT_NONE;
break;
default:
- DBG_ERRORFILE( "XclExpChAreaFormat::SetDefault - unknown frame type" );
+ OSL_FAIL( "XclExpChAreaFormat::SetDefault - unknown frame type" );
}
}
@@ -680,7 +680,7 @@ XclExpChEscherFormat::XclExpChEscherFormat( const XclExpChRoot& rRoot ) :
mnColor1Id( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWBACK ) ),
mnColor2Id( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWBACK ) )
{
- DBG_ASSERT_BIFF( GetBiff() == EXC_BIFF8 );
+ OSL_ENSURE_BIFF( GetBiff() == EXC_BIFF8 );
}
void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectType eObjType )
@@ -741,7 +741,7 @@ sal_uInt32 XclExpChEscherFormat::RegisterColor( sal_uInt16 nPropId )
void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm )
{
- DBG_ASSERT( maData.mxEscherSet, "XclExpChEscherFormat::WriteBody - missing property container" );
+ OSL_ENSURE( maData.mxEscherSet, "XclExpChEscherFormat::WriteBody - missing property container" );
// write Escher property container via temporary memory stream
SvMemoryStream aMemStrm;
maData.mxEscherSet->Commit( aMemStrm );
@@ -901,7 +901,7 @@ void lclAddDoubleRefData(
if( orArray.GetLen() > 0 )
orArray.AddOpCode( ocUnion );
- DBG_ASSERT( (rToken.GetType() == ::formula::svDoubleRef) || (rToken.GetType() == ::formula::svExternalDoubleRef),
+ OSL_ENSURE( (rToken.GetType() == ::formula::svDoubleRef) || (rToken.GetType() == ::formula::svExternalDoubleRef),
"lclAddDoubleRefData - double reference token expected");
if( rToken.GetType() == ::formula::svExternalDoubleRef )
orArray.AddExternalDoubleReference( rToken.GetIndex(), rToken.GetString(), aComplexRef );
@@ -1054,7 +1054,7 @@ sal_uInt16 XclExpChSourceLink::ConvertStringSequence( const Sequence< Reference<
{
// get leading font index
const XclFormatRunVec& rFormats = mxString->GetFormats();
- DBG_ASSERT( !rFormats.empty() && (rFormats.front().mnChar == 0),
+ OSL_ENSURE( !rFormats.empty() && (rFormats.front().mnChar == 0),
"XclExpChSourceLink::ConvertStringSequenc - missing leading format" );
// remove leading format run, if entire string is equally formatted
if( rFormats.size() == 1 )
@@ -1306,7 +1306,7 @@ bool XclExpChText::ConvertDataLabel( const ScfPropertySet& rPropSet,
bool bIsPie = rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE;
// bubble sizes only allowed in bubble charts
bool bIsBubble = rTypeInfo.meTypeId == EXC_CHTYPEID_BUBBLES;
- DBG_ASSERT( (GetBiff() == EXC_BIFF8) || !bIsBubble, "XclExpChText::ConvertDataLabel - bubble charts only in BIFF8" );
+ OSL_ENSURE( (GetBiff() == EXC_BIFF8) || !bIsBubble, "XclExpChText::ConvertDataLabel - bubble charts only in BIFF8" );
// raw show flags
bool bShowValue = !bIsBubble && aPointLabel.ShowNumber; // Chart2 uses 'ShowNumber' for bubble size
@@ -1367,7 +1367,7 @@ bool XclExpChText::ConvertDataLabel( const ScfPropertySet& rPropSet,
case INSIDE: nLabelPos = EXC_CHTEXT_POS_INSIDE; break;
case OUTSIDE: nLabelPos = EXC_CHTEXT_POS_OUTSIDE; break;
case NEAR_ORIGIN: nLabelPos = EXC_CHTEXT_POS_AXIS; break;
- default: DBG_ERRORFILE( "XclExpChText::ConvertDataLabel - unknown label placement type" );
+ default: OSL_FAIL( "XclExpChText::ConvertDataLabel - unknown label placement type" );
}
}
::insert_value( maData.mnFlags2, nLabelPos, 0, 4 );
@@ -1588,7 +1588,7 @@ void XclExpCh3dDataFormat::Convert( const ScfPropertySet& rPropSet )
maData.mnTop = EXC_CH3DDATAFORMAT_SHARP;
break;
default:
- DBG_ERRORFILE( "XclExpCh3dDataFormat::Convert - unknown 3D bar format" );
+ OSL_FAIL( "XclExpCh3dDataFormat::Convert - unknown 3D bar format" );
}
}
}
@@ -1848,7 +1848,7 @@ ScfPropertySet lclGetPointPropSet( Reference< XDataSeries > xDataSeries, sal_Int
}
catch( Exception& )
{
- DBG_ERRORFILE( "lclGetPointPropSet - no data point property set" );
+ OSL_FAIL( "lclGetPointPropSet - no data point property set" );
}
return aPropSet;
}
@@ -2239,7 +2239,7 @@ void XclExpChType::WriteBody( XclExpStream& rStrm )
break;
default:
- DBG_ERRORFILE( "XclExpChType::WriteBody - unknown chart type" );
+ OSL_FAIL( "XclExpChType::WriteBody - unknown chart type" );
}
}
@@ -2664,7 +2664,7 @@ void XclExpChLabelRange::Convert( const ScaleData& rScaleData, const ScfProperty
// ...but get the current base time unit from the property of the old chart API
sal_Int32 nApiTimeUnit = 0;
bool bValidBaseUnit = aTimeIncrement.TimeResolution >>= nApiTimeUnit;
- DBG_ASSERT( bValidBaseUnit, "XclExpChLabelRange::Convert - cannot ghet base time unit" );
+ OSL_ENSURE( bValidBaseUnit, "XclExpChLabelRange::Convert - cannot ghet base time unit" );
maDateData.mnBaseUnit = bValidBaseUnit ? lclGetTimeUnit( nApiTimeUnit ) : EXC_CHDATERANGE_DAYS;
/* Min/max values depend on base time unit, they specify the number of
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 32ac926..9dd529d 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -135,7 +135,7 @@ XclExpSstImpl::XclExpSstImpl() :
sal_uInt32 XclExpSstImpl::Insert( XclExpStringRef xString )
{
- DBG_ASSERT( xString.get(), "XclExpSstImpl::Insert - empty pointer not allowed" );
+ OSL_ENSURE( xString.get(), "XclExpSstImpl::Insert - empty pointer not allowed" );
if( !xString.get() )
xString.reset( new XclExpString );
@@ -206,7 +206,7 @@ void XclExpSstImpl::Save( XclExpStream& rStrm )
aStr.Append( '\t' ).APPENDINT( nStrings ).Append( '\n' );
}
}
- DBG_ERRORFILE( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
#undef APPENDINT
}
#endif
@@ -332,7 +332,7 @@ void XclExpMergedcells::AppendRange( const ScRange& rRange, sal_uInt32 nBaseXFId
sal_uInt32 XclExpMergedcells::GetBaseXFId( const ScAddress& rPos ) const
{
- DBG_ASSERT( maBaseXFIds.size() == maMergedRanges.size(), "XclExpMergedcells::GetBaseXFId - invalid lists" );
+ OSL_ENSURE( maBaseXFIds.size() == maMergedRanges.size(), "XclExpMergedcells::GetBaseXFId - invalid lists" );
ScfUInt32Vec::const_iterator aIt = maBaseXFIds.begin();
ScRangeList& rNCRanges = const_cast< ScRangeList& >( maMergedRanges );
for ( size_t i = 0, nRanges = rNCRanges.size(); i < nRanges; ++i, ++aIt )
@@ -715,7 +715,7 @@ XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rF
case SC_COND_EQLESS: mnOperator = EXC_CF_CMP_LESS_EQUAL; break;
case SC_COND_DIRECT: mnType = EXC_CF_TYPE_FMLA; break;
default: mnType = EXC_CF_TYPE_NONE;
- DBG_ERRORFILE( "XclExpCF::WriteBody - unknown condition type" );
+ OSL_FAIL( "XclExpCF::WriteBody - unknown condition type" );
}
// *** formulas ***
@@ -880,8 +880,8 @@ void XclExpCondfmt::Save( XclExpStream& rStrm )
void XclExpCondfmt::WriteBody( XclExpStream& rStrm )
{
- DBG_ASSERT( !maCFList.IsEmpty(), "XclExpCondfmt::WriteBody - no CF records to write" );
- DBG_ASSERT( !maXclRanges.empty(), "XclExpCondfmt::WriteBody - no cell ranges found" );
+ OSL_ENSURE( !maCFList.IsEmpty(), "XclExpCondfmt::WriteBody - no CF records to write" );
+ OSL_ENSURE( !maXclRanges.empty(), "XclExpCondfmt::WriteBody - no cell ranges found" );
rStrm << static_cast< sal_uInt16 >( maCFList.GetSize() )
<< sal_uInt16( 1 )
@@ -1039,7 +1039,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
case SC_VALID_TIME: mnFlags |= EXC_DV_MODE_TIME; break;
case SC_VALID_TEXTLEN: mnFlags |= EXC_DV_MODE_TEXTLEN; break;
case SC_VALID_CUSTOM: mnFlags |= EXC_DV_MODE_CUSTOM; break;
- default: DBG_ERRORFILE( "XclExpDV::XclExpDV - unknown mode" );
+ default: OSL_FAIL( "XclExpDV::XclExpDV - unknown mode" );
}
switch( pValData->GetOperation() )
@@ -1053,7 +1053,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
case SC_COND_NOTEQUAL: mnFlags |= EXC_DV_COND_NOTEQUAL; break;
case SC_COND_BETWEEN: mnFlags |= EXC_DV_COND_BETWEEN; break;
case SC_COND_NOTBETWEEN: mnFlags |= EXC_DV_COND_NOTBETWEEN; break;
- default: DBG_ERRORFILE( "XclExpDV::XclExpDV - unknown condition" );
+ default: OSL_FAIL( "XclExpDV::XclExpDV - unknown condition" );
}
switch( eScErrorStyle )
{
@@ -1065,7 +1065,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
mnFlags |= EXC_DV_ERROR_INFO;
maErrorTitle.Assign( '\0' ); // contains macro name
break;
- default: DBG_ERRORFILE( "XclExpDV::XclExpDV - unknown error style" );
+ default: OSL_FAIL( "XclExpDV::XclExpDV - unknown error style" );
}
::set_flag( mnFlags, EXC_DV_IGNOREBLANK, pValData->IsIgnoreBlank() );
::set_flag( mnFlags, EXC_DV_SUPPRESSDROPDOWN, pValData->GetListType() == ValidListType::INVISIBLE );
@@ -1142,7 +1142,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
}
else
{
- DBG_ERRORFILE( "XclExpDV::XclExpDV - missing core data" );
+ OSL_FAIL( "XclExpDV::XclExpDV - missing core data" );
mnScHandle = ULONG_MAX;
}
}
@@ -1355,7 +1355,7 @@ XclExpWebQuery::~XclExpWebQuery()
void XclExpWebQuery::Save( XclExpStream& rStrm )
{
- DBG_ASSERT( !mbEntireDoc || !mxQryTables.get(), "XclExpWebQuery::Save - illegal mode" );
+ OSL_ENSURE( !mbEntireDoc || !mxQryTables.get(), "XclExpWebQuery::Save - illegal mode" );
sal_uInt16 nFlags;
// QSI record
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index e0faf0e..c8b6cfc 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1321,7 +1321,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
void XclExpNote::WriteBody( XclExpStream& rStrm )
{
// BIFF5/BIFF7 is written separately
- DBG_ASSERT_BIFF( rStrm.GetRoot().GetBiff() == EXC_BIFF8 );
+ OSL_ENSURE_BIFF( rStrm.GetRoot().GetBiff() == EXC_BIFF8 );
sal_uInt16 nFlags = 0;
::set_flag( nFlags, EXC_NOTE_VISIBLE, mbVisible );
@@ -1574,7 +1574,7 @@ boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPa
if( pSdrPage )
mxEscherEx->AddSdrPage( *pSdrPage );
// the first dummy object may still be open
- DBG_ASSERT( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" );
+ OSL_ENSURE( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" );
while( mxEscherEx->GetGroupLevel() )
mxEscherEx->LeaveGroup();
mxObjList->EndSheet();
@@ -1586,7 +1586,7 @@ boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const
if( rxShapes.is() )
mxEscherEx->AddUnoShapes( rxShapes );
// the first dummy object may still be open
- DBG_ASSERT( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" );
+ OSL_ENSURE( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" );
while( mxEscherEx->GetGroupLevel() )
mxEscherEx->LeaveGroup();
mxObjList->EndSheet();
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 9dbb277..eb48943 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -192,7 +192,7 @@ XclExpFuncData::XclExpFuncData( const XclExpScToken& rTokData,
mxOperands( new XclExpOperandList ),
mpParamInfo( rFuncInfo.mpParamInfos )
{
- DBG_ASSERT( mrTokData.mpScToken, "XclExpFuncData::XclExpFuncData - missing core token" );
+ OSL_ENSURE( mrTokData.mpScToken, "XclExpFuncData::XclExpFuncData - missing core token" );
// set name of an add-in function
if( (maExtFuncData.maFuncName.Len() == 0) && dynamic_cast< const FormulaExternalToken* >( mrTokData.mpScToken ) )
maExtFuncData.Set( GetScToken().GetExternal(), true, false );
@@ -308,7 +308,7 @@ XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) :
mbVolatile( false ),
mbOk( pCfg != 0 )
{
- DBG_ASSERT( pCfg, "XclExpFmlaCompImpl::Init - unknown formula type" );
+ OSL_ENSURE( pCfg, "XclExpFmlaCompImpl::Init - unknown formula type" );
}
} // namespace
@@ -532,7 +532,7 @@ XclTokenArrayRef XclExpFmlaCompImpl::CreateFormula( XclFormulaType eType,
}
else
{
- DBG_ERRORFILE( "XclExpFmlaCompImpl::CreateFormula - empty token array" );
+ OSL_FAIL( "XclExpFmlaCompImpl::CreateFormula - empty token array" );
mxData->mbOk = false;
}
@@ -540,7 +540,7 @@ XclTokenArrayRef XclExpFmlaCompImpl::CreateFormula( XclFormulaType eType,
{
// #i44907# auto-generated SUBTOTAL formula cells have trailing ocStop token
mxData->mbOk = !aTokData.Is() || (aTokData.GetOpCode() == ocStop);
- DBG_ASSERT( mxData->mbOk, "XclExpFmlaCompImpl::CreateFormula - unknown garbage behind formula" );
+ OSL_ENSURE( mxData->mbOk, "XclExpFmlaCompImpl::CreateFormula - unknown garbage behind formula" );
}
}
@@ -586,7 +586,7 @@ bool XclExpFmlaCompImpl::Is3DRefOnly( XclFormulaType eType ) const
const XclExpCompConfig* XclExpFmlaCompImpl::GetConfigForType( XclFormulaType eType ) const
{
XclExpCompConfigMap::const_iterator aIt = maCfgMap.find( eType );
- DBG_ASSERT( aIt != maCfgMap.end(), "XclExpFmlaCompImpl::GetConfigForType - unknown formula type" );
+ OSL_ENSURE( aIt != maCfgMap.end(), "XclExpFmlaCompImpl::GetConfigForType - unknown formula type" );
return (aIt == maCfgMap.end()) ? 0 : &aIt->second;
}
@@ -612,12 +612,12 @@ void XclExpFmlaCompImpl::Init( XclFormulaType eType, const ScTokenArray& rScTokA
case EXC_FMLATYPE_MATRIX:
case EXC_FMLATYPE_CHART:
mxData->mbOk = pScBasePos != 0;
- DBG_ASSERT( mxData->mbOk, "XclExpFmlaCompImpl::Init - missing cell address" );
+ OSL_ENSURE( mxData->mbOk, "XclExpFmlaCompImpl::Init - missing cell address" );
mxData->mpScBasePos = pScBasePos;
break;
case EXC_FMLATYPE_SHARED:
mxData->mbOk = pScBasePos != 0;
- DBG_ASSERT( mxData->mbOk, "XclExpFmlaCompImpl::Init - missing cell address" );
+ OSL_ENSURE( mxData->mbOk, "XclExpFmlaCompImpl::Init - missing cell address" );
// clone the passed token array, convert references relative to current cell position
mxData->mxOwnScTokArr.reset( rScTokArr.Clone() );
ScCompiler::MoveRelWrap( *mxData->mxOwnScTokArr, GetDocPtr(), *pScBasePos, MAXCOL, MAXROW );
@@ -642,7 +642,7 @@ void XclExpFmlaCompImpl::RecalcTokenClasses()
if( mxData->mbOk )
{
mxData->mbOk = mxData->maOpPosStack.size() == 1;
- DBG_ASSERT( mxData->mbOk, "XclExpFmlaCompImpl::RecalcTokenClasses - position of root token expected on stack" );
+ OSL_ENSURE( mxData->mbOk, "XclExpFmlaCompImpl::RecalcTokenClasses - position of root token expected on stack" );
if( mxData->mbOk )
{
/* Cell and array formulas start with VAL conversion and VALTYPE
@@ -665,7 +665,7 @@ void XclExpFmlaCompImpl::RecalcTokenClasses()
void XclExpFmlaCompImpl::RecalcTokenClass( const XclExpTokenConvInfo& rConvInfo,
XclFuncParamConv ePrevConv, XclExpClassConv ePrevClassConv, bool bWasRefClass )
{
- DBG_ASSERT( rConvInfo.mnTokPos < GetSize(), "XclExpFmlaCompImpl::RecalcTokenClass - invalid token position" );
+ OSL_ENSURE( rConvInfo.mnTokPos < GetSize(), "XclExpFmlaCompImpl::RecalcTokenClass - invalid token position" );
sal_uInt8& rnTokenId = mxData->maTokVec[ rConvInfo.mnTokPos ];
sal_uInt8 nTokClass = GetTokenClass( rnTokenId );
@@ -796,7 +796,7 @@ void XclExpFmlaCompImpl::FinalizeFormula()
XclTokenArrayRef XclExpFmlaCompImpl::CreateTokenArray()
{
// create the Excel token array from working data before resetting mxData
- DBG_ASSERT( mxData->mrCfg.mbAllowArrays || mxData->maExtDataVec.empty(), "XclExpFmlaCompImpl::CreateTokenArray - unexpected extended data" );
+ OSL_ENSURE( mxData->mrCfg.mbAllowArrays || mxData->maExtDataVec.empty(), "XclExpFmlaCompImpl::CreateTokenArray - unexpected extended data" );
if( !mxData->mrCfg.mbAllowArrays )
mxData->maExtDataVec.clear();
XclTokenArrayRef xTokArr( new XclTokenArray( mxData->maTokVec, mxData->maExtDataVec, mxData->mbVolatile ) );
@@ -1291,7 +1291,7 @@ void XclExpFmlaCompImpl::ProcessMatrix( const XclExpScToken& rTokData )
{
SCSIZE nScCols, nScRows;
pMatrix->GetDimensions( nScCols, nScRows );
- DBG_ASSERT( (nScCols > 0) && (nScRows > 0), "XclExpFmlaCompImpl::ProcessMatrix - invalid matrix size" );
+ OSL_ENSURE( (nScCols > 0) && (nScRows > 0), "XclExpFmlaCompImpl::ProcessMatrix - invalid matrix size" );
sal_uInt16 nCols = ::limit_cast< sal_uInt16 >( nScCols, 0, 256 );
sal_uInt16 nRows = ::limit_cast< sal_uInt16 >( nScRows, 0, 1024 );
@@ -1492,9 +1492,9 @@ void XclExpFmlaCompImpl::FinishFunction( XclExpFuncData& rFuncData, sal_uInt8 nC
void XclExpFmlaCompImpl::FinishIfFunction( XclExpFuncData& rFuncData )
{
sal_uInt16 nParamCount = rFuncData.GetParamCount();
- DBG_ASSERT( (nParamCount == 2) || (nParamCount == 3), "XclExpFmlaCompImpl::FinishIfFunction - wrong parameter count" );
+ OSL_ENSURE( (nParamCount == 2) || (nParamCount == 3), "XclExpFmlaCompImpl::FinishIfFunction - wrong parameter count" );
const ScfUInt16Vec& rAttrPos = rFuncData.GetAttrPosVec();
- DBG_ASSERT( nParamCount == rAttrPos.size(), "XclExpFmlaCompImpl::FinishIfFunction - wrong number of tAttr tokens" );
+ OSL_ENSURE( nParamCount == rAttrPos.size(), "XclExpFmlaCompImpl::FinishIfFunction - wrong number of tAttr tokens" );
// update tAttrIf token following the condition parameter
Overwrite( rAttrPos[ 0 ] + 2, static_cast< sal_uInt16 >( rAttrPos[ 1 ] - rAttrPos[ 0 ] ) );
// update the tAttrGoto tokens following true and false parameters
@@ -1507,7 +1507,7 @@ void XclExpFmlaCompImpl::FinishChooseFunction( XclExpFuncData& rFuncData )
{
sal_uInt16 nParamCount = rFuncData.GetParamCount();
ScfUInt16Vec& rAttrPos = rFuncData.GetAttrPosVec();
- DBG_ASSERT( nParamCount == rAttrPos.size(), "XclExpFmlaCompImpl::FinishChooseFunction - wrong number of tAttr tokens" );
+ OSL_ENSURE( nParamCount == rAttrPos.size(), "XclExpFmlaCompImpl::FinishChooseFunction - wrong number of tAttr tokens" );
// number of choices is parameter count minus 1
sal_uInt16 nChoices = nParamCount - 1;
// tAttrChoose token contains number of choices
@@ -1637,7 +1637,7 @@ void XclExpFmlaCompImpl::AppendDefaultParam( XclExpFuncData& rFuncData )
break;
default:
{
- DBG_ASSERT( rFuncData.IsMacroFunc(), "XclExpFmlaCompImpl::AppendDefaultParam - unknown opcode" );
+ OSL_ENSURE( rFuncData.IsMacroFunc(), "XclExpFmlaCompImpl::AppendDefaultParam - unknown opcode" );
if( rFuncData.IsMacroFunc() )
AppendMacroCallToken( rFuncData.GetExtFuncData() );
else
@@ -1841,7 +1841,7 @@ void XclExpFmlaCompImpl::ConvertRefData(
// flags for relative column and row
if( bNatLangRef )
{
- DBG_ASSERT( meBiff == EXC_BIFF8, "XclExpFmlaCompImpl::ConvertRefData - NLRs only for BIFF8" );
+ OSL_ENSURE( meBiff == EXC_BIFF8, "XclExpFmlaCompImpl::ConvertRefData - NLRs only for BIFF8" );
// Calc does not support absolute reference mode in natural language references
::set_flag( rXclPos.mnCol, EXC_TOK_NLR_REL );
}
@@ -1884,7 +1884,7 @@ void XclExpFmlaCompImpl::ProcessCellRef( const XclExpScToken& rTokData )
if( bNatLangRef )
{
- DBG_ASSERT( aRefData.IsColRel() != aRefData.IsRowRel(),
+ OSL_ENSURE( aRefData.IsColRel() != aRefData.IsRowRel(),
"XclExpFmlaCompImpl::ProcessCellRef - broken natural language reference" );
// create tNlr token for natural language reference
sal_uInt8 nSubId = aRefData.IsColRel() ? EXC_TOK_NLR_COLV : EXC_TOK_NLR_ROWV;
@@ -2146,7 +2146,7 @@ void XclExpFmlaCompImpl::PushOperandPos( sal_uInt16 nTokPos )
void XclExpFmlaCompImpl::PushOperatorPos( sal_uInt16 nTokPos, const XclExpOperandListRef& rxOperands )
{
PushOperandPos( nTokPos );
- DBG_ASSERT( rxOperands.get(), "XclExpFmlaCompImpl::AppendOperatorTokenId - missing operand list" );
+ OSL_ENSURE( rxOperands.get(), "XclExpFmlaCompImpl::AppendOperatorTokenId - missing operand list" );
if( mxData->maOpListVec.size() <= nTokPos )
mxData->maOpListVec.resize( nTokPos + 1, XclExpOperandListRef() );
mxData->maOpListVec[ nTokPos ] = rxOperands;
@@ -2154,7 +2154,7 @@ void XclExpFmlaCompImpl::PushOperatorPos( sal_uInt16 nTokPos, const XclExpOperan
sal_uInt16 XclExpFmlaCompImpl::PopOperandPos()
{
- DBG_ASSERT( !mxData->mbOk || !mxData->maOpPosStack.empty(), "XclExpFmlaCompImpl::PopOperandPos - token stack broken" );
+ OSL_ENSURE( !mxData->mbOk || !mxData->maOpPosStack.empty(), "XclExpFmlaCompImpl::PopOperandPos - token stack broken" );
mxData->mbOk &= !mxData->maOpPosStack.empty();
if( mxData->mbOk )
{
@@ -2435,7 +2435,7 @@ void XclExpFmlaCompImpl::AppendJumpToken( XclExpFuncData& rFuncData, sal_uInt8 n
void XclExpFmlaCompImpl::InsertZeros( sal_uInt16 nInsertPos, sal_uInt16 nInsertSize )
{
// insert zeros into the token array
- DBG_ASSERT( nInsertPos < mxData->maTokVec.size(), "XclExpFmlaCompImpl::Insert - invalid position" );
+ OSL_ENSURE( nInsertPos < mxData->maTokVec.size(), "XclExpFmlaCompImpl::Insert - invalid position" );
mxData->maTokVec.insert( mxData->maTokVec.begin() + nInsertPos, nInsertSize, 0 );
// update positions of operands waiting for an operator
@@ -2455,7 +2455,7 @@ void XclExpFmlaCompImpl::InsertZeros( sal_uInt16 nInsertPos, sal_uInt16 nInsertS
void XclExpFmlaCompImpl::Overwrite( sal_uInt16 nWriteToPos, sal_uInt16 nOffset )
{
- DBG_ASSERT( static_cast< size_t >( nWriteToPos + 1 ) < mxData->maTokVec.size(), "XclExpFmlaCompImpl::Overwrite - invalid position" );
+ OSL_ENSURE( static_cast< size_t >( nWriteToPos + 1 ) < mxData->maTokVec.size(), "XclExpFmlaCompImpl::Overwrite - invalid position" );
ShortToSVBT16( nOffset, &mxData->maTokVec[ nWriteToPos ] );
}
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 0afa63a..a900012 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -118,10 +118,10 @@ void XclExpProgressBar::IncRowRecordCount()
void XclExpProgressBar::ActivateCreateRowsSegment()
{
- DBG_ASSERT( (0 <= GetCurrScTab()) && (GetCurrScTab() < GetTabInfo().GetScTabCount()),
+ OSL_ENSURE( (0 <= GetCurrScTab()) && (GetCurrScTab() < GetTabInfo().GetScTabCount()),
"XclExpProgressBar::ActivateCreateRowsSegment - invalid sheet" );
sal_Int32 nSeg = maSubSegRowCreate[ GetCurrScTab() ];
- DBG_ASSERT( nSeg != SCF_INV_SEGMENT, "XclExpProgressBar::ActivateCreateRowsSegment - invalid segment" );
+ OSL_ENSURE( nSeg != SCF_INV_SEGMENT, "XclExpProgressBar::ActivateCreateRowsSegment - invalid segment" );
if( nSeg != SCF_INV_SEGMENT )
{
mpSubProgress = mpSubRowCreate;
@@ -492,7 +492,7 @@ XclExpStringRef lclCreateFormattedString(
}
else
{
- DBG_ERRORFILE( "lclCreateFormattedString - unknown text field" );
+ OSL_FAIL( "lclCreateFormattedString - unknown text field" );
aXclPortionText.Erase();
}
}
@@ -637,7 +637,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
}
else
{
- DBG_ERRORFILE( "XclExpStringHelper::CreateString - textbox without para object" );
+ OSL_FAIL( "XclExpStringHelper::CreateString - textbox without para object" );
// create BIFF dependent empty Excel string
xString = CreateString( rRoot, EMPTY_STRING, nFlags, nMaxLen );
}
@@ -863,7 +863,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
aParaText.AppendAscii( "&Z&F" );
break;
default:
- DBG_ERRORFILE( "XclExpHFConverter::AppendPortion - unknown file field" );
+ OSL_FAIL( "XclExpHFConverter::AppendPortion - unknown file field" );
}
}
}
@@ -1004,7 +1004,7 @@ void lclEncodeDosUrl( XclBiff eBiff, String& rUrl, const String* pTableName = 0
rUrl = pTableName ? EXC_URLSTART_SELFENCODED : EXC_URLSTART_SELF;
break;
case EXC_BIFF8:
- DBG_ASSERT( pTableName, "lclEncodeDosUrl - sheet name required for BIFF8" );
+ OSL_ENSURE( pTableName, "lclEncodeDosUrl - sheet name required for BIFF8" );
rUrl = EXC_URLSTART_SELF;
break;
default:
@@ -1052,8 +1052,8 @@ void XclExpCachedMatrix::GetDimensions( SCSIZE & nCols, SCSIZE & nRows ) const
{
mrMatrix.GetDimensions( nCols, nRows );
- DBG_ASSERT( nCols && nRows, "XclExpCachedMatrix::GetDimensions - empty matrix" );
- DBG_ASSERT( nCols <= 256, "XclExpCachedMatrix::GetDimensions - too many columns" );
+ OSL_ENSURE( nCols && nRows, "XclExpCachedMatrix::GetDimensions - empty matrix" );
+ OSL_ENSURE( nCols <= 256, "XclExpCachedMatrix::GetDimensions - too many columns" );
}
sal_Size XclExpCachedMatrix::GetSize() const
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index db95954..7c16612 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -773,7 +773,7 @@ bool XclExpTabInfo::IsSelectedTab( SCTAB nScTab ) const
bool XclExpTabInfo::IsDisplayedTab( SCTAB nScTab ) const
{
- DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" );
+ OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" );
return GetXclTab( nScTab ) == mnDisplXclTab;
}
@@ -784,7 +784,7 @@ bool XclExpTabInfo::IsMirroredTab( SCTAB nScTab ) const
const String& XclExpTabInfo::GetScTabName( SCTAB nScTab ) const
{
- DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" );
+ OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" );
return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : EMPTY_STRING;
}
@@ -795,19 +795,19 @@ sal_uInt16 XclExpTabInfo::GetXclTab( SCTAB nScTab ) const
SCTAB XclExpTabInfo::GetRealScTab( SCTAB nSortedScTab ) const
{
- DBG_ASSERT( nSortedScTab < mnScCnt, "XclExpTabInfo::GetRealScTab - sheet out of range" );
+ OSL_ENSURE( nSortedScTab < mnScCnt, "XclExpTabInfo::GetRealScTab - sheet out of range" );
return (nSortedScTab < mnScCnt) ? maFromSortedVec[ nSortedScTab ] : SCTAB_INVALID;
}
bool XclExpTabInfo::GetFlag( SCTAB nScTab, sal_uInt8 nFlags ) const
{
- DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::GetFlag - sheet out of range" );
+ OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::GetFlag - sheet out of range" );
return (nScTab < mnScCnt) && ::get_flag( maTabInfoVec[ nScTab ].mnFlags, nFlags );
}
void XclExpTabInfo::SetFlag( SCTAB nScTab, sal_uInt8 nFlags, bool bSet )
{
- DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::SetFlag - sheet out of range" );
+ OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::SetFlag - sheet out of range" );
if( nScTab < mnScCnt )
::set_flag( maTabInfoVec[ nScTab ].mnFlags, nFlags, bSet );
}
@@ -887,7 +887,7 @@ XclExpExtNameBase::XclExpExtNameBase(
mxName( XclExpStringHelper::CreateString( rRoot, rName, EXC_STR_8BITLENGTH ) ),
mnFlags( nFlags )
{
- DBG_ASSERT( maName.Len() <= 255, "XclExpExtNameBase::XclExpExtNameBase - string too long" );
+ OSL_ENSURE( maName.Len() <= 255, "XclExpExtNameBase::XclExpExtNameBase - string too long" );
SetRecSize( 6 + mxName->GetSize() );
}
@@ -1355,7 +1355,7 @@ void XclExpExternSheet::Save( XclExpStream& rStrm )
void XclExpExternSheet::Init( const String& rEncUrl )
{
- DBG_ASSERT_BIFF( GetBiff() <= EXC_BIFF5 );
+ OSL_ENSURE_BIFF( GetBiff() <= EXC_BIFF5 );
maTabName.AssignByte( rEncUrl, GetTextEncoding(), EXC_STR_8BITLENGTH );
SetRecSize( maTabName.GetSize() );
}
@@ -1489,7 +1489,7 @@ sal_uInt16 XclExpSupbook::GetTabCount() const
sal_uInt16 XclExpSupbook::InsertTabName( const String& rTabName, ScExternalRefCache::TableTypeRef xCacheTable )
{
- DBG_ASSERT( meType == EXC_SBTYPE_EXTERN, "XclExpSupbook::InsertTabName - don't insert sheet names here" );
+ OSL_ENSURE( meType == EXC_SBTYPE_EXTERN, "XclExpSupbook::InsertTabName - don't insert sheet names here" );
sal_uInt16 nSBTab = ulimit_cast< sal_uInt16 >( maXctList.GetSize() );
XclExpXctRef xXct( new XclExpXct( GetRoot(), rTabName, nSBTab, xCacheTable ) );
AddRecSize( xXct->GetTabName().GetSize() );
@@ -1555,7 +1555,7 @@ void XclExpSupbook::WriteBody( XclExpStream& rStrm )
rStrm << mnXclTabCount << EXC_SUPB_ADDIN;
break;
default:
- DBG_ERRORFILE( "XclExpSupbook::WriteBody - unknown SUPBOOK type" );
+ OSL_FAIL( "XclExpSupbook::WriteBody - unknown SUPBOOK type" );
}
}
@@ -1571,7 +1571,7 @@ XclExpSupbookBuffer::XclExpSupbookBuffer( const XclExpRoot& rRoot ) :
sal_uInt16 nCodeCnt = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() );
size_t nCount = nXclCnt + rTabInfo.GetXclExtTabCount();
- DBG_ASSERT( nCount > 0, "XclExpSupbookBuffer::XclExpSupbookBuffer - no sheets to export" );
+ OSL_ENSURE( nCount > 0, "XclExpSupbookBuffer::XclExpSupbookBuffer - no sheets to export" );
if( nCount )
{
maSBIndexVec.resize( nCount );
@@ -1633,7 +1633,7 @@ void XclExpSupbookBuffer::StoreCellRange( const ScRange& rRange )
{
const XclExpSBIndex& rSBIndex = maSBIndexVec[ nXclTab ];
XclExpSupbookRef xSupbook = maSupbookList.GetRecord( rSBIndex.mnSupbook );
- DBG_ASSERT( xSupbook , "XclExpSupbookBuffer::StoreCellRange - missing SUPBOOK record" );
+ OSL_ENSURE( xSupbook , "XclExpSupbookBuffer::StoreCellRange - missing SUPBOOK record" );
if( xSupbook )
xSupbook->StoreCellRange( rRange, rSBIndex.mnSBTab );
}
@@ -1775,7 +1775,7 @@ bool XclExpSupbookBuffer::InsertAddIn(
}
else
xSupbook = maSupbookList.GetRecord( mnAddInSB );
- DBG_ASSERT( xSupbook, "XclExpSupbookBuffer::InsertAddin - missing add-in supbook" );
+ OSL_ENSURE( xSupbook, "XclExpSupbookBuffer::InsertAddin - missing add-in supbook" );
rnSupbook = mnAddInSB;
rnExtName = xSupbook->InsertAddIn( rName );
return rnExtName > 0;
@@ -1952,7 +1952,7 @@ void XclExpLinkManagerImpl5::FindExtSheet(
}
(void)pRefLogEntry; // avoid compiler warning
- DBG_ASSERT( !pRefLogEntry, "XclExpLinkManagerImpl5::FindExtSheet - fill reflog entry not implemented" );
+ OSL_ENSURE( !pRefLogEntry, "XclExpLinkManagerImpl5::FindExtSheet - fill reflog entry not implemented" );
}
sal_uInt16 XclExpLinkManagerImpl5::FindExtSheet( sal_Unicode cCode )
@@ -2135,7 +2135,7 @@ void XclExpLinkManagerImpl8::FindExtSheet(
sal_uInt16 XclExpLinkManagerImpl8::FindExtSheet( sal_Unicode cCode )
{
(void)cCode; // avoid compiler warning
- DBG_ASSERT( (cCode == EXC_EXTSH_OWNDOC) || (cCode == EXC_EXTSH_ADDIN),
+ OSL_ENSURE( (cCode == EXC_EXTSH_OWNDOC) || (cCode == EXC_EXTSH_ADDIN),
"XclExpLinkManagerImpl8::FindExtSheet - unknown externsheet code" );
return InsertXti( maSBBuffer.GetXti( EXC_TAB_EXTERNAL, EXC_TAB_EXTERNAL ) );
}
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 432390a..59a90b3 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -263,7 +263,7 @@ void XclExpName::SetTokenArray( XclTokenArrayRef xTokArr )
void XclExpName::SetLocalTab( SCTAB nScTab )
{
- DBG_ASSERT( GetTabInfo().IsExportTab( nScTab ), "XclExpName::SetLocalTab - invalid sheet index" );
+ OSL_ENSURE( GetTabInfo().IsExportTab( nScTab ), "XclExpName::SetLocalTab - invalid sheet index" );
if( GetTabInfo().IsExportTab( nScTab ) )
{
mnScTab = nScTab;
@@ -322,8 +322,8 @@ bool XclExpName::IsMacroCall( bool bVBasic, bool bFunc ) const
void XclExpName::Save( XclExpStream& rStrm )
{
- DBG_ASSERT( mxName && (mxName->Len() > 0), "XclExpName::Save - missing name" );
- DBG_ASSERT( !(IsGlobal() && ::get_flag( mnFlags, EXC_NAME_BUILTIN )), "XclExpName::Save - global built-in name" );
+ OSL_ENSURE( mxName && (mxName->Len() > 0), "XclExpName::Save - missing name" );
+ OSL_ENSURE( !(IsGlobal() && ::get_flag( mnFlags, EXC_NAME_BUILTIN )), "XclExpName::Save - global built-in name" );
SetRecSize( 11 + mxName->GetSize() + (mxTokArr ? mxTokArr->GetSize() : 2) );
XclExpRecord::Save( rStrm );
}
@@ -423,7 +423,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertBuiltInName( sal_Unicode cBuiltIn, XclTo
sal_uInt16 XclExpNameManagerImpl::InsertUniqueName(
const String& rName, XclTokenArrayRef xTokArr, SCTAB nScTab )
{
- DBG_ASSERT( rName.Len(), "XclExpNameManagerImpl::InsertUniqueName - empty name" );
+ OSL_ENSURE( rName.Len(), "XclExpNameManagerImpl::InsertUniqueName - empty name" );
XclExpNameRef xName( new XclExpName( GetRoot(), GetUnusedName( rName ) ) );
xName->SetTokenArray( xTokArr );
xName->SetLocalTab( nScTab );
@@ -477,7 +477,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertMacroCall( const String& rMacroName, boo
const XclExpName* XclExpNameManagerImpl::GetName( sal_uInt16 nNameIdx ) const
{
- DBG_ASSERT( maNameList.HasRecord( nNameIdx - 1 ), "XclExpNameManagerImpl::GetName - wrong record index" );
+ OSL_ENSURE( maNameList.HasRecord( nNameIdx - 1 ), "XclExpNameManagerImpl::GetName - wrong record index" );
return maNameList.GetRecord( nNameIdx - 1 ).get();
}
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 6d80be0..0043e19 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -203,7 +203,7 @@ void XclExpPCItem::WriteBody( XclExpStream& rStrm )
else
{
// nothing to do for SXEMPTY
- DBG_ASSERT( IsEmpty(), "XclExpPCItem::WriteBody - no data found" );
+ OSL_ENSURE( IsEmpty(), "XclExpPCItem::WriteBody - no data found" );
}
}
@@ -230,7 +230,7 @@ XclExpPCField::XclExpPCField(
{
const ScDPNumGroupInfo& rNumInfo = pNumGroupDim->GetInfo();
const ScDPNumGroupInfo& rDateInfo = pNumGroupDim->GetDateInfo();
- DBG_ASSERT( !rNumInfo.Enable || !rDateInfo.Enable,
+ OSL_ENSURE( !rNumInfo.Enable || !rDateInfo.Enable,
"XclExpPCField::XclExpPCField - numeric and date grouping enabled" );
if( rNumInfo.Enable )
@@ -255,7 +255,7 @@ XclExpPCField::XclExpPCField(
mnTypeFlags( 0 )
{
// add base field info (always using first base field, not predecessor of this field) ***
- DBG_ASSERT( rBaseField.GetFieldName() == rGroupDim.GetSourceDimName(),
+ OSL_ENSURE( rBaseField.GetFieldName() == rGroupDim.GetSourceDimName(),
"XclExpPCField::FillFromGroup - wrong base cache field" );
maFieldInfo.maName = rGroupDim.GetGroupDimName();
maFieldInfo.mnGroupBase = rBaseField.GetFieldIndex();
@@ -277,7 +277,7 @@ XclExpPCField::~XclExpPCField()
void XclExpPCField::SetGroupChildField( const XclExpPCField& rChildField )
{
- DBG_ASSERT( !::get_flag( maFieldInfo.mnFlags, EXC_SXFIELD_HASCHILD ),
+ OSL_ENSURE( !::get_flag( maFieldInfo.mnFlags, EXC_SXFIELD_HASCHILD ),
"XclExpPCField::SetGroupChildIndex - field already has a grouping child field" );
::set_flag( maFieldInfo.mnFlags, EXC_SXFIELD_HASCHILD );
maFieldInfo.mnGroupChild = rChildField.GetFieldIndex();
@@ -322,7 +322,7 @@ void XclExpPCField::WriteIndex( XclExpStream& rStrm, sal_uInt32 nSrcRow ) const
void XclExpPCField::Save( XclExpStream& rStrm )
{
- DBG_ASSERT( IsSupportedField(), "XclExpPCField::Save - unknown field type" );
+ OSL_ENSURE( IsSupportedField(), "XclExpPCField::Save - unknown field type" );
// SXFIELD
XclExpRecord::Save( rStrm );
// SXFDBTYPE
@@ -341,15 +341,15 @@ void XclExpPCField::Save( XclExpStream& rStrm )
const XclExpPCField::XclExpPCItemList& XclExpPCField::GetVisItemList() const
{
- DBG_ASSERT( IsStandardField() == maGroupItemList.IsEmpty(),
+ OSL_ENSURE( IsStandardField() == maGroupItemList.IsEmpty(),
"XclExpPCField::GetVisItemList - unexpected additional items in standard field" );
return IsStandardField() ? maOrigItemList : maGroupItemList;
}
void XclExpPCField::InitStandardField( const ScRange& rRange )
{
- DBG_ASSERT( IsStandardField(), "XclExpPCField::InitStandardField - only for standard fields" );
- DBG_ASSERT( rRange.aStart.Col() == rRange.aEnd.Col(), "XclExpPCField::InitStandardField - cell range with multiple columns" );
+ OSL_ENSURE( IsStandardField(), "XclExpPCField::InitStandardField - only for standard fields" );
+ OSL_ENSURE( rRange.aStart.Col() == rRange.aEnd.Col(), "XclExpPCField::InitStandardField - cell range with multiple columns" );
ScDocument& rDoc = GetDoc();
SvNumberFormatter& rFormatter = GetFormatter();
@@ -385,7 +385,7 @@ void XclExpPCField::InitStandardField( const ScRange& rRange )
void XclExpPCField::InitStdGroupField( const XclExpPCField& rBaseField, const ScDPSaveGroupDimension& rGroupDim )
{
- DBG_ASSERT( IsGroupField(), "XclExpPCField::InitStdGroupField - only for standard grouping fields" );
+ OSL_ENSURE( IsGroupField(), "XclExpPCField::InitStdGroupField - only for standard grouping fields" );
maFieldInfo.mnBaseItems = rBaseField.GetItemCount();
maGroupOrder.resize( maFieldInfo.mnBaseItems, EXC_PC_NOITEM );
@@ -428,8 +428,8 @@ void XclExpPCField::InitStdGroupField( const XclExpPCField& rBaseField, const Sc
void XclExpPCField::InitNumGroupField( const ScDPObject& rDPObj, const ScDPNumGroupInfo& rNumInfo )
{
- DBG_ASSERT( IsStandardField(), "XclExpPCField::InitNumGroupField - only for standard fields" );
- DBG_ASSERT( rNumInfo.Enable, "XclExpPCField::InitNumGroupField - numeric grouping not enabled" );
+ OSL_ENSURE( IsStandardField(), "XclExpPCField::InitNumGroupField - only for standard fields" );
+ OSL_ENSURE( rNumInfo.Enable, "XclExpPCField::InitNumGroupField - numeric grouping not enabled" );
// new field type, date type, limit settings (min/max/step/auto)
if( rNumInfo.DateValues )
@@ -452,8 +452,8 @@ void XclExpPCField::InitNumGroupField( const ScDPObject& rDPObj, const ScDPNumGr
void XclExpPCField::InitDateGroupField( const ScDPObject& rDPObj, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nDatePart )
{
- DBG_ASSERT( IsStandardField() || IsStdGroupField(), "XclExpPCField::InitDateGroupField - only for standard fields" );
- DBG_ASSERT( rDateInfo.Enable, "XclExpPCField::InitDateGroupField - date grouping not enabled" );
+ OSL_ENSURE( IsStandardField() || IsStdGroupField(), "XclExpPCField::InitDateGroupField - only for standard fields" );
+ OSL_ENSURE( rDateInfo.Enable, "XclExpPCField::InitDateGroupField - date grouping not enabled" );
// new field type
meFieldType = IsStandardField() ? EXC_PCFIELD_DATEGROUP : EXC_PCFIELD_DATECHILD;
@@ -468,7 +468,7 @@ void XclExpPCField::InitDateGroupField( const ScDPObject& rDPObj, const ScDPNumG
void XclExpPCField::InsertItemArrayIndex( size_t nListPos )
{
- DBG_ASSERT( IsStandardField(), "XclExpPCField::InsertItemArrayIndex - only for standard fields" );
+ OSL_ENSURE( IsStandardField(), "XclExpPCField::InsertItemArrayIndex - only for standard fields" );
maIndexVec.push_back( static_cast< sal_uInt16 >( nListPos ) );
}
@@ -534,7 +534,7 @@ sal_uInt16 XclExpPCField::InsertGroupItem( XclExpPCItem* pNewItem )
void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScDPNumGroupInfo& rNumInfo, sal_Int32 nDatePart )
{
- DBG_ASSERT( rDPObj.GetSheetDesc(), "XclExpPCField::InsertNumDateGroupItems - cannot generate element list" );
+ OSL_ENSURE( rDPObj.GetSheetDesc(), "XclExpPCField::InsertNumDateGroupItems - cannot generate element list" );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list