[Libreoffice-commits] core.git: 10 commits - formula/source fpicker/source hwpfilter/source i18npool/inc i18npool/source include/oox io/source javaunohelper/source lingucomponent/source lotuswordpro/source oox/source sc/inc sc/source
Noel Grandin
noel at peralex.com
Wed Apr 23 02:12:31 PDT 2014
formula/source/ui/dlg/ControlHelper.hxx | 2
formula/source/ui/dlg/FormulaHelper.cxx | 32 -
formula/source/ui/dlg/formula.cxx | 92 +--
formula/source/ui/dlg/funcutl.cxx | 20
formula/source/ui/dlg/parawin.cxx | 2
formula/source/ui/dlg/parawin.hxx | 6
formula/source/ui/dlg/structpg.cxx | 16
formula/source/ui/dlg/structpg.hxx | 6
fpicker/source/office/OfficeControlAccess.cxx | 30
fpicker/source/office/OfficeControlAccess.hxx | 12
fpicker/source/office/OfficeFilePicker.cxx | 66 +-
fpicker/source/office/OfficeFilePicker.hxx | 18
fpicker/source/office/OfficeFolderPicker.cxx | 4
fpicker/source/office/commonpicker.cxx | 26
fpicker/source/office/commonpicker.hxx | 6
fpicker/source/office/fpinteraction.cxx | 14
fpicker/source/office/fpinteraction.hxx | 6
fpicker/source/office/fpsmartcontent.cxx | 20
fpicker/source/office/fpsmartcontent.hxx | 24
fpicker/source/office/iodlg.cxx | 130 ++--
fpicker/source/office/iodlg.hxx | 34 -
fpicker/source/office/iodlgimp.cxx | 8
fpicker/source/office/iodlgimp.hxx | 18
hwpfilter/source/hwpreader.cxx | 44 -
hwpfilter/source/hwpreader.hxx | 8
i18npool/inc/breakiteratorImpl.hxx | 4
i18npool/inc/cclass_unicode.hxx | 2
i18npool/inc/characterclassificationImpl.hxx | 4
i18npool/inc/collatorImpl.hxx | 4
i18npool/inc/defaultnumberingprovider.hxx | 2
i18npool/inc/indexentrysupplier.hxx | 2
i18npool/inc/indexentrysupplier_common.hxx | 2
i18npool/inc/localedata.hxx | 8
i18npool/inc/nativenumbersupplier.hxx | 4
i18npool/inc/textconversion.hxx | 6
i18npool/inc/transliterationImpl.hxx | 4
i18npool/inc/transliteration_Ignore.hxx | 2
i18npool/inc/transliteration_Numeric.hxx | 2
i18npool/inc/transliteration_commonclass.hxx | 2
i18npool/inc/xdictionary.hxx | 10
i18npool/source/breakiterator/breakiteratorImpl.cxx | 26
i18npool/source/breakiterator/breakiterator_unicode.cxx | 12
i18npool/source/breakiterator/xdictionary.cxx | 22
i18npool/source/calendar/calendar_gregorian.cxx | 8
i18npool/source/calendar/calendar_jewish.cxx | 6
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 4
i18npool/source/characterclassification/characterclassificationImpl.cxx | 8
i18npool/source/collator/collatorImpl.cxx | 8
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 38 -
i18npool/source/indexentry/indexentrysupplier.cxx | 4
i18npool/source/indexentry/indexentrysupplier_common.cxx | 2
i18npool/source/inputchecker/inputsequencechecker_th.cxx | 2
i18npool/source/localedata/localedata.cxx | 12
i18npool/source/nativenumber/nativenumbersupplier.cxx | 38 -
i18npool/source/search/textsearch.cxx | 2
i18npool/source/search/textsearch.hxx | 4
i18npool/source/textconversion/textconversionImpl.cxx | 2
i18npool/source/textconversion/textconversion_ko.cxx | 4
i18npool/source/textconversion/textconversion_zh.cxx | 20
i18npool/source/transliteration/fullwidthToHalfwidth.cxx | 12
i18npool/source/transliteration/halfwidthToFullwidth.cxx | 12
i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx | 14
i18npool/source/transliteration/numtotext_cjk.cxx | 22
i18npool/source/transliteration/transliterationImpl.cxx | 10
i18npool/source/transliteration/transliteration_commonclass.cxx | 6
include/oox/ole/olehelper.hxx | 8
io/source/TextInputStream/TextInputStream.cxx | 38 -
io/source/TextOutputStream/TextOutputStream.cxx | 2
io/source/acceptor/acc_pipe.cxx | 4
io/source/acceptor/acc_socket.cxx | 24
io/source/acceptor/acceptor.cxx | 12
io/source/acceptor/acceptor.hxx | 8
io/source/connector/connector.hxx | 8
io/source/connector/ctr_socket.cxx | 10
io/source/stm/odata.cxx | 32 -
io/source/stm/omark.cxx | 4
io/source/stm/opipe.cxx | 12
io/source/stm/opump.cxx | 10
javaunohelper/source/javaunohelper.cxx | 4
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 10
lingucomponent/source/lingutil/lingutil.hxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 8
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 4
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 4
lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 4
lotuswordpro/source/filter/lwpatomholder.hxx | 4
lotuswordpro/source/filter/lwpbackgroundstuff.hxx | 4
lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 6
lotuswordpro/source/filter/lwpbookmarkmgr.hxx | 2
lotuswordpro/source/filter/lwpborderstuff.cxx | 2
lotuswordpro/source/filter/lwpborderstuff.hxx | 2
lotuswordpro/source/filter/lwpbreaksoverride.cxx | 16
lotuswordpro/source/filter/lwpbreaksoverride.hxx | 114 +--
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 22
lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 12
lotuswordpro/source/filter/lwpcelllayout.cxx | 28
lotuswordpro/source/filter/lwpchangemgr.cxx | 4
lotuswordpro/source/filter/lwpchangemgr.hxx | 2
lotuswordpro/source/filter/lwpcharborderoverride.hxx | 24
lotuswordpro/source/filter/lwpcolor.hxx | 8
lotuswordpro/source/filter/lwpcontent.cxx | 12
lotuswordpro/source/filter/lwpcontent.hxx | 14
lotuswordpro/source/filter/lwpdivinfo.hxx | 20
lotuswordpro/source/filter/lwpdlvlist.cxx | 2
lotuswordpro/source/filter/lwpdlvlist.hxx | 2
lotuswordpro/source/filter/lwpdoc.cxx | 18
lotuswordpro/source/filter/lwpdoc.hxx | 16
lotuswordpro/source/filter/lwpdrawobj.cxx | 18
lotuswordpro/source/filter/lwpfilter.cxx | 18
lotuswordpro/source/filter/lwpfont.cxx | 32 -
lotuswordpro/source/filter/lwpfont.hxx | 28
lotuswordpro/source/filter/lwpfootnote.hxx | 8
lotuswordpro/source/filter/lwpframelayout.cxx | 32 -
lotuswordpro/source/filter/lwpframelayout.hxx | 10
lotuswordpro/source/filter/lwpfrib.cxx | 32 -
lotuswordpro/source/filter/lwpfrib.hxx | 18
lotuswordpro/source/filter/lwpfribbreaks.cxx | 8
lotuswordpro/source/filter/lwpfribbreaks.hxx | 4
lotuswordpro/source/filter/lwpfribframe.cxx | 4
lotuswordpro/source/filter/lwpfribmark.cxx | 306 +++++-----
lotuswordpro/source/filter/lwpfribptr.cxx | 16
lotuswordpro/source/filter/lwpfribptr.hxx | 2
lotuswordpro/source/filter/lwpfribsection.cxx | 26
lotuswordpro/source/filter/lwpfribsection.hxx | 10
lotuswordpro/source/filter/lwpfribtext.cxx | 6
lotuswordpro/source/filter/lwpfribtext.hxx | 4
lotuswordpro/source/filter/lwpgrfobj.cxx | 16
lotuswordpro/source/filter/lwpgrfobj.hxx | 10
lotuswordpro/source/filter/lwphyperlinkmgr.cxx | 2
lotuswordpro/source/filter/lwphyperlinkmgr.hxx | 6
lotuswordpro/source/filter/lwplayout.cxx | 164 ++---
lotuswordpro/source/filter/lwplayout.hxx | 110 +--
lotuswordpro/source/filter/lwplnopts.cxx | 8
lotuswordpro/source/filter/lwpmarker.cxx | 76 +-
lotuswordpro/source/filter/lwpmarker.hxx | 32 -
lotuswordpro/source/filter/lwpnotes.cxx | 2
lotuswordpro/source/filter/lwpnumberingoverride.hxx | 32 -
lotuswordpro/source/filter/lwpnumericfmt.cxx | 23
lotuswordpro/source/filter/lwpnumericfmt.hxx | 100 +--
lotuswordpro/source/filter/lwpobjhdr.cxx | 4
lotuswordpro/source/filter/lwpobjhdr.hxx | 6
lotuswordpro/source/filter/lwpobjid.cxx | 10
lotuswordpro/source/filter/lwpobjid.hxx | 18
lotuswordpro/source/filter/lwpobjstrm.cxx | 12
lotuswordpro/source/filter/lwpobjstrm.hxx | 8
lotuswordpro/source/filter/lwpoverride.cxx | 14
lotuswordpro/source/filter/lwpoverride.hxx | 52 -
lotuswordpro/source/filter/lwppagelayout.cxx | 36 -
lotuswordpro/source/filter/lwppagelayout.hxx | 6
lotuswordpro/source/filter/lwppara.cxx | 46 -
lotuswordpro/source/filter/lwppara.hxx | 32 -
lotuswordpro/source/filter/lwppara1.cxx | 16
lotuswordpro/source/filter/lwpparaborderoverride.hxx | 78 +-
lotuswordpro/source/filter/lwpparaproperty.cxx | 2
lotuswordpro/source/filter/lwpparastyle.cxx | 18
lotuswordpro/source/filter/lwpproplist.cxx | 2
lotuswordpro/source/filter/lwpproplist.hxx | 2
lotuswordpro/source/filter/lwprowlayout.cxx | 6
lotuswordpro/source/filter/lwprowlayout.hxx | 2
lotuswordpro/source/filter/lwpsdwrect.cxx | 8
lotuswordpro/source/filter/lwpsdwrect.hxx | 4
lotuswordpro/source/filter/lwpsection.cxx | 4
lotuswordpro/source/filter/lwpsection.hxx | 4
lotuswordpro/source/filter/lwpsilverbullet.cxx | 26
lotuswordpro/source/filter/lwpsilverbullet.hxx | 22
lotuswordpro/source/filter/lwpstory.cxx | 34 -
lotuswordpro/source/filter/lwpstory.hxx | 26
lotuswordpro/source/filter/lwptable.cxx | 6
lotuswordpro/source/filter/lwptable.hxx | 4
lotuswordpro/source/filter/lwptablelayout.cxx | 26
lotuswordpro/source/filter/lwptablelayout.hxx | 10
lotuswordpro/source/filter/lwptaboverride.hxx | 4
lotuswordpro/source/filter/lwptblcell.hxx | 48 -
lotuswordpro/source/filter/lwptblformula.cxx | 42 -
lotuswordpro/source/filter/lwptblformula.hxx | 16
lotuswordpro/source/filter/lwptoc.cxx | 16
lotuswordpro/source/filter/lwptoc.hxx | 10
lotuswordpro/source/filter/lwptools.cxx | 62 +-
lotuswordpro/source/filter/lwptools.hxx | 14
lotuswordpro/source/filter/lwpusewhen.hxx | 54 -
lotuswordpro/source/filter/xfilter/ixfstyle.hxx | 2
lotuswordpro/source/filter/xfilter/xfbgimage.cxx | 14
lotuswordpro/source/filter/xfilter/xfbgimage.hxx | 30
lotuswordpro/source/filter/xfilter/xfbookmark.hxx | 8
lotuswordpro/source/filter/xfilter/xfborders.cxx | 10
lotuswordpro/source/filter/xfilter/xfborders.hxx | 8
lotuswordpro/source/filter/xfilter/xfcell.cxx | 2
lotuswordpro/source/filter/xfilter/xfcell.hxx | 6
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 50 -
lotuswordpro/source/filter/xfilter/xfcellstyle.hxx | 8
lotuswordpro/source/filter/xfilter/xfcolor.hxx | 10
lotuswordpro/source/filter/xfilter/xfdate.cxx | 4
lotuswordpro/source/filter/xfilter/xfdate.hxx | 12
lotuswordpro/source/filter/xfilter/xfdatestyle.cxx | 6
lotuswordpro/source/filter/xfilter/xfdatestyle.hxx | 58 -
lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 8
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 8
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx | 12
lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx | 4
lotuswordpro/source/filter/xfilter/xfentry.cxx | 2
lotuswordpro/source/filter/xfilter/xfentry.hxx | 6
lotuswordpro/source/filter/xfilter/xffloatframe.cxx | 2
lotuswordpro/source/filter/xfilter/xffloatframe.hxx | 4
lotuswordpro/source/filter/xfilter/xffont.cxx | 24
lotuswordpro/source/filter/xfilter/xffont.hxx | 80 +-
lotuswordpro/source/filter/xfilter/xffontdecl.cxx | 4
lotuswordpro/source/filter/xfilter/xffontdecl.hxx | 6
lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx | 8
lotuswordpro/source/filter/xfilter/xffooterstyle.hxx | 2
lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx | 12
lotuswordpro/source/filter/xfilter/xfframe.cxx | 6
lotuswordpro/source/filter/xfilter/xfframe.hxx | 4
lotuswordpro/source/filter/xfilter/xfframestyle.cxx | 12
lotuswordpro/source/filter/xfilter/xfframestyle.hxx | 20
lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx | 6
lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx | 8
lotuswordpro/source/filter/xfilter/xfimage.cxx | 6
lotuswordpro/source/filter/xfilter/xfimage.hxx | 2
lotuswordpro/source/filter/xfilter/xfimagestyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfimagestyle.hxx | 8
lotuswordpro/source/filter/xfilter/xfindex.cxx | 4
lotuswordpro/source/filter/xfilter/xfindex.hxx | 4
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx | 24
lotuswordpro/source/filter/xfilter/xflist.cxx | 4
lotuswordpro/source/filter/xfilter/xflist.hxx | 16
lotuswordpro/source/filter/xfilter/xflistitem.hxx | 8
lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx | 48 -
lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx | 20
lotuswordpro/source/filter/xfilter/xfpagemaster.cxx | 2
lotuswordpro/source/filter/xfilter/xfpagemaster.hxx | 6
lotuswordpro/source/filter/xfilter/xfparagraph.cxx | 2
lotuswordpro/source/filter/xfilter/xfparagraph.hxx | 2
lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 74 +-
lotuswordpro/source/filter/xfilter/xfparastyle.hxx | 26
lotuswordpro/source/filter/xfilter/xfsection.cxx | 4
lotuswordpro/source/filter/xfilter/xfsection.hxx | 4
lotuswordpro/source/filter/xfilter/xfshadow.cxx | 8
lotuswordpro/source/filter/xfilter/xfshadow.hxx | 4
lotuswordpro/source/filter/xfilter/xfstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfstyle.hxx | 2
lotuswordpro/source/filter/xfilter/xftable.cxx | 2
lotuswordpro/source/filter/xfilter/xftable.hxx | 6
lotuswordpro/source/filter/xfilter/xftextstyle.cxx | 14
lotuswordpro/source/filter/xfilter/xftextstyle.hxx | 2
lotuswordpro/source/filter/xfilter/xftimestyle.cxx | 6
lotuswordpro/source/filter/xfilter/xftimestyle.hxx | 34 -
oox/source/core/filterbase.cxx | 2
oox/source/docprop/docprophandler.cxx | 4
oox/source/drawingml/chart/seriesconverter.cxx | 2
oox/source/drawingml/customshapepresetdata.cxx | 4
oox/source/drawingml/customshapeproperties.cxx | 8
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 2
oox/source/drawingml/table/tableproperties.cxx | 10
oox/source/drawingml/textbodypropertiescontext.cxx | 2
oox/source/drawingml/textparagraphproperties.cxx | 4
oox/source/drawingml/textrun.cxx | 2
oox/source/export/chartexport.cxx | 84 +-
oox/source/export/shapes.cxx | 4
oox/source/ole/axcontrol.cxx | 2
oox/source/ole/olehelper.cxx | 20
oox/source/ppt/pptfilterhelpers.cxx | 80 +-
oox/source/ppt/pptfilterhelpers.hxx | 4
oox/source/ppt/pptgraphicshapecontext.cxx | 2
oox/source/ppt/pptimport.cxx | 2
oox/source/ppt/pptshape.cxx | 10
oox/source/ppt/pptshapecontext.cxx | 2
oox/source/ppt/presentationfragmenthandler.cxx | 6
oox/source/ppt/timenode.cxx | 2
sc/inc/AccessibleFilterMenu.hxx | 6
sc/inc/appluno.hxx | 28
sc/inc/cellsuno.hxx | 2
sc/inc/document.hxx | 4
sc/inc/shapeuno.hxx | 2
sc/source/core/data/attrib.cxx | 26
sc/source/core/data/dbdocutl.cxx | 22
sc/source/core/data/documen2.cxx | 14
sc/source/core/data/dpobject.cxx | 18
sc/source/core/data/dpsave.cxx | 2
sc/source/core/data/dptabsrc.cxx | 30
sc/source/core/data/drwlayer.cxx | 56 -
sc/source/core/data/markarr.cxx | 10
sc/source/core/data/olinetab.cxx | 4
sc/source/core/data/patattr.cxx | 6
sc/source/core/tool/appoptio.cxx | 2
sc/source/core/tool/autoform.cxx | 14
sc/source/core/tool/chartpos.cxx | 20
sc/source/core/tool/consoli.cxx | 4
sc/source/core/tool/ddelink.cxx | 6
sc/source/core/tool/doubleref.cxx | 8
sc/source/core/tool/editutil.cxx | 22
sc/source/core/tool/formulaopt.cxx | 16
sc/source/core/tool/prnsave.cxx | 2
sc/source/core/tool/progress.cxx | 4
sc/source/core/tool/rangeutl.cxx | 4
sc/source/core/tool/refreshtimer.cxx | 2
sc/source/filter/dif/difimp.cxx | 10
sc/source/filter/excel/excel.cxx | 2
sc/source/filter/excel/excform.cxx | 20
sc/source/filter/excel/excform8.cxx | 4
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/excrecds.cxx | 8
sc/source/filter/excel/impop.cxx | 4
sc/source/filter/excel/xechart.cxx | 2
sc/source/filter/excel/xehelper.cxx | 8
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/html/htmlexp.cxx | 18
sc/source/filter/html/htmlexp2.cxx | 6
sc/source/filter/inc/scmem.h | 2
sc/source/filter/inc/tool.h | 4
sc/source/filter/lotus/filter.cxx | 6
sc/source/filter/lotus/lotform.cxx | 4
sc/source/filter/lotus/lotimpop.cxx | 4
sc/source/filter/lotus/lotread.cxx | 2
sc/source/filter/lotus/lotus.cxx | 2
sc/source/filter/lotus/memory.cxx | 4
sc/source/filter/lotus/op.cxx | 8
sc/source/filter/lotus/tool.cxx | 6
sc/source/filter/oox/commentsbuffer.cxx | 2
sc/source/filter/oox/pivotcachebuffer.cxx | 4
sc/source/filter/qpro/qproform.cxx | 4
sc/source/filter/qpro/qprostyle.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 2
sc/source/filter/rtf/rtfexp.cxx | 8
sc/source/filter/rtf/rtfparse.cxx | 2
sc/source/filter/starcalc/scflt.cxx | 46 -
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 8
sc/source/filter/xcl97/xcl97esc.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/filter/xml/XMLTableMasterPageExport.cxx | 8
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 56 -
sc/source/filter/xml/xmlcvali.cxx | 24
sc/source/filter/xml/xmldpimp.cxx | 18
sc/source/filter/xml/xmlfonte.cxx | 6
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/filter/xml/xmlstyle.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 10
sc/source/ui/Accessibility/AccessibleCell.cxx | 4
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 10
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 8
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 128 ++--
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 62 +-
sc/source/ui/Accessibility/AccessibleFilterMenu.cxx | 2
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 32 -
sc/source/ui/Accessibility/AccessibleText.cxx | 20
sc/source/ui/app/drwtrans.cxx | 6
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/app/inputwin.cxx | 24
sc/source/ui/app/scmod.cxx | 18
sc/source/ui/app/seltrans.cxx | 8
sc/source/ui/app/uiitems.cxx | 2
sc/source/ui/attrdlg/tabpages.cxx | 8
sc/source/ui/cctrl/cbuttonw.cxx | 6
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/dbgui/consdlg.cxx | 4
sc/source/ui/dbgui/dbnamdlg.cxx | 14
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/dbgui/pfiltdlg.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 6
sc/source/ui/dbgui/scuiimoptdlg.cxx | 2
sc/source/ui/dbgui/sfiltdlg.cxx | 6
sc/source/ui/dbgui/tpsort.cxx | 8
sc/source/ui/dbgui/validate.cxx | 4
sc/source/ui/docshell/arealink.cxx | 6
sc/source/ui/docshell/dbdocfun.cxx | 38 -
sc/source/ui/docshell/dbdocimp.cxx | 34 -
sc/source/ui/docshell/docsh.cxx | 20
sc/source/ui/docshell/docsh3.cxx | 22
sc/source/ui/docshell/docsh4.cxx | 58 -
sc/source/ui/docshell/docsh5.cxx | 34 -
sc/source/ui/docshell/docsh6.cxx | 6
sc/source/ui/docshell/docsh8.cxx | 8
sc/source/ui/docshell/olinefun.cxx | 8
sc/source/ui/docshell/sizedev.cxx | 2
sc/source/ui/docshell/tablink.cxx | 12
sc/source/ui/drawfunc/drawsh.cxx | 6
sc/source/ui/drawfunc/drawsh2.cxx | 16
sc/source/ui/drawfunc/drawsh5.cxx | 18
sc/source/ui/drawfunc/drtxtob.cxx | 34 -
sc/source/ui/drawfunc/drtxtob2.cxx | 4
sc/source/ui/drawfunc/fuconcustomshape.cxx | 8
sc/source/ui/drawfunc/fuconrec.cxx | 2
sc/source/ui/drawfunc/fuconstr.cxx | 4
sc/source/ui/drawfunc/fudraw.cxx | 28
sc/source/ui/drawfunc/fuins1.cxx | 10
sc/source/ui/drawfunc/fuins2.cxx | 14
sc/source/ui/drawfunc/fusel.cxx | 4
sc/source/ui/drawfunc/fusel2.cxx | 4
sc/source/ui/drawfunc/futext.cxx | 16
sc/source/ui/drawfunc/graphsh.cxx | 4
sc/source/ui/formdlg/formula.cxx | 10
sc/source/ui/inc/AccessibleCellBase.hxx | 6
sc/source/ui/inc/AccessibleContextBase.hxx | 13
sc/source/ui/inc/AccessibleCsvControl.hxx | 6
sc/source/ui/inc/drawsh.hxx | 2
sc/source/ui/inc/inscldlg.hxx | 2
sc/source/ui/inc/instbdlg.hxx | 6
sc/source/ui/miscdlgs/autofmt.cxx | 4
sc/source/ui/miscdlgs/conflictsdlg.cxx | 6
sc/source/ui/miscdlgs/crnrdlg.cxx | 24
sc/source/ui/miscdlgs/filldlg.cxx | 2
sc/source/ui/miscdlgs/inscldlg.cxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 6
sc/source/ui/miscdlgs/redcom.cxx | 4
sc/source/ui/miscdlgs/scuiautofmt.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/miscdlgs/tabopdlg.cxx | 4
sc/source/ui/navipi/content.cxx | 10
sc/source/ui/navipi/navipi.cxx | 10
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 4
sc/source/ui/optdlg/tpprint.cxx | 2
sc/source/ui/optdlg/tpusrlst.cxx | 12
sc/source/ui/optdlg/tpview.cxx | 44 -
sc/source/ui/pagedlg/areasdlg.cxx | 8
sc/source/ui/pagedlg/hfedtdlg.cxx | 6
sc/source/ui/pagedlg/tphf.cxx | 4
sc/source/ui/pagedlg/tptable.cxx | 52 -
sc/source/ui/undo/undoblk2.cxx | 4
sc/source/ui/undo/undostyl.cxx | 8
sc/source/ui/undo/undotab.cxx | 40 -
sc/source/ui/unoobj/afmtuno.cxx | 18
sc/source/ui/unoobj/appluno.cxx | 40 -
sc/source/ui/unoobj/celllistsource.cxx | 4
sc/source/ui/unoobj/cellsuno.cxx | 208 +++---
sc/source/ui/unoobj/cellvaluebinding.cxx | 18
sc/source/ui/unoobj/chart2uno.cxx | 6
sc/source/ui/unoobj/chartuno.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 18
sc/source/ui/unoobj/dapiuno.cxx | 18
sc/source/ui/unoobj/datauno.cxx | 16
sc/source/ui/unoobj/dispuno.cxx | 2
sc/source/ui/unoobj/docuno.cxx | 72 +-
sc/source/ui/unoobj/filtuno.cxx | 10
sc/source/ui/unoobj/funcuno.cxx | 26
sc/source/ui/unoobj/linkuno.cxx | 2
sc/source/ui/unoobj/nameuno.cxx | 14
sc/source/ui/unoobj/optuno.cxx | 2
sc/source/ui/unoobj/scdetect.cxx | 14
sc/source/ui/unoobj/servuno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 24
sc/source/ui/unoobj/styleuno.cxx | 24
sc/source/ui/unoobj/textuno.cxx | 4
sc/source/ui/unoobj/tokenuno.cxx | 2
sc/source/ui/unoobj/viewuno.cxx | 50 -
sc/source/ui/vba/excelvbahelper.cxx | 5
sc/source/ui/vba/vbaapplication.cxx | 34 -
sc/source/ui/vba/vbaaxes.cxx | 2
sc/source/ui/vba/vbaaxis.cxx | 14
sc/source/ui/vba/vbachart.cxx | 28
sc/source/ui/vba/vbacomment.cxx | 2
sc/source/ui/vba/vbafont.cxx | 14
sc/source/ui/vba/vbaformat.cxx | 4
sc/source/ui/vba/vbaformatcondition.cxx | 2
sc/source/ui/vba/vbaformatconditions.cxx | 2
sc/source/ui/vba/vbaformatconditions.hxx | 2
sc/source/ui/vba/vbapagebreak.cxx | 2
sc/source/ui/vba/vbapagebreaks.cxx | 6
sc/source/ui/vba/vbapagesetup.cxx | 16
sc/source/ui/vba/vbarange.cxx | 82 +-
sc/source/ui/vba/vbavalidation.cxx | 6
sc/source/ui/vba/vbawindow.cxx | 14
sc/source/ui/vba/vbaworksheet.cxx | 24
sc/source/ui/vba/vbaworksheets.cxx | 18
sc/source/ui/vba/vbawsfunction.cxx | 6
sc/source/ui/view/cellsh.cxx | 24
sc/source/ui/view/cellsh1.cxx | 64 +-
sc/source/ui/view/cellsh2.cxx | 42 -
sc/source/ui/view/cellsh3.cxx | 12
sc/source/ui/view/cellsh4.cxx | 12
sc/source/ui/view/cliputil.cxx | 2
sc/source/ui/view/dbfunc.cxx | 20
sc/source/ui/view/dbfunc3.cxx | 36 -
sc/source/ui/view/drawvie3.cxx | 6
sc/source/ui/view/drawvie4.cxx | 8
sc/source/ui/view/drawview.cxx | 20
sc/source/ui/view/editsh.cxx | 30
sc/source/ui/view/formatsh.cxx | 20
sc/source/ui/view/gridwin.cxx | 194 +++---
sc/source/ui/view/gridwin2.cxx | 60 -
sc/source/ui/view/gridwin3.cxx | 8
sc/source/ui/view/gridwin4.cxx | 78 +-
sc/source/ui/view/gridwin5.cxx | 12
sc/source/ui/view/invmerge.cxx | 6
sc/source/ui/view/olinewin.cxx | 2
sc/source/ui/view/output3.cxx | 4
sc/source/ui/view/pivotsh.cxx | 2
sc/source/ui/view/prevwsh.cxx | 16
sc/source/ui/view/prevwsh2.cxx | 8
sc/source/ui/view/tabcont.cxx | 18
sc/source/ui/view/tabview.cxx | 56 -
sc/source/ui/view/tabview4.cxx | 14
sc/source/ui/view/tabview5.cxx | 10
sc/source/ui/view/tabvwsh9.cxx | 8
sc/source/ui/view/tabvwshe.cxx | 4
sc/source/ui/view/tabvwshf.cxx | 30
sc/source/ui/view/viewdata.cxx | 2
sc/source/ui/view/viewfunc.cxx | 10
504 files changed, 4066 insertions(+), 4069 deletions(-)
New commits:
commit 6dda3d45c902d64323a085ea1604a993521f313d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 23 11:08:48 2014 +0200
sc: sal_Bool->bool
Change-Id: I70aad0b38979f45a313b8ac36890fb6c64d11bb0
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index f24dd14..a78fa20 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -52,15 +52,15 @@ public:
ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos);
virtual ~ScAccessibleFilterMenu();
+ virtual bool SAL_CALL isVisible()
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
/// XAccessibleComponent
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isVisible()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
virtual void SAL_CALL grabFocus()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 0bf97b8..49fbd8d 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -137,9 +137,9 @@ private:
SfxItemPropertySet aPropSet;
- sal_Bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+ bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException);
sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException);
- void setProperty(const OUString& aPropertyName, sal_Bool p1) throw (css::uno::RuntimeException)
+ void setProperty(const OUString& aPropertyName, bool p1) throw (css::uno::RuntimeException)
{ setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
void setProperty(const OUString& aPropertyName, sal_Int16 p1) throw (css::uno::RuntimeException)
{ setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
@@ -154,7 +154,7 @@ public:
virtual sal_Bool SAL_CALL getMoveSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("MoveSelection"); }
virtual void SAL_CALL setMoveSelection(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("MoveSelection", p1); }
+ { setProperty("MoveSelection", (bool)p1); }
virtual sal_Int16 SAL_CALL getMoveDirection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyInt16("MoveDirection"); }
virtual void SAL_CALL setMoveDirection(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
@@ -162,27 +162,27 @@ public:
virtual sal_Bool SAL_CALL getEnterEdit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("EnterEdit"); }
virtual void SAL_CALL setEnterEdit(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("EnterEdit", p1); }
+ { setProperty("EnterEdit", (bool)p1); }
virtual sal_Bool SAL_CALL getExtendFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("ExtendFormat"); }
virtual void SAL_CALL setExtendFormat(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("ExtendFormat", p1); }
+ { setProperty("ExtendFormat", (bool)p1); }
virtual sal_Bool SAL_CALL getRangeFinder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("RangeFinder"); }
virtual void SAL_CALL setRangeFinder(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("RangeFinder", p1); }
+ { setProperty("RangeFinder", (bool)p1); }
virtual sal_Bool SAL_CALL getExpandReferences() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("ExpandReferences"); }
virtual void SAL_CALL setExpandReferences(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("ExpandReferences", p1); }
+ { setProperty("ExpandReferences", (bool)p1); }
virtual sal_Bool SAL_CALL getMarkHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("MarkHeader"); }
virtual void SAL_CALL setMarkHeader(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("MarkHeader", p1); }
+ { setProperty("MarkHeader", (bool)p1); }
virtual sal_Bool SAL_CALL getUseTabCol() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("UseTabCol"); }
virtual void SAL_CALL setUseTabCol(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("UseTabCol", p1); }
+ { setProperty("UseTabCol", (bool)p1); }
virtual sal_Int16 SAL_CALL getMetric() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyInt16("Metric"); }
virtual void SAL_CALL setMetric(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
@@ -194,7 +194,7 @@ public:
virtual sal_Bool SAL_CALL getDoAutoComplete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("DoAutoComplete"); }
virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("DoAutoComplete", p1); }
+ { setProperty("DoAutoComplete", (bool)p1); }
virtual sal_Int16 SAL_CALL getStatusBarFunction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyInt16("StatusBarFunction"); }
virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
@@ -215,19 +215,19 @@ public:
virtual sal_Bool SAL_CALL getPrintAllSheets() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("PrintAllSheets"); }
virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("PrintAllSheets", p1); }
+ { setProperty("PrintAllSheets", (bool)p1); }
virtual sal_Bool SAL_CALL getPrintEmptyPages() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("PrintEmptyPages"); }
virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("PrintEmptyPages", p1); }
+ { setProperty("PrintEmptyPages", (bool)p1); }
virtual sal_Bool SAL_CALL getUsePrinterMetrics() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("UsePrinterMetrics"); }
virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("UsePrinterMetrics", p1); }
+ { setProperty("UsePrinterMetrics", (bool)p1); }
virtual sal_Bool SAL_CALL getReplaceCellsWarning() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return getPropertyBool("ReplaceCellsWarning"); }
virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { setProperty("ReplaceCellsWarning", p1); }
+ { setProperty("ReplaceCellsWarning", (bool)p1); }
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 6258bbc..da32472 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -208,7 +208,7 @@ private:
com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges>
QueryDifferences_Impl(const com::sun::star::table::CellAddress& aCompare,
- sal_Bool bColumnDiff);
+ bool bColumnDiff);
com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
Find_Impl(const com::sun::star::uno::Reference<
com::sun::star::util::XSearchDescriptor>& xDesc,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index df1cc2e..b57ce70 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -451,8 +451,8 @@ private:
bool mbUseEmbedFonts;
public:
- sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
- void GetCellChangeTrackNote(const ScAddress &cell, OUString &strTrackText, sal_Bool &pbLeftEdge);
+ bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
+ void GetCellChangeTrackNote(const ScAddress &cell, OUString &strTrackText, bool &pbLeftEdge);
bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; }
SC_DLLPUBLIC sal_uLong GetCellCount() const; // all cells
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 7110d0a..6fdf66a 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -64,7 +64,7 @@ class ScShapeObj :public ScShapeObj_Base
,public ScShapeObj_ChildBase
{
private:
- friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate );
+ friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, bool bCreate );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
// cached pointers to avoid repeated queryAggregation calls:
::com::sun::star::beans::XPropertySet* pShapePropertySet;
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index ae0335b..df14e4e 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -223,13 +223,13 @@ bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
}
case MID_1 :
- rVal <<= (sal_Bool ) bProtection; break;
+ rVal <<= bProtection; break;
case MID_2 :
- rVal <<= (sal_Bool ) bHideFormula; break;
+ rVal <<= bHideFormula; break;
case MID_3 :
- rVal <<= (sal_Bool ) bHideCell; break;
+ rVal <<= bHideCell; break;
case MID_4 :
- rVal <<= (sal_Bool ) bHidePrint; break;
+ rVal <<= bHidePrint; break;
default:
OSL_FAIL("Wrong MemberID!");
return false;
@@ -241,7 +241,7 @@ bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
bool ScProtectionAttr::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bRet = false;
- sal_Bool bVal = sal_False;
+ bool bVal = false;
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
{
@@ -359,15 +359,15 @@ SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const
SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) const
{
- sal_Bool bProtect;
- sal_Bool bHFormula;
- sal_Bool bHCell;
- sal_Bool bHPrint;
+ bool bProtect;
+ bool bHFormula;
+ bool bHCell;
+ bool bHPrint;
- rStream.ReadUChar( bProtect );
- rStream.ReadUChar( bHFormula );
- rStream.ReadUChar( bHCell );
- rStream.ReadUChar( bHPrint );
+ rStream.ReadCharAsBool( bProtect );
+ rStream.ReadCharAsBool( bHFormula );
+ rStream.ReadCharAsBool( bHCell );
+ rStream.ReadCharAsBool( bHPrint );
return new ScProtectionAttr(bProtect,bHFormula,bHCell,bHPrint);
}
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 586f8d0..147f312 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -41,9 +41,9 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
{
OUString aString;
double nVal = 0.0;
- sal_Bool bValue = false;
- sal_Bool bEmptyFlag = false;
- sal_Bool bError = false;
+ bool bValue = false;
+ bool bEmptyFlag = false;
+ bool bError = false;
sal_uLong nFormatIndex = 0;
//! wasNull calls only if null value was found?
@@ -59,7 +59,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
NUMBERFORMAT_LOGICAL, ScGlobal::eLnge );
nVal = (xRow->getBoolean(nRowPos) ? 1 : 0);
bEmptyFlag = ( nVal == 0.0 ) && xRow->wasNull();
- bValue = sal_True;
+ bValue = true;
break;
case sdbc::DataType::TINYINT:
@@ -74,7 +74,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
//! do the conversion here?
nVal = xRow->getDouble(nRowPos);
bEmptyFlag = ( nVal == 0.0 ) && xRow->wasNull();
- bValue = sal_True;
+ bValue = true;
break;
case sdbc::DataType::CHAR:
@@ -94,7 +94,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
nVal = Date( aDate.Day, aDate.Month, aDate.Year ) -
*pFormTable->GetNullDate();
bEmptyFlag = xRow->wasNull();
- bValue = sal_True;
+ bValue = true;
}
break;
@@ -110,7 +110,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
aTime.Seconds / static_cast<double>(::Time::secondPerDay) +
aTime.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay);
bEmptyFlag = xRow->wasNull();
- bValue = sal_True;
+ bValue = true;
}
break;
@@ -128,24 +128,24 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
aStamp.Seconds / static_cast<double>(::Time::secondPerDay) +
aStamp.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay);
bEmptyFlag = xRow->wasNull();
- bValue = sal_True;
+ bValue = true;
}
break;
case sdbc::DataType::SQLNULL:
- bEmptyFlag = sal_True;
+ bEmptyFlag = true;
break;
case sdbc::DataType::BINARY:
case sdbc::DataType::VARBINARY:
case sdbc::DataType::LONGVARBINARY:
default:
- bError = sal_True; // unknown type
+ bError = true; // unknown type
}
}
catch ( uno::Exception& )
{
- bError = sal_True;
+ bError = true;
}
if ( bValue && bCurrency )
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 1ea05ca..20b38f6 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1226,12 +1226,12 @@ void ScDocument::ClearLookupCaches()
pLookupCacheMapImpl->clear();
}
-sal_Bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
+bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
{
ScChangeTrack* pTrack = GetChangeTrack();
ScChangeViewSettings* pSettings = GetChangeViewSettings();
if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() )
- return sal_False; // nix da oder abgeschaltet
+ return false; // nix da oder abgeschaltet
ScActionColorChanger aColorChanger(*pTrack);
// Clipping passiert von aussen
//! ohne Clipping, nur betroffene Zeilen painten ??!??!?
@@ -1260,7 +1260,7 @@ sal_Bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBo
Color aColor( aColorChanger.GetColor() );
*pColCellBoder = aColor;
}
- return sal_True;
+ return true;
}
}
}
@@ -1280,17 +1280,17 @@ sal_Bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBo
Color aColor( aColorChanger.GetColor() );
*pColCellBoder = aColor;
}
- return sal_True;
+ return true;
}
}
}
}
pAction = pAction->GetNext();
}
- return sal_False;
+ return false;
}
-void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aTrackText,sal_Bool &bLeftEdge)
+void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aTrackText,bool &bLeftEdge)
{
aTrackText = OUString();
// Change-Tracking
@@ -1358,7 +1358,7 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT
pFound = pFoundMove; // Move gewinnt
// bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle
if ( pFound->GetType() == SC_CAT_DELETE_COLS )
- bLeftEdge = sal_True;
+ bLeftEdge = true;
DateTime aDT = pFound->GetDateTime();
aTrackText = pFound->GetUser();
aTrackText += ", ";
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index df1419c..97b1a15 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -265,7 +265,7 @@ sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSup
uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName );
long nIntCount = xIntDims->getCount();
- sal_Bool bFound = false;
+ bool bFound = false;
for (long nIntDim=0; nIntDim<nIntCount && !bFound; nIntDim++)
{
uno::Reference<uno::XInterface> xIntDim =
@@ -536,7 +536,7 @@ void ScDPObject::CreateOutput()
CreateObjects();
if (!pOutput)
{
- sal_Bool bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
+ bool bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
pOutput = new ScDPOutput( pDoc, xSource, aOutRange.aStart, bFilterButton );
pOutput->SetHeaderLayout ( mbHeaderLayout );
@@ -936,7 +936,7 @@ const ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType )
return pOutput->GetOutputRange(nType);
}
-static sal_Bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
+static bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
{
return ((const ScMergeFlagAttr*)pDoc->GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->HasPivotButton();
}
@@ -1223,7 +1223,7 @@ OUString ScDPObject::GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFla
uno::Reference<beans::XPropertySet> xDimProp( xIntDim, uno::UNO_QUERY );
if ( xDimName.is() && xDimProp.is() )
{
- sal_Bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+ bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
@@ -1694,7 +1694,7 @@ bool ScDPObject::ParseFilters(
uno::Reference<container::XNamed> xDim( xIntDim, uno::UNO_QUERY );
uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDim, uno::UNO_QUERY );
- sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+ bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
OUString(SC_UNO_DP_ISDATALAYOUT) );
sal_Int32 nOrient = ScUnoHelpFunctions::GetEnumProperty(
xDimProp, OUString(SC_UNO_DP_ORIENTATION),
@@ -1901,7 +1901,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
OUString aDimName = xDim->getName();
uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
- sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+ bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
OUString(SC_UNO_DP_ISDATALAYOUT) );
if (bDataLayout)
{
@@ -1947,8 +1947,8 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
if ( xMbrSupp.is() )
xMembers = xMbrSupp->getMembers();
- sal_Bool bFound = false;
- sal_Bool bShowDetails = sal_True;
+ bool bFound = false;
+ bool bShowDetails = true;
if ( xMembers.is() )
{
@@ -1962,7 +1962,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
bShowDetails = ScUnoHelpFunctions::GetBoolProperty( xMbrProp,
OUString(SC_UNO_DP_SHOWDETAILS) );
//! don't set bFound if property is unknown?
- bFound = sal_True;
+ bFound = true;
}
}
}
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 15468d4..d26cfd8 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -58,7 +58,7 @@ using ::std::auto_ptr;
#define SC_DPSAVEMODE_DONTKNOW 2
static void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
- const OUString& rName, sal_Bool bValue )
+ const OUString& rName, bool bValue )
{
//! move to ScUnoHelpFunctions?
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 3fbb0bd..d3fe137 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -85,14 +85,14 @@ SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet.
// DataDescription / NumberFormat are internal
//! move to a header?
-static sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny )
+static bool lcl_GetBoolFromAny( const uno::Any& aAny )
{
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
return *(sal_Bool*)aAny.getValue();
return false;
}
-static void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
+static void lcl_SetBoolInAny( uno::Any& rAny, bool bValue )
{
rAny.setValue( &bValue, getBooleanCppuType() );
}
@@ -571,7 +571,7 @@ static long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vecto
long nTotal = 1;
long nDataCount = 1;
- sal_Bool bWasShowAll = sal_True;
+ bool bWasShowAll = true;
long nPos = nLevels;
while ( nPos > 0 )
{
@@ -583,7 +583,7 @@ static long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vecto
return 0;
}
- sal_Bool bDo = false;
+ bool bDo = false;
if ( ppDim[nPos]->getIsDataLayoutDimension() )
{
// data layout dim doesn't interfere with "show all" flags
@@ -593,7 +593,7 @@ static long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vecto
}
else if ( bWasShowAll ) // "show all" set for all following levels?
{
- bDo = sal_True;
+ bDo = true;
if ( !ppLevel[nPos]->getShowEmpty() )
{
// this level is counted, following ones are not
@@ -1565,7 +1565,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co
aValue >>= aReferenceValue;
else if ( aPropertyName.equalsAscii( SC_UNO_DP_FILTER ) )
{
- sal_Bool bDone = false;
+ bool bDone = false;
uno::Sequence<sheet::TableFilterField> aSeq;
if (aValue >>= aSeq)
{
@@ -1574,7 +1574,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co
{
aSelectedPage = "";
bHasSelectedPage = false;
- bDone = sal_True;
+ bDone = true;
}
else if ( nLength == 1 )
{
@@ -1583,7 +1583,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co
{
aSelectedPage = rField.StringValue;
bHasSelectedPage = true;
- bDone = sal_True;
+ bDone = true;
}
}
}
@@ -1608,7 +1608,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co
}
else if (aPropertyName.equalsAscii(SC_UNO_DP_HAS_HIDDEN_MEMBER))
{
- sal_Bool b = false;
+ bool b = false;
aValue >>= b;
mbHasHiddenMember = b;
}
@@ -1697,7 +1697,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName
else if (aPropertyName.equalsAscii(SC_UNO_DP_FIELD_SUBTOTALNAME))
aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString("");
else if (aPropertyName.equalsAscii(SC_UNO_DP_HAS_HIDDEN_MEMBER))
- aRet <<= static_cast<sal_Bool>(mbHasHiddenMember);
+ aRet <<= mbHasHiddenMember;
else if (aPropertyName.equalsAscii(SC_UNO_DP_FLAGS))
{
sal_Int32 nFlags = 0; // tabular data: all orientations are possible
@@ -1998,19 +1998,19 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
class ScDPGlobalMembersOrder
{
ScDPLevel& rLevel;
- sal_Bool bAscending;
+ bool bAscending;
public:
- ScDPGlobalMembersOrder( ScDPLevel& rLev, sal_Bool bAsc ) :
+ ScDPGlobalMembersOrder( ScDPLevel& rLev, bool bAsc ) :
rLevel(rLev),
bAscending(bAsc)
{}
~ScDPGlobalMembersOrder() {}
- sal_Bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
+ bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
};
-sal_Bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
+bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
{
sal_Int32 nCompare = 0;
// seems that some ::std::sort() implementations pass the same index twice
@@ -2080,7 +2080,7 @@ void ScDPLevel::EvaluateSortOrder()
aGlobalOrder[nPos] = nPos;
// allow manual or name (manual is always ascending)
- sal_Bool bAscending = ( aSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL || aSortInfo.IsAscending );
+ bool bAscending = ( aSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL || aSortInfo.IsAscending );
ScDPGlobalMembersOrder aComp( *this, bAscending );
::std::sort( aGlobalOrder.begin(), aGlobalOrder.end(), aComp );
}
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 5a7e302..d807c16 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -93,7 +93,7 @@ static sal_uInt16 nInst = 0;
SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL;
-sal_Bool bDrawIsInUndo = false; //! Member
+bool bDrawIsInUndo = false; //! Member
ScUndoObjData::ScUndoObjData( SdrObject* pObjP, const ScAddress& rOS, const ScAddress& rOE,
const ScAddress& rNS, const ScAddress& rNE ) :
@@ -456,7 +456,7 @@ void ScDrawLayer::ResetTab( SCTAB nStart, SCTAB nEnd )
}
}
-inline sal_Bool IsInBlock( const ScAddress& rPos, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 )
+inline bool IsInBlock( const ScAddress& rPos, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 )
{
return rPos.Col() >= nCol1 && rPos.Col() <= nCol2 &&
rPos.Row() >= nRow1 && rPos.Row() <= nRow2;
@@ -470,7 +470,7 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
if (!pPage)
return;
- sal_Bool bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
+ bool bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
sal_uLong nCount = pPage->GetObjCount();
for ( sal_uLong i = 0; i < nCount; i++ )
@@ -481,18 +481,18 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
{
const ScAddress aOldStt = pData->maStart;
const ScAddress aOldEnd = pData->maEnd;
- sal_Bool bChange = false;
+ bool bChange = false;
if ( aOldStt.IsValid() && IsInBlock( aOldStt, nCol1,nRow1, nCol2,nRow2 ) )
{
pData->maStart.IncCol( nDx );
pData->maStart.IncRow( nDy );
- bChange = sal_True;
+ bChange = true;
}
if ( aOldEnd.IsValid() && IsInBlock( aOldEnd, nCol1,nRow1, nCol2,nRow2 ) )
{
pData->maEnd.IncCol( nDx );
pData->maEnd.IncRow( nDy );
- bChange = sal_True;
+ bChange = true;
}
if (bChange)
{
@@ -520,7 +520,7 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpda
// auch wenn Groesse gleich geblieben ist
// (einzelne Zeilen/Spalten koennen geaendert sein)
- sal_Bool bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) );
+ bool bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) );
sal_uLong nCount = pPage->GetObjCount();
for ( sal_uLong i = 0; i < nCount; i++ )
@@ -873,7 +873,7 @@ bool ScDrawLayer::GetPrintArea( ScRange& rRange, bool bSetHor, bool bSetVer ) co
SCTAB nTab = rRange.aStart.Tab();
OSL_ENSURE( rRange.aEnd.Tab() == nTab, "GetPrintArea: Tab differ" );
- sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
+ bool bNegativePage = pDoc->IsNegativePage( nTab );
bool bAny = false;
long nEndX = 0;
@@ -924,7 +924,7 @@ bool ScDrawLayer::GetPrintArea( ScRange& rRange, bool bSetHor, bool bSetVer ) co
//! Flags (ausgeblendet?) testen
Rectangle aObjRect = pObject->GetCurrentBoundRect();
- sal_Bool bFit = sal_True;
+ bool bFit = true;
if ( !bSetHor && ( aObjRect.Right() < nStartX || aObjRect.Left() > nEndX ) )
bFit = false;
if ( !bSetVer && ( aObjRect.Bottom() < nStartY || aObjRect.Top() > nEndY ) )
@@ -1044,7 +1044,7 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR
if (!bAdjustEnabled)
return;
- sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
+ bool bNegativePage = pDoc->IsNegativePage( nTab );
Rectangle aRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab );
lcl_ReverseTwipsToMM( aRect );
@@ -1115,7 +1115,7 @@ bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
aTestRect.Left() = 0;
aTestRect.Right() = MAXMM;
- sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
+ bool bNegativePage = pDoc->IsNegativePage( nTab );
if ( bNegativePage )
MirrorRectRTL( aTestRect );
@@ -1312,7 +1312,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle&
}
}
-static sal_Bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange )
+static bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange )
{
// check if every range of rRangesVector is completely in rClipRange
@@ -1330,12 +1330,12 @@ static sal_Bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVec
}
}
- return sal_True; // everything is fine
+ return true; // everything is fine
}
-static sal_Bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos )
+static bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos )
{
- sal_Bool bChanged = false;
+ bool bChanged = false;
::std::vector< ScRangeList >::iterator aIt = rRangesVector.begin();
for( ;aIt!=rRangesVector.end(); ++aIt )
@@ -1350,7 +1350,7 @@ static sal_Bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, con
SCsROW nDiffY = rDestPos.Row() - (SCsROW)rSourceRange.aStart.Row();
SCsTAB nDiffZ = rDestPos.Tab() - (SCsTAB)rSourceRange.aStart.Tab();
pRange->Move( nDiffX, nDiffY, nDiffZ );
- bChanged = sal_True;
+ bChanged = true;
}
}
}
@@ -1374,7 +1374,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
return;
}
- sal_Bool bMirrorObj = ( rSourceRange.Left() < 0 && rSourceRange.Right() < 0 &&
+ bool bMirrorObj = ( rSourceRange.Left() < 0 && rSourceRange.Right() < 0 &&
rDestRange.Left() > 0 && rDestRange.Right() > 0 ) ||
( rSourceRange.Left() > 0 && rSourceRange.Right() > 0 &&
rDestRange.Left() < 0 && rDestRange.Right() < 0 );
@@ -1397,13 +1397,13 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
// a clipboard document and its source share the same document item pool,
// so the pointers can be compared to see if this is copy&paste within
// the same document
- sal_Bool bSameDoc = pDoc && pClipDoc && pDoc->GetPool() == pClipDoc->GetPool();
- sal_Bool bDestClip = pDoc && pDoc->IsClipboard();
+ bool bSameDoc = pDoc && pClipDoc && pDoc->GetPool() == pClipDoc->GetPool();
+ bool bDestClip = pDoc && pDoc->IsClipboard();
//#i110034# charts need correct sheet names for xml range conversion during load
//so the target sheet name is temporarily renamed (if we have any SdrObjects)
OUString aDestTabName;
- sal_Bool bRestoreDestTabName = false;
+ bool bRestoreDestTabName = false;
if( pOldObject && !bSameDoc && !bDestClip )
{
if( pDoc && pClipDoc )
@@ -1434,18 +1434,18 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
Fraction aHorFract(1,1);
Fraction aVerFract(1,1);
- sal_Bool bResize = false;
+ bool bResize = false;
// sizes can differ by 1 from twips->1/100mm conversion for equal cell sizes,
// don't resize to empty size when pasting into hidden columns or rows
if ( std::abs(nWidthDiff) > 1 && nDestWidth > 1 && nSourceWidth > 1 )
{
aHorFract = Fraction( nDestWidth, nSourceWidth );
- bResize = sal_True;
+ bResize = true;
}
if ( std::abs(nHeightDiff) > 1 && nDestHeight > 1 && nSourceHeight > 1 )
{
aVerFract = Fraction( nDestHeight, nSourceHeight );
- bResize = sal_True;
+ bResize = true;
}
Point aRefPos = rDestRange.TopLeft(); // for resizing (after moving)
@@ -1497,7 +1497,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
pDoc->GetChartRanges( aChartName, aRangesVector, pDoc );
if( !aRangesVector.empty() )
{
- sal_Bool bInSourceRange = false;
+ bool bInSourceRange = false;
ScRange aClipRange;
if ( pClipDoc )
{
@@ -1565,7 +1565,7 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
// don't mirror OLE or graphics, otherwise ask the object
// if it can be mirrored
- sal_Bool bCanMirror = ( nIdent != OBJ_GRAF && nIdent != OBJ_OLE2 );
+ bool bCanMirror = ( nIdent != OBJ_GRAF && nIdent != OBJ_OLE2 );
if (bCanMirror)
{
SdrObjTransformInfoRec aInfo;
@@ -1659,7 +1659,7 @@ OUString ScDrawLayer::GetVisibleName( SdrObject* pObj )
return aName;
}
-inline sal_Bool IsNamedObject( SdrObject* pObj, const OUString& rName )
+inline bool IsNamedObject( SdrObject* pObj, const OUString& rName )
{
// sal_True if rName is the object's Name or PersistName
// (used to find a named object)
@@ -1959,7 +1959,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
Size aGraphSize;
ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
Graphic aGraphic;
- sal_Bool bObjSupported = false;
+ bool bObjSupported = false;
if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt
{
@@ -1988,7 +1988,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
rGraphic.GetPrefMapMode(),
aMap100 );
- bObjSupported = sal_True;
+ bObjSupported = true;
}
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
{
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index 348696b..2b1cfec 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -122,8 +122,8 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked )
SCSIZE ni; // number of entries in beginning
SCSIZE nInsert; // insert position (MAXROW+1 := no insert)
- sal_Bool bCombined = false;
- sal_Bool bSplit = false;
+ bool bCombined = false;
+ bool bSplit = false;
if ( nStartRow > 0 )
{
// skip beginning
@@ -138,7 +138,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked )
{ // may be a split or a simple insert or just a shrink,
// row adjustment is done further down
if ( pData[ni].nRow > nEndRow )
- bSplit = sal_True;
+ bSplit = true;
ni++;
nInsert = ni;
}
@@ -149,7 +149,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked )
{ // combine
pData[ni-1].nRow = nEndRow;
nInsert = MAXROWCOUNT;
- bCombined = sal_True;
+ bCombined = true;
}
}
else
@@ -176,7 +176,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked )
pData[ni-1].nRow = nStartRow - 1; // shrink
}
nInsert = MAXROWCOUNT;
- bCombined = sal_True;
+ bCombined = true;
}
else if ( ni > 0 && ni == nInsert )
pData[ni-1].nRow = nStartRow - 1; // shrink
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index a3bebc3..605c80d 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -706,8 +706,8 @@ void ScOutlineArray::InsertSpace(SCCOLROW nStartPos, SCSIZE nSize)
bool ScOutlineArray::DeleteSpace(SCCOLROW nStartPos, SCSIZE nSize)
{
SCCOLROW nEndPos = nStartPos + nSize - 1;
- sal_Bool bNeedSave = false; // Original fuer Undo benoetigt?
- sal_Bool bChanged = false; // fuer Test auf Level
+ bool bNeedSave = false; // Original fuer Undo benoetigt?
+ bool bChanged = false; // fuer Test auf Level
ScSubOutlineIterator aIter( this );
ScOutlineEntry* pEntry;
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index fc01c59..79905b6 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -147,9 +147,9 @@ bool ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ ) const
{
OUString* pStr;
- sal_Bool bHasStyle;
+ bool bHasStyle;
- rStream.ReadUChar( bHasStyle );
+ rStream.ReadCharAsBool( bHasStyle );
if ( bHasStyle )
{
@@ -174,7 +174,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */
SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) const
{
- rStream.WriteUChar( (sal_Bool)sal_True );
+ rStream.WriteUChar( true );
if ( pStyle )
rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() );
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index a5ad954..bc2cf53 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -176,7 +176,7 @@ static void lcl_SetSortList( const Any& rValue )
// if setting is "default", keep default values from ScUserList ctor
//! mark "default" in a safe way
- sal_Bool bDefault = ( nCount == 1 && pArray[0] == "NULL" );
+ bool bDefault = ( nCount == 1 && pArray[0] == "NULL" );
if (!bDefault)
{
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 4f1f8e7..b8ddd9c 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -768,13 +768,13 @@ bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
nStrResId = USHRT_MAX;
}
- sal_Bool b;
- rStream.ReadUChar( b ); bIncludeFont = b;
- rStream.ReadUChar( b ); bIncludeJustify = b;
- rStream.ReadUChar( b ); bIncludeFrame = b;
- rStream.ReadUChar( b ); bIncludeBackground = b;
- rStream.ReadUChar( b ); bIncludeValueFormat = b;
- rStream.ReadUChar( b ); bIncludeWidthHeight = b;
+ bool b;
+ rStream.ReadCharAsBool( b ); bIncludeFont = b;
+ rStream.ReadCharAsBool( b ); bIncludeJustify = b;
+ rStream.ReadCharAsBool( b ); bIncludeFrame = b;
+ rStream.ReadCharAsBool( b ); bIncludeBackground = b;
+ rStream.ReadCharAsBool( b ); bIncludeValueFormat = b;
+ rStream.ReadCharAsBool( b ); bIncludeWidthHeight = b;
if (nVer >= AUTOFORMAT_DATA_ID_31005)
rStream >> m_swFields;
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index e73e7e0..11a0bb2 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -197,9 +197,9 @@ void ScChartPositioner::GlueState()
*p = nOccu;
}
}
- sal_Bool bGlue = sal_True;
+ bool bGlue = true;
- sal_Bool bGlueCols = false;
+ bool bGlueCols = false;
for ( nCol = 0; bGlue && nCol < nC; nCol++ )
{ // iterate columns and try to mark as unused
p = pA.get() + (sal_uLong)nCol * nR;
@@ -220,11 +220,11 @@ void ScChartPositioner::GlueState()
if ( bGlue && *(p = (pA.get() + ((((sal_uLong)nCol+1) * nR) - 1))) == nFree )
{ // mark column as totally unused
*p = nGlue;
- bGlueCols = sal_True; // one unused column at least
+ bGlueCols = true; // one unused column at least
}
}
- sal_Bool bGlueRows = false;
+ bool bGlueRows = false;
for ( nRow = 0; bGlue && nRow < nR; nRow++ )
{ // iterate rows and try to mark as unused
p = pA.get() + nRow;
@@ -243,7 +243,7 @@ void ScChartPositioner::GlueState()
if ( bGlue && *(p = (pA.get() + ((((sal_uLong)nC-1) * nR) + nRow))) == nFree )
{ // mark row as totally unused
*p = nGlue;
- bGlueRows = sal_True; // one unused row at least
+ bGlueRows = true; // one unused row at least
}
}
@@ -278,8 +278,8 @@ void ScChartPositioner::CheckColRowHeaders()
SCROW nRow1, nRow2, iRow;
SCTAB nTab1, nTab2;
- sal_Bool bColStrings = sal_True;
- sal_Bool bRowStrings = sal_True;
+ bool bColStrings = true;
+ bool bRowStrings = true;
GlueState();
if ( aRangeListRef->size() == 1 )
{
@@ -302,7 +302,7 @@ void ScChartPositioner::CheckColRowHeaders()
}
else
{
- sal_Bool bVert = (eGlue == SC_CHARTGLUE_NONE || eGlue == SC_CHARTGLUE_ROWS);
+ bool bVert = (eGlue == SC_CHARTGLUE_NONE || eGlue == SC_CHARTGLUE_ROWS);
for ( size_t i = 0, nRanges = aRangeListRef->size();
(i < nRanges) && (bColStrings || bRowStrings);
++i
@@ -310,7 +310,7 @@ void ScChartPositioner::CheckColRowHeaders()
{
ScRange* pR = (*aRangeListRef)[i];
pR->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
- sal_Bool bTopRow = (nRow1 == nStartRow);
+ bool bTopRow = (nRow1 == nStartRow);
if ( bRowStrings && (bVert || nCol1 == nStartCol) )
{ // NONE or ROWS: RowStrings in every selection possible
// COLS or BOTH: only from first column
@@ -370,7 +370,7 @@ void ScChartPositioner::CreatePositionMap()
GlueState();
- const sal_Bool bNoGlue = (eGlue == SC_CHARTGLUE_NONE);
+ const bool bNoGlue = (eGlue == SC_CHARTGLUE_NONE);
ColumnMap* pCols = new ColumnMap;
SCROW nNoGlueRow = 0;
for ( size_t i = 0, nRanges = aRangeListRef->size(); i < nRanges; ++i )
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index d82134f..1b5bed4 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -356,7 +356,7 @@ static void lcl_UpdateArray( ScSubTotalFunc eFunc,
case SUBTOTAL_FUNC_VAR:
case SUBTOTAL_FUNC_VARP:
{
- sal_Bool bOk = SubTotal::SafePlus(rSum, nVal);
+ bool bOk = SubTotal::SafePlus(rSum, nVal);
bOk = bOk && SubTotal::SafeMult(nVal, nVal);
bOk = bOk && SubTotal::SafePlus(rSumSqr, nVal);
if (!bOk)
@@ -391,7 +391,7 @@ static void lcl_InitArray( ScSubTotalFunc eFunc,
case SUBTOTAL_FUNC_VARP:
{
rSum = nVal;
- sal_Bool bOk = SubTotal::SafeMult(nVal, nVal);
+ bool bOk = SubTotal::SafeMult(nVal, nVal);
if (bOk)
rSumSqr = nVal;
else
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 925678d..0336ce4 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -87,8 +87,8 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r
aTopic = rStream.ReadUniOrByteString( eCharSet );
aItem = rStream.ReadUniOrByteString( eCharSet );
- sal_Bool bHasValue;
- rStream.ReadUChar( bHasValue );
+ bool bHasValue;
+ rStream.ReadCharAsBool( bHasValue );
if ( bHasValue )
pResult = new ScMatrix(0, 0);
@@ -109,7 +109,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
rStream.WriteUniOrByteString( aTopic, eCharSet );
rStream.WriteUniOrByteString( aItem, eCharSet );
- sal_Bool bHasValue = ( pResult != 0 );
+ bool bHasValue = ( pResult != 0 );
rStream.WriteUChar( bHasValue );
if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index ce6d45c..e6ed4e1 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -56,7 +56,7 @@ bool lcl_createStarQuery(
if (pQueryRef->getColSize() < 4)
return false;
- sal_Bool bValid;
+ bool bValid;
OUString aCellStr;
SCSIZE nIndex = 0;
SCROW nRow = 0;
@@ -78,12 +78,12 @@ bool lcl_createStarQuery(
if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )
{
rEntry.eConnect = SC_AND;
- bValid = sal_True;
+ bValid = true;
}
else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) )
{
rEntry.eConnect = SC_OR;
- bValid = sal_True;
+ bValid = true;
}
}
@@ -345,7 +345,7 @@ SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr)
SCCOL nDBCol2 = e.Col();
SCCOL nField = nDBCol1;
- sal_Bool bFound = sal_False;
+ bool bFound = false;
OUString aCellStr;
ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index f1206c0..732d55c 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -282,7 +282,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bForceToT
Point aStartPos = aScrPos;
- sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+ bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
long nLayoutSign = bLayoutRTL ? -1 : 1;
const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
@@ -317,7 +317,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bForceToT
GetItem(ATTR_VER_JUSTIFY)).GetValue();
// asian vertical is always edited top-aligned
- sal_Bool bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() &&
+ bool bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() &&
((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue();
if ( eJust == SVX_VER_JUSTIFY_TOP ||
@@ -486,9 +486,9 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, bool bRememberC
bDeleteDefaults = true;
}
const SfxItemSet& rNewSet = bRememberCopy ? *pDefaults : rSet;
- sal_Bool bUndo = IsUndoEnabled();
+ bool bUndo = IsUndoEnabled();
EnableUndo( false );
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
sal_Int32 nPara = GetParagraphCount();
@@ -535,7 +535,7 @@ const SfxItemSet& ScEditEngineDefaulter::GetDefaults()
void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
{
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
EditEngine::SetText( rTextObject );
@@ -548,7 +548,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
const SfxItemSet& rSet, bool bRememberCopy )
{
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
EditEngine::SetText( rTextObject );
@@ -560,7 +560,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
SfxItemSet* pSet, bool bTakeOwnership )
{
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
EditEngine::SetText( rTextObject );
@@ -571,7 +571,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
void ScEditEngineDefaulter::SetText( const OUString& rText )
{
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
EditEngine::SetText( rText );
@@ -584,7 +584,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText )
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
const SfxItemSet& rSet, bool bRememberCopy )
{
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
EditEngine::SetText( rText );
@@ -596,7 +596,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
SfxItemSet* pSet, bool bTakeOwnership )
{
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
EditEngine::SetText( rText );
@@ -618,7 +618,7 @@ void ScEditEngineDefaulter::RepeatDefaults()
void ScEditEngineDefaulter::RemoveParaAttribs()
{
SfxItemSet* pCharItems = NULL;
- sal_Bool bUpdateMode = GetUpdateMode();
+ bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
SetUpdateMode( false );
sal_Int32 nParCount = GetParagraphCount();
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 235a594..581c2f7 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -296,7 +296,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
break;
case SCFORMULAOPT_ENGLISH_FUNCNAME:
{
- sal_Bool bEnglish = false;
+ bool bEnglish = false;
if (pValues[nProp] >>= bEnglish)
SetUseEnglishFuncName(bEnglish);
}
@@ -390,7 +390,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
break;
case SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO:
{
- sal_Bool bVal = GetCalcConfig().mbEmptyStringAsZero;
+ bool bVal = GetCalcConfig().mbEmptyStringAsZero;
pValues[nProp] >>= bVal;
GetCalcConfig().mbEmptyStringAsZero = bVal;
}
@@ -445,7 +445,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
break;
case SCFORMULAOPT_OPENCL_ENABLED:
{
- sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
+ bool bVal = GetCalcConfig().mbOpenCLEnabled;
pValues[nProp] >>= bVal;
#if 0 // Don't remove please.
// The intent here is that tml when running CppunitTest_sc_opencl_test turns this on.
@@ -456,7 +456,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
break;
case SCFORMULAOPT_OPENCL_AUTOSELECT:
{
- sal_Bool bVal = GetCalcConfig().mbOpenCLAutoSelect;
+ bool bVal = GetCalcConfig().mbOpenCLAutoSelect;
pValues[nProp] >>= bVal;
GetCalcConfig().mbOpenCLAutoSelect = bVal;
}
@@ -501,7 +501,7 @@ void ScFormulaCfg::Commit()
break;
case SCFORMULAOPT_ENGLISH_FUNCNAME:
{
- sal_Bool b = GetUseEnglishFuncName();
+ bool b = GetUseEnglishFuncName();
pValues[nProp] <<= b;
}
break;
@@ -542,7 +542,7 @@ void ScFormulaCfg::Commit()
break;
case SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO:
{
- sal_Bool bVal = GetCalcConfig().mbEmptyStringAsZero;
+ bool bVal = GetCalcConfig().mbEmptyStringAsZero;
pValues[nProp] <<= bVal;
}
break;
@@ -586,14 +586,14 @@ void ScFormulaCfg::Commit()
break;
case SCFORMULAOPT_OPENCL_ENABLED:
{
- sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
+ bool bVal = GetCalcConfig().mbOpenCLEnabled;
pValues[nProp] <<= bVal;
bSetOpenCL = bVal;
}
break;
case SCFORMULAOPT_OPENCL_AUTOSELECT:
{
- sal_Bool bVal = GetCalcConfig().mbOpenCLAutoSelect;
+ bool bVal = GetCalcConfig().mbOpenCLAutoSelect;
pValues[nProp] <<= bVal;
bSetOpenCL = true;
}
diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx
index ea41a61..b473418 100644
--- a/sc/source/core/tool/prnsave.cxx
+++ b/sc/source/core/tool/prnsave.cxx
@@ -54,7 +54,7 @@ void ScPrintSaverTab::SetRepeat( const ScRange* pCol, const ScRange* pRow )
mpRepeatRow = pRow ? new ScRange(*pRow) : NULL;
}
-inline sal_Bool PtrEqual( const ScRange* p1, const ScRange* p2 )
+inline bool PtrEqual( const ScRange* p1, const ScRange* p2 )
{
return ( !p1 && !p2 ) || ( p1 && p2 && *p1 == *p2 );
}
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 634f167..5909fa9 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -47,7 +47,7 @@ ScDocument* ScProgress::pInterpretDoc;
bool ScProgress::bIdleWasEnabled = false;
-static sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
+static bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
{
if (pObjSh)
{
@@ -58,7 +58,7 @@ static sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_HIDDEN, true, &pItem ) &&
((const SfxBoolItem*)pItem)->GetValue() )
- return sal_True;
+ return true;
}
}
return false;
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 14dc78e..31ea9a2 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -357,7 +357,7 @@ sal_Int32 ScRangeStringConverter::IndexOf(
sal_Int32 nLength = rString.getLength();
sal_Int32 nIndex = nOffset;
bool bQuoted = false;
- sal_Bool bExitLoop = false;
+ bool bExitLoop = false;
while( !bExitLoop && (nIndex >= 0 && nIndex < nLength) )
{
@@ -377,7 +377,7 @@ sal_Int32 ScRangeStringConverter::IndexOfDifferent(
{
sal_Int32 nLength = rString.getLength();
sal_Int32 nIndex = nOffset;
- sal_Bool bExitLoop = false;
+ bool bExitLoop = false;
while( !bExitLoop && (nIndex >= 0 && nIndex < nLength) )
{
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 47f6896..380d754 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -106,7 +106,7 @@ void ScRefreshTimer::StopRefreshTimer()
void ScRefreshTimer::SetRefreshDelay( sal_uLong nSeconds )
{
- sal_Bool bActive = IsActive();
+ bool bActive = IsActive();
if ( bActive && !nSeconds )
Stop();
SetTimeout( nSeconds * 1000 );
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index e759778..87c3fb0 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -329,7 +329,7 @@ TOPIC DifParser::GetNextTopic( void )
{
const sal_Unicode* pRef;
sal_uInt16 nCnt = 0;
- sal_Bool bSearch = sal_True;
+ bool bSearch = true;
pRef = ppKeys[ nCnt ];
@@ -637,11 +637,11 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32&
bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
{
- sal_Bool bNeg = false;
+ bool bNeg = false;
double fFracPos = 1.0;
sal_Int32 nExp = 0;
- sal_Bool bExpNeg = false;
- sal_Bool bExpOverflow = false;
+ bool bExpNeg = false;
+ bool bExpOverflow = false;
static const sal_uInt16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden!
sal_Unicode cAkt;
@@ -767,7 +767,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
}
else
{
- bExpOverflow = sal_True;
+ bExpOverflow = true;
eS = S_FINDEND;
}
}
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 80faea6..9d574cb 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -144,7 +144,7 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
- SvStream* pMedStrm, sal_Bool bBiff8, rtl_TextEncoding eNach )
+ SvStream* pMedStrm, bool bBiff8, rtl_TextEncoding eNach )
{
// try to open an OLE storage
SotStorageRef xRootStrg = new SotStorage( pMedStrm, false );
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 99c2d7d..cc85f4f 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -49,7 +49,7 @@ void ImportExcel::Formula25()
sal_uInt16 nXF = 0, nFormLen;
double fCurVal;
sal_uInt8 nFlag0;
- sal_Bool bShrFmla;
+ bool bShrFmla;
aIn >> aXclPos;
@@ -214,12 +214,12 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
double fDouble;
OUString aString;
bool bError = false;
- sal_Bool bArrayFormula = false;
+ bool bArrayFormula = false;
TokenId nMerk0;
- const sal_Bool bRangeName = eFT == FT_RangeName;
- const sal_Bool bSharedFormula = eFT == FT_SharedFormula;
- const sal_Bool bConditional = eFT == FT_CondFormat;
- const sal_Bool bRNorSF = bRangeName || bSharedFormula || bConditional;
+ const bool bRangeName = eFT == FT_RangeName;
+ const bool bSharedFormula = eFT == FT_SharedFormula;
+ const bool bConditional = eFT == FT_CondFormat;
+ const bool bRNorSF = bRangeName || bSharedFormula || bConditional;
ScSingleRefData aSRD;
ScComplexRefData aCRD;
@@ -263,7 +263,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
aIn.Ignore( nUINT16 );
- bArrayFormula = sal_True;
+ bArrayFormula = true;
break;
case 0x03: // Addition [312 264]
aStack >> nMerk0;
@@ -903,9 +903,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
sal_uInt16 nUINT16;
sal_uInt8 nByte;
bool bError = false;
- const sal_Bool bRangeName = eFT == FT_RangeName;
- const sal_Bool bSharedFormula = eFT == FT_SharedFormula;
- const sal_Bool bRNorSF = bRangeName || bSharedFormula;
+ const bool bRangeName = eFT == FT_RangeName;
+ const bool bSharedFormula = eFT == FT_SharedFormula;
+ const bool bRNorSF = bRangeName || bSharedFormula;
ScSingleRefData aSRD;
ScComplexRefData aCRD;
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 83671ab..1653ea9 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -143,7 +143,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
double fDouble;
OUString aString;
bool bError = false;
- sal_Bool bArrayFormula = false;
+ bool bArrayFormula = false;
TokenId nMerk0;
const bool bCondFormat = eFT == FT_CondFormat;
const bool bRangeName = eFT == FT_RangeName || bCondFormat;
@@ -185,7 +185,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
case 0x02: // Data Table [325 277]
aIn.Ignore( 4 );
- bArrayFormula = sal_True;
+ bArrayFormula = true;
break;
case 0x03: // Addition [312 264]
aStack >> nMerk0;
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 24adc64..d026996 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -578,7 +578,7 @@ void XclImpAutoFilterData::InsertQueryParam()
if (pCurrDBData)
{
ScRange aAdvRange;
- sal_Bool bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange );
+ bool bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange );
if( bHasAdv )
pExcRoot->pIR->GetDoc().CreateQueryParam( aAdvRange.aStart.Col(),
aAdvRange.aStart.Row(), aAdvRange.aEnd.Col(), aAdvRange.aEnd.Row(),
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index f45ba18..674861f 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -907,8 +907,8 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
{
XclExpNameManager& rNameMgr = GetNameManager();
- sal_Bool bFound = false;
- sal_Bool bAdvanced = false;
+ bool bFound = false;
+ bool bAdvanced = false;
ScDBData* pData = rRoot.GetDoc().GetAnonymousDBData(nTab);
ScRange aAdvRange;
if (pData)
@@ -951,8 +951,8 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
// AutoFilter
else
{
- sal_Bool bConflict = false;
- sal_Bool bContLoop = sal_True;
+ bool bConflict = false;
+ bool bContLoop = true;
bool bHasOr = false;
SCCOLROW nFirstField = aParam.GetEntry( 0 ).nField;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 8ee0d7d..bf55311 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1347,8 +1347,8 @@ void ImportExcel::PostDocLoad( void )
p = pExcRoot->pPrintTitles->First(n);
if( p )
{
- sal_Bool bRowVirgin = sal_True;
- sal_Bool bColVirgin = sal_True;
+ bool bRowVirgin = true;
+ bool bColVirgin = true;
while( p )
{
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index f4c3dd9..5d10e38 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1693,7 +1693,7 @@ bool XclExpChSerTrendLine::Convert( Reference< XRegressionCurve > xRegCurve, sal
aCurveProp.GetProperty(maData.mfForecastFor, EXC_CHPROP_EXTRAPOLATE_FORWARD);
aCurveProp.GetProperty(maData.mfForecastBack, EXC_CHPROP_EXTRAPOLATE_BACKWARD);
- sal_Bool bIsForceIntercept = false;
+ bool bIsForceIntercept = false;
aCurveProp.GetProperty(bIsForceIntercept, EXC_CHPROP_FORCE_INTERCEPT);
if (bIsForceIntercept)
aCurveProp.GetProperty(maData.mfIntercept, EXC_CHPROP_INTERCEPT_VALUE);
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index c5301d6..b59c987 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -570,7 +570,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
// formatted cell
ScEditEngineDefaulter& rEE = rRoot.GetEditEngine();
- sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
+ bool bOldUpdateMode = rEE.GetUpdateMode();
rEE.SetUpdateMode( true );
// default items
@@ -595,7 +595,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
if( const OutlinerParaObject* pParaObj = rTextObj.GetOutlinerParaObject() )
{
EditEngine& rEE = rRoot.GetDrawEditEngine();
- sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
+ bool bOldUpdateMode = rEE.GetUpdateMode();
rEE.SetUpdateMode( true );
// create the string
rEE.SetText( pParaObj->GetTextObject() );
@@ -623,7 +623,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
{
XclExpStringRef xString;
EditEngine& rEE = rRoot.GetDrawEditEngine();
- sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
+ bool bOldUpdateMode = rEE.GetUpdateMode();
rEE.SetUpdateMode( true );
rEE.SetText( rEditObj );
xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen );
@@ -683,7 +683,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
SfxItemSet aItemSet( *GetDoc().GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END );
// edit engine
- sal_Bool bOldUpdateMode = mrEE.GetUpdateMode();
+ bool bOldUpdateMode = mrEE.GetUpdateMode();
mrEE.SetUpdateMode( true );
mrEE.SetText( *pTextObj );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 82a8145..fb8d326 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1619,7 +1619,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons
aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_FORWARD, maData.mfForecastFor);
aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_BACKWARD, maData.mfForecastBack);
- sal_Bool bForceIntercept = !rtl::math::isNan(maData.mfIntercept);
+ bool bForceIntercept = !rtl::math::isNan(maData.mfIntercept);
aPropSet.SetProperty(EXC_CHPROP_FORCE_INTERCEPT, bForceIntercept);
if (bForceIntercept)
{
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 1b7ecc6..29897285 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1433,7 +1433,7 @@ SdrObject* XclImpTextObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
OUString aRectType = "rectangle";
xSdrObj->MergeDefaultAttributes( &aRectType );
ConvertRectStyle( *xSdrObj );
- sal_Bool bAutoSize = ::get_flag( maTextData.maData.mnFlags, EXC_OBJ_TEXT_AUTOSIZE );
+ bool bAutoSize = ::get_flag( maTextData.maData.mnFlags, EXC_OBJ_TEXT_AUTOSIZE );
xSdrObj->SetMergedItem( SdrTextAutoGrowWidthItem( bAutoSize ) );
xSdrObj->SetMergedItem( SdrTextAutoGrowHeightItem( bAutoSize ) );
xSdrObj->SetMergedItem( SdrTextWordWrapItem( true ) );
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 2c56e43..329d9e0 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -975,11 +975,11 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
else
aBgColor = rBrushItem.GetColor();
- sal_Bool bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
- sal_Bool bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
- sal_Bool bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() );
- sal_Bool bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // default is AUTO now
- sal_Bool bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() );
+ bool bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
+ bool bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
+ bool bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() );
+ bool bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // default is AUTO now
+ bool bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() );
sal_uInt16 nSetFontSizeNumber = 0;
sal_uInt32 nFontHeight = rFontHeightItem.GetHeight();
if ( nFontHeight != aHTMLStyle.nFontHeight )
@@ -989,7 +989,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
nSetFontSizeNumber = 0; // no difference, don't set
}
- sal_Bool bSetFont = (bSetFontColor || bSetFontName || nSetFontSizeNumber);
+ bool bSetFont = (bSetFontColor || bSetFontName || nSetFontSizeNumber);
//! TODO: we could entirely use CSS1 here instead, but that would exclude
//! Netscape 3.0 and Netscape 4.x without JavaScript enabled.
@@ -1182,7 +1182,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
}
if ( bFields )
{
- sal_Bool bOldUpdateMode = rEngine.GetUpdateMode();
+ bool bOldUpdateMode = rEngine.GetUpdateMode();
rEngine.SetUpdateMode( true ); // no portions if not formatted
for ( sal_Int32 nPar=0; nPar < nParas; nPar++ )
{
@@ -1195,7 +1195,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
{
sal_Int32 nEnd = *it;
ESelection aSel( nPar, nStart, nPar, nEnd );
- sal_Bool bUrl = false;
+ bool bUrl = false;
// fields are single characters
if ( nEnd == nStart+1 )
{
@@ -1206,7 +1206,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
const SvxFieldData* pField = ((const SvxFieldItem*)pItem)->GetField();
if ( pField && pField->ISA(SvxURLField) )
{
- bUrl = sal_True;
+ bUrl = true;
const SvxURLField* pURLField = (const SvxURLField*)pField;
// String aFieldText = rEngine.GetText( aSel );
rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_href ).WriteCharPtr( "=\"" );
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 0c5fcdf..5710afb 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -93,7 +93,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
SCCOL nCol2 = aR.aEnd.Col();
SCROW nRow2 = aR.aEnd.Row();
// All cells empty under object?
- sal_Bool bInCell = (pDoc->GetEmptyLinesInBlock(
+ bool bInCell = (pDoc->GetEmptyLinesInBlock(
nCol1, nRow1, nTab, nCol2, nRow2, nTab, DIR_TOP )
== static_cast< SCSIZE >( nRow2 - nRow1 )); // rows-1 !
if ( bInCell )
@@ -142,8 +142,8 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
const SdrGrafObjGeoData* pGeo = (SdrGrafObjGeoData*)pSGO->GetGeoData();
sal_uInt16 nMirrorCase = (pGeo->aGeo.nDrehWink == 18000 ?
( pGeo->bMirrored ? 3 : 4 ) : ( pGeo->bMirrored ? 2 : 1 ));
- sal_Bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) );
- sal_Bool bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) );
+ bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) );
+ bool bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) );
sal_uLong nXOutFlags = 0;
if ( bHMirr )
nXOutFlags |= XOUTBMP_MIRROR_HORZ;
diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index 2d7fd74..c46645f 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.h
@@ -24,7 +24,7 @@
#include <sal/types.h>
-sal_Bool MemNew( void );
+bool MemNew( void );
void MemDelete( void );
#endif
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 4e3fa9b..cadf3f5 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -69,12 +69,12 @@ public:
pAttr = NULL;
}
- sal_Bool operator ==( const FormIdent& rComp ) const
+ bool operator ==( const FormIdent& rComp ) const
{
return ( nStamp == rComp.nStamp );
}
- sal_Bool operator ==( const StampTyp& rStamp ) const
+ bool operator ==( const StampTyp& rStamp ) const
{
return ( nStamp == rStamp );
}
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index 6ea7406..79a74c8 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -46,8 +46,8 @@ const sal_uInt16 nBOF = 0x0000;
extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei
WKTYP eTyp;
-extern sal_Bool bEOF; // zeigt Ende der Datei
-sal_Bool bEOF;
+extern bool bEOF; // zeigt Ende der Datei
+bool bEOF;
extern rtl_TextEncoding eCharVon;
rtl_TextEncoding eCharVon;
@@ -100,7 +100,7 @@ generate_Opcodes( SvStream& aStream, ScDocument& rDoc,
aStream.ReadUInt16( nOpcode ).ReadUInt16( nLength );
aPrgrsBar.Progress();
if( nOpcode == LOTUS_EOF )
- bEOF = sal_True;
+ bEOF = true;
else if( nOpcode == LOTUS_FILEPASSWD )
return eERR_FILEPASSWD;
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 6cd07c8..f767504 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -41,7 +41,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
sal_Int32 nLauf;
TokenId nMerk0, nMerk1;
- sal_Bool bAddIn = false;
+ bool bAddIn = false;
OSL_ENSURE( nAnz < 128, "-LotusToSc::DoFunc(): Neee! -so viel kann ich nicht!" );
@@ -70,7 +70,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
if( eOc == ocNoName )
{
- bAddIn = sal_True;
+ bAddIn = true;
nMerk0 = aPool.Store(eOc, OStringToOUString(t, eSrcChar));
aPool << nMerk0;
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 0a31e33..a17b94d 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -404,7 +404,7 @@ void ImportLotus::_Row( const sal_uInt16 nRecLen )
sal_uInt8 nRepeats;
LotAttrWK3 aAttr;
- sal_Bool bCenter = false;
+ bool bCenter = false;
SCCOL nCenterStart = 0, nCenterEnd = 0;
Read( nRow );
@@ -440,7 +440,7 @@ void ImportLotus::_Row( const sal_uInt16 nRecLen )
}
else
{// ganz neue Center
- bCenter = sal_True;
+ bCenter = true;
nCenterStart = nColCnt;
}
nCenterEnd = nColCnt + static_cast<SCCOL>(nRepeats);
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index d38b0c0..525ea50 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -232,7 +232,7 @@ FltError ImportLotus::Read( SvStream& rIn )
{
pIn = &rIn;
- sal_Bool bRead = sal_True;
+ bool bRead = true;
sal_uInt16 nOp;
sal_uInt16 nRecLen;
sal_uInt32 nNextRec = 0UL;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index c7cc4d0..cc0af09 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -30,7 +30,7 @@
FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocument* pDocument, rtl_TextEncoding eSrc )
{
ScFilterOptions aFilterOpt;
- sal_Bool bWithWK3 = aFilterOpt.GetWK3Flag();
+ bool bWithWK3 = aFilterOpt.GetWK3Flag();
SvStream* pStream = rMedium.GetInStream();
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index 33b4858..921ebd1 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -38,7 +38,7 @@ extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter,
*pAttrRepeat, *pAttrStandard; // -> tool.cxx, fuer GetFormAttr()
extern ScProtectionAttr* pAttrUnprot; // -> tool.cxx, fuer PutFormString()
-sal_Bool MemNew( void )
+bool MemNew( void )
{
pValueFormCache = new FormCache( pDoc );
@@ -50,7 +50,7 @@ sal_Bool MemNew( void )
pAttrRepeat = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_REPEAT, ATTR_HOR_JUSTIFY );
pAttrStandard = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY );
- return sal_True;
+ return true;
}
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 105892a..fbbda65 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -55,7 +55,7 @@
#include <boost/scoped_array.hpp>
extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
-extern sal_Bool bEOF; // -> filter.cxx, zeigt Dateiende an
+extern bool bEOF; // -> filter.cxx, zeigt Dateiende an
extern sal_uInt8 nDefaultFormat; // -> tool.cxx, Default-Zellenformat
extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
extern rtl_TextEncoding eCharVon; // -> filter.cxx, character set specified
@@ -76,7 +76,7 @@ void OP_BOF( SvStream& r, sal_uInt16 /*n*/ )
void OP_EOF( SvStream& /*r*/, sal_uInt16 /*n*/ )
{
- bEOF = sal_True;
+ bEOF = true;
}
void OP_Integer( SvStream& r, sal_uInt16 /*n*/ )
@@ -344,7 +344,7 @@ void OP_BOF123( SvStream& r, sal_uInt16 /*n*/ )
void OP_EOF123( SvStream& /*r*/, sal_uInt16 /*n*/ )
{
- bEOF = sal_True;
+ bEOF = true;
}
void OP_Label123( SvStream& r, sal_uInt16 n )
@@ -513,7 +513,7 @@ void OP_CreatePattern123( SvStream& r, sal_uInt16 n)
r.ReadUInt16( nPatternId );
sal_uInt8 Hor_Align, Ver_Align, temp;
- sal_Bool bIsBold,bIsUnderLine,bIsItalics;
+ bool bIsBold,bIsUnderLine,bIsItalics;
r.SeekRel(12);
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index a1bdf41..288522a 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -190,7 +190,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
sal_uInt32 nIndex1;
sal_uInt32 nHandle;
NfIndexTableOffset eIndexTableOffset = NF_NUMERIC_START;
- sal_Bool bDefault = false;
+ bool bDefault = false;
if( nForm == 0xFF ) // Default-Format?
nForm = nDefaultFormat;
@@ -330,11 +330,11 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
break;
case 0x0F: // Standardeinstellung
//fStandard;nSt;
- bDefault = sal_True;
+ bDefault = true;
break;
default:
//fStandard;nSt;
- bDefault = sal_True;
+ bDefault = true;
break;
}
break;
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 7fe06e0..93555ad 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -153,7 +153,7 @@ void Comment::finalizeImport()
Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
// convert shape formatting and visibility
- sal_Bool bVisible = sal_True;
+ bool bVisible = true;
switch( getFilterType() )
{
case FILTER_OOXML:
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 454a1ac..004fe58 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -285,10 +285,10 @@ OUString PivotCacheItem::getName() const
{
case XML_m: return OUString();
case XML_s: return maValue.get< OUString >();
- case XML_n: return OUString::number( maValue.get< double >() ); // !TODO
+ case XML_n: return OUString::number( maValue.get< double >() ); // !TODO
case XML_i: return OUString::number( maValue.get< sal_Int32 >() );
case XML_d: return OUString(); // !TODO
- case XML_b: return OUString::boolean( static_cast< sal_Bool >( maValue.get< bool >() ) ); // !TODO
+ case XML_b: return OUString::boolean( maValue.get< bool >() ); // !TODO
case XML_e: return OUString(); // !TODO
}
OSL_FAIL( "PivotCacheItem::getName - invalid data type" );
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 5665e99..a61d088 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -78,11 +78,11 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
sal_Int32 nCount;
TokenId nPush, nPush1;
- sal_Bool bAddIn = false;
+ bool bAddIn = false;
if( eOc == ocNoName )
{
- bAddIn = sal_True;
+ bAddIn = true;
if( pExtString )
{
OStringBuffer s("QPRO_");
diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx
index 5837c65..e0db2209 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -131,7 +131,7 @@ void ScQProStyle::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow,
// Font Attributes
sal_uInt16 nTmpFnt = maFontRecord[ maFont[ nStyle ] ];
- sal_Bool bIsBold, bIsItalic, bIsUnderLine;
+ bool bIsBold, bIsItalic, bIsUnderLine;
bIsBold = ( nTmpFnt & 0x0001 ) != 0;
bIsItalic = ( nTmpFnt & 0x0002 ) != 0;
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 199772b..f26adcd 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -177,7 +177,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
aSet.ClearItem( EE_PARA_JUST );
// Test whether simple String without mixed attributes
- sal_Bool bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara );
+ bool bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara );
for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++)
{
const SfxPoolItem* pItem = 0;
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 2095314..bbbda81 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -199,7 +199,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
}
}
- sal_Bool bResetPar, bResetAttr;
+ bool bResetPar, bResetAttr;
bResetPar = bResetAttr = false;
const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
@@ -225,17 +225,17 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
{ // bold
- bResetAttr = sal_True;
+ bResetAttr = true;
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B );
}
if ( rPostureItem.GetPosture() != ITALIC_NONE )
{ // italic
- bResetAttr = sal_True;
+ bResetAttr = true;
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
}
if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
{ // underline
- bResetAttr = sal_True;
+ bResetAttr = true;
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
}
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 3280eb5..3449bb1 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -113,7 +113,7 @@ inline void ScRTFParser::NextRow()
bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol )
{
ScRTFColTwips::const_iterator it = pColTwips->find( nTwips );
- sal_Bool bFound = it != pColTwips->end();
+ bool bFound = it != pColTwips->end();
sal_uInt16 nPos = it - pColTwips->begin();
*pCol = static_cast<SCCOL>(nPos);
if ( bFound )
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 91da40f..b9251bf 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -802,10 +802,10 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
Color aRColor( nColor.Red, nColor.Green, nColor.Blue );
sal_uInt16 nFact;
- sal_Bool bSwapCol = false;
+ bool bSwapCol = false;
switch (pHeadFootLine->Raster)
{
- case raNone: nFact = 0xffff; bSwapCol = sal_True; break;
+ case raNone: nFact = 0xffff; bSwapCol = true; break;
case raGray12: nFact = (0xffff / 100) * 12; break;
case raGray25: nFact = (0xffff / 100) * 25; break;
case raGray50: nFact = (0xffff / 100) * 50; break;
@@ -1083,10 +1083,10 @@ void Sc10Import::LoadProtect()
void Sc10Import::LoadViewColRowBar()
{
- sal_uInt8 ViewColRowBar;
- rStream.ReadUChar( ViewColRowBar );
+ bool bViewColRowBar;
+ rStream.ReadCharAsBool( bViewColRowBar );
nError = rStream.GetError();
- aSc30ViewOpt.SetOption( VOPT_HEADER, (sal_Bool)ViewColRowBar );
+ aSc30ViewOpt.SetOption( VOPT_HEADER, bViewColRowBar );
}
@@ -1330,11 +1330,11 @@ void Sc10Import::LoadPatternCollection()
Color aRColor( COL_BLACK );
lcl_ChangeColor( nRColor, aRColor );
sal_uInt16 nFact;
- sal_Bool bSwapCol = false;
- sal_Bool bSetItem = sal_True;
+ bool bSwapCol = false;
+ bool bSetItem = true;
switch (pPattern->Raster)
{
- case raNone: nFact = 0xffff; bSwapCol = sal_True; bSetItem = (nBColor > 0); break;
+ case raNone: nFact = 0xffff; bSwapCol = true; bSetItem = (nBColor > 0); break;
case raGray12: nFact = (0xffff / 100) * 12; break;
case raGray25: nFact = (0xffff / 100) * 25; break;
case raGray50: nFact = (0xffff / 100) * 50; break;
@@ -1363,10 +1363,10 @@ void Sc10Import::LoadPatternCollection()
if( ( pPattern->Flags != 0 ) &&
( ( pPattern->FormatFlags & pfProtection ) == pfProtection ) )
{
- sal_Bool bProtect = ( ( pPattern->Flags & paProtect ) == paProtect );
- sal_Bool bHFormula = ( ( pPattern->Flags & paHideFormula ) == paHideFormula );
- sal_Bool bHCell = ( ( pPattern->Flags & paHideAll ) == paHideAll );
- sal_Bool bHPrint = ( ( pPattern->Flags & paHidePrint ) == paHidePrint );
+ bool bProtect = ( ( pPattern->Flags & paProtect ) == paProtect );
+ bool bHFormula = ( ( pPattern->Flags & paHideFormula ) == paHideFormula );
+ bool bHCell = ( ( pPattern->Flags & paHideAll ) == paHideAll );
+ bool bHPrint = ( ( pPattern->Flags & paHidePrint ) == paHidePrint );
rItemSet.Put( ScProtectionAttr( bProtect, bHFormula, bHCell, bHPrint ) );
}
} // if Style != 0
@@ -1391,7 +1391,7 @@ void Sc10Import::LoadDataBaseCollection()
( SCCOL ) pOldData->DataBaseRec.Block.x2,
( SCROW ) pOldData->DataBaseRec.Block.y2,
true,
- ( sal_Bool) pOldData->DataBaseRec.RowHeader );
+ (bool) pOldData->DataBaseRec.RowHeader );
bool ins = pDoc->GetDBCollection()->getNamedDBs().insert(pNewData);
assert(ins); (void)ins;
//TODO: or can this fail (and need delete pNewData)?
@@ -1871,7 +1871,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
nStart = nEnd + 1;
}
// Border
- sal_Bool bEnd = false;
+ bool bEnd = false;
sal_uInt16 nColorIndex = 0;
sal_uInt16 nFrameIndex = 0;
@@ -2027,11 +2027,11 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
ScPatternAttr aScPattern( pDoc->GetPool() );
sal_uInt16 nFact;
- sal_Bool bSwapCol = false;
- sal_Bool bSetItem = sal_True;
+ bool bSwapCol = false;
+ bool bSetItem = true;
switch ( aRaster.pData[ nRasterIndex ].Value )
{
- case raNone: nFact = 0xffff; bSwapCol = sal_True; bSetItem = (nBColor > 0); break;
+ case raNone: nFact = 0xffff; bSwapCol = true; bSetItem = (nBColor > 0); break;
case raGray12: nFact = (0xffff / 100) * 12; break;
case raGray25: nFact = (0xffff / 100) * 25; break;
case raGray50: nFact = (0xffff / 100) * 50; break;
@@ -2114,10 +2114,10 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
nEnd = static_cast<SCROW>(aFlag.pData[i].Row);
if ((nStart <= nEnd) && (aFlag.pData[i].Value != 0))
{
- sal_Bool bProtect = ((aFlag.pData[i].Value & paProtect) == paProtect);
- sal_Bool bHFormula = ((aFlag.pData[i].Value & paHideFormula) == paHideFormula);
- sal_Bool bHCell = ((aFlag.pData[i].Value & paHideAll) == paHideAll);
- sal_Bool bHPrint = ((aFlag.pData[i].Value & paHidePrint) == paHidePrint);
+ bool bProtect = ((aFlag.pData[i].Value & paProtect) == paProtect);
+ bool bHFormula = ((aFlag.pData[i].Value & paHideFormula) == paHideFormula);
+ bool bHCell = ((aFlag.pData[i].Value & paHideAll) == paHideAll);
+ bool bHPrint = ((aFlag.pData[i].Value & paHidePrint) == paHidePrint);
ScPatternAttr aScPattern(pDoc->GetPool());
aScPattern.GetItemSet().Put(ScProtectionAttr(bProtect, bHFormula, bHCell, bHPrint));
pDoc->ApplyPatternAreaTab(Col, nStart, Col, nEnd, Tab, aScPattern);
@@ -2335,7 +2335,7 @@ void Sc10Import::LoadObjects()
{
sal_uInt8 ObjectType;
Sc10GraphHeader GraphHeader;
- sal_Bool IsOleObject = false; // Achtung dies ist nur ein Notnagel
+ bool IsOleObject = false; // Achtung dies ist nur ein Notnagel
for (sal_uInt16 i = 0; (i < nAnz) && (nError == 0) && !rStream.IsEof() && !IsOleObject; i++)
{
rStream.ReadUChar( ObjectType );
@@ -2361,7 +2361,7 @@ void Sc10Import::LoadObjects()
{
case otOle :
// Achtung hier muss sowas wie OleLoadFromStream passieren
- IsOleObject = sal_True;
+ IsOleObject = true;
break;
case otImage :
{
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 9d0d95d..c5b0a73 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -209,7 +209,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres
// read the formula, 3D tab refs from extended data
const ScTokenArray* pArray = NULL;
aFmlConv.Reset( rPosition );
- sal_Bool bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This
+ bool bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This
rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL;
pStrm->Ignore( 1 );
}
@@ -307,7 +307,7 @@ void XclImpChangeTrack::ReadChTrInsert()
else
aRange.aEnd.SetCol( MAXCOL );
- sal_Bool bValid = pStrm->IsValid();
+ bool bValid = pStrm->IsValid();
if( FoundNestedMode() )
ReadNestedRecords();
@@ -407,7 +407,7 @@ void XclImpChangeTrack::ReadChTrMoveRange()
aSourceRange.aStart.SetTab( ReadTabNum() );
aSourceRange.aEnd.SetTab( aSourceRange.aStart.Tab() );
- sal_Bool bValid = pStrm->IsValid();
+ bool bValid = pStrm->IsValid();
if( FoundNestedMode() )
ReadNestedRecords();
@@ -460,7 +460,7 @@ bool XclImpChangeTrack::EndNestedMode()
void XclImpChangeTrack::ReadRecords()
{
- sal_Bool bExitLoop = false;
+ bool bExitLoop = false;
while( !bExitLoop && !bGlobExit && pStrm->StartNextRecord() )
{
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 5c67362..3e7f6ee 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -194,7 +194,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
{
if ( nAdditionalText )
nAdditionalText++;
- sal_Bool bInGroup = ( pCurrXclObj != NULL );
+ bool bInGroup = ( pCurrXclObj != NULL );
if ( bInGroup )
{ // stacked recursive group object
if ( !pCurrAppData->IsStackedGroup() )
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 285fc62..5f1853c 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1225,7 +1225,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
if( !pRList )
return;
- sal_Bool bContLoop = sal_True;
+ bool bContLoop = true;
SCROW nRow;
SCCOL nCol;
OUString sText;
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
index 6454320..ef5bbb0 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
@@ -146,19 +146,19 @@ void XMLTableMasterPageExport::exportMasterPageContent(
}
else
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list