[Libreoffice-commits] core.git: basic/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source include/editeng include/svl include/svx reportdesign/source sc/source sd/source sfx2/source starmath/source svl/source svx/source sw/inc sw/source
Stephan Bergmann
sbergman at redhat.com
Wed Feb 19 23:18:34 PST 2014
basic/source/classes/sb.cxx | 6
basic/source/classes/sbunoobj.cxx | 2
basic/source/classes/sbxmod.cxx | 6
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxobj.cxx | 16 -
chart2/source/controller/dialogs/res_DataLabel.cxx | 18 -
chart2/source/controller/dialogs/res_ErrorBar.cxx | 12 -
chart2/source/controller/dialogs/res_LegendPosition.cxx | 4
chart2/source/controller/dialogs/res_Trendline.cxx | 20 -
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 14 -
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 14 -
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 2
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 6
chart2/source/controller/dialogs/tp_Scale.cxx | 40 +--
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 18 -
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 2
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 8
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 4
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 4
chart2/source/controller/main/ChartController_Position.cxx | 10
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
cui/source/customize/acccfg.cxx | 6
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/postdlg.cxx | 6
cui/source/dialogs/zoom.cxx | 2
cui/source/options/connpoolconfig.cxx | 4
cui/source/options/connpooloptions.cxx | 4
cui/source/options/dbregister.cxx | 2
cui/source/options/dbregisterednamesconfig.cxx | 2
cui/source/options/optchart.cxx | 2
cui/source/options/optgdlg.cxx | 10
cui/source/options/optlingu.cxx | 4
cui/source/options/optmemory.cxx | 2
cui/source/options/treeopt.cxx | 20 -
cui/source/tabpages/align.cxx | 8
cui/source/tabpages/backgrnd.cxx | 38 +--
cui/source/tabpages/border.cxx | 14 -
cui/source/tabpages/chardlg.cxx | 72 +++---
cui/source/tabpages/grfpage.cxx | 14 -
cui/source/tabpages/macroass.cxx | 8
cui/source/tabpages/numfmt.cxx | 8
cui/source/tabpages/numpages.cxx | 62 ++---
cui/source/tabpages/page.cxx | 12 -
cui/source/tabpages/paragrph.cxx | 8
cui/source/tabpages/tabstpge.cxx | 6
cui/source/tabpages/tparea.cxx | 26 +-
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 4
cui/source/tabpages/tphatch.cxx | 4
cui/source/tabpages/tpline.cxx | 6
cui/source/tabpages/transfrm.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 8
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 22 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 38 +--
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 14 -
dbaccess/source/ui/dlg/admincontrols.cxx | 12 -
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.cxx | 12 -
dbaccess/source/ui/dlg/dbadmin.cxx | 4
dbaccess/source/ui/dlg/detailpages.cxx | 42 +--
dbaccess/source/ui/dlg/generalpage.cxx | 8
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/misc/UITools.cxx | 4
desktop/source/app/app.cxx | 4
editeng/source/editeng/editdoc.cxx | 6
editeng/source/editeng/eerdll.cxx | 2
editeng/source/editeng/eertfpar.cxx | 4
editeng/source/editeng/impedit2.cxx | 4
editeng/source/editeng/impedit5.cxx | 4
editeng/source/items/paraitem.cxx | 2
editeng/source/items/textitem.cxx | 10
editeng/source/outliner/outlvw.cxx | 2
editeng/source/rtf/rtfitem.cxx | 12 -
editeng/source/rtf/svxrtf.cxx | 116 ++++-----
editeng/source/uno/unofored.cxx | 2
editeng/source/uno/unoipset.cxx | 4
editeng/source/uno/unotext.cxx | 20 -
extensions/source/propctrlr/fontdialog.cxx | 4
extensions/source/propctrlr/formcomponenthandler.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/svdfppt.cxx | 6
forms/source/richtext/rtattributehandler.cxx | 2
include/editeng/crossedoutitem.hxx | 2
include/editeng/postitem.hxx | 2
include/editeng/udlnitem.hxx | 2
include/editeng/wghtitem.hxx | 2
include/svl/aeitem.hxx | 2
include/svl/cenumitm.hxx | 4
include/svl/cjkoptions.hxx | 22 -
include/svl/fstathelper.hxx | 6
include/svl/inethist.hxx | 12 -
include/svl/itemiter.hxx | 4
include/svl/itempool.hxx | 14 -
include/svl/itemprop.hxx | 2
include/svl/itemset.hxx | 6
include/svl/languageoptions.hxx | 26 +-
include/svl/lstner.hxx | 6
include/svl/macitem.hxx | 10
include/svl/poolcach.hxx | 2
include/svl/poolitem.hxx | 6
include/svl/rngitem.hxx | 2
include/svl/sharecontrolfile.hxx | 2
include/svl/style.hxx | 2
include/svl/visitem.hxx | 6
include/svx/sdtfsitm.hxx | 2
reportdesign/source/ui/misc/UITools.cxx | 54 ++--
reportdesign/source/ui/report/ReportController.cxx | 12 -
sc/source/core/data/docpool.cxx | 2
sc/source/core/tool/progress.cxx | 2
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2
sc/source/ui/app/scmod.cxx | 6
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 4
sc/source/ui/dbgui/validate.cxx | 26 +-
sc/source/ui/docshell/docsh.cxx | 18 -
sc/source/ui/docshell/docsh4.cxx | 22 -
sc/source/ui/drawfunc/drawsh5.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 6
sc/source/ui/drawfunc/fuins1.cxx | 6
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 8
sc/source/ui/undo/undocell.cxx | 6
sc/source/ui/vba/vbafont.cxx | 18 -
sc/source/ui/vba/vbaformat.cxx | 4
sc/source/ui/view/auditsh.cxx | 4
sc/source/ui/view/cellsh1.cxx | 8
sc/source/ui/view/cellsh2.cxx | 50 ++--
sc/source/ui/view/cellsh3.cxx | 8
sc/source/ui/view/editsh.cxx | 10
sc/source/ui/view/formatsh.cxx | 36 +--
sc/source/ui/view/output2.cxx | 6
sc/source/ui/view/prevwsh.cxx | 8
sc/source/ui/view/tabvwsh2.cxx | 6
sc/source/ui/view/tabvwsh3.cxx | 36 +--
sc/source/ui/view/tabvwsh4.cxx | 8
sc/source/ui/view/tabvwsha.cxx | 8
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/tabvwshh.cxx | 2
sc/source/ui/view/viewfun2.cxx | 6
sd/source/core/sdpage2.cxx | 2
sd/source/core/stlsheet.cxx | 4
sd/source/filter/html/htmlex.cxx | 4
sd/source/filter/html/sdhtmlfilter.cxx | 2
sd/source/filter/ppt/pptin.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 6
sd/source/ui/app/sdmod1.cxx | 10
sd/source/ui/app/sdmod2.cxx | 20 -
sd/source/ui/dlg/copydlg.cxx | 18 -
sd/source/ui/dlg/dlgfield.cxx | 2
sd/source/ui/dlg/dlgolbul.cxx | 12 -
sd/source/ui/dlg/prltempl.cxx | 6
sd/source/ui/dlg/prntopts.cxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 2
sd/source/ui/func/fubullet.cxx | 4
sd/source/ui/func/fuchar.cxx | 6
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fucopy.cxx | 20 -
sd/source/ui/func/fuhhconv.cxx | 4
sd/source/ui/func/fuolbull.cxx | 14 -
sd/source/ui/func/fupage.cxx | 16 -
sd/source/ui/func/fuparagr.cxx | 4
sd/source/ui/func/futempl.cxx | 10
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 4
sd/source/ui/unoidl/unopback.cxx | 2
sd/source/ui/view/MediaObjectBar.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 4
sd/source/ui/view/drtxtob.cxx | 2
sd/source/ui/view/drtxtob1.cxx | 8
sd/source/ui/view/drviews3.cxx | 2
sd/source/ui/view/drviews7.cxx | 2
sd/source/ui/view/drviewsf.cxx | 2
sd/source/ui/view/viewshel.cxx | 12 -
sfx2/source/appl/appcfg.cxx | 68 ++---
sfx2/source/appl/appserv.cxx | 14 -
sfx2/source/appl/appuno.cxx | 104 ++++----
sfx2/source/control/bindings.cxx | 4
sfx2/source/control/request.cxx | 2
sfx2/source/control/shell.cxx | 2
sfx2/source/control/statcach.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 16 -
sfx2/source/dialog/itemconnect.cxx | 6
sfx2/source/dialog/mgetempl.cxx | 2
sfx2/source/dialog/styledlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/objserv.cxx | 6
sfx2/source/doc/objstor.cxx | 6
sfx2/source/explorer/nochaos.cxx | 2
sfx2/source/view/viewfrm.cxx | 6
sfx2/source/view/viewprn.cxx | 2
starmath/source/accessibility.cxx | 2
starmath/source/config.cxx | 16 -
starmath/source/view.cxx | 2
svl/source/config/cjkoptions.cxx | 120 +++++-----
svl/source/config/ctloptions.cxx | 2
svl/source/config/languageoptions.cxx | 28 +-
svl/source/fsstor/fsstorage.cxx | 10
svl/source/fsstor/fsstorage.hxx | 2
svl/source/items/aeitem.cxx | 6
svl/source/items/cenumitm.cxx | 12 -
svl/source/items/ctypeitm.cxx | 4
svl/source/items/itempool.cxx | 14 -
svl/source/items/itemprop.cxx | 12 -
svl/source/items/itemset.cxx | 26 +-
svl/source/items/macitem.cxx | 6
svl/source/items/poolcach.cxx | 2
svl/source/items/poolio.cxx | 8
svl/source/items/srchitem.cxx | 14 -
svl/source/items/visitem.cxx | 2
svl/source/misc/documentlockfile.cxx | 2
svl/source/misc/fstathelper.cxx | 14 -
svl/source/misc/inethist.cxx | 12 -
svl/source/notify/lstner.cxx | 14 -
svl/source/numbers/numfmuno.cxx | 2
svl/source/numbers/zformat.cxx | 14 -
svl/source/passwordcontainer/passwordcontainer.cxx | 38 +--
svx/source/dialog/dlgutil.cxx | 4
svx/source/dialog/fntctrl.cxx | 2
svx/source/dialog/hdft.cxx | 18 -
svx/source/dialog/optgrid.cxx | 6
svx/source/dialog/srchdlg.cxx | 2
svx/source/engine3d/float3d.cxx | 10
svx/source/form/fmshell.cxx | 6
svx/source/form/fmview.cxx | 2
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4
svx/source/sdr/properties/attributeproperties.cxx | 2
svx/source/sdr/properties/defaultproperties.cxx | 2
svx/source/sdr/properties/e3dsceneproperties.cxx | 2
svx/source/sdr/properties/groupproperties.cxx | 2
svx/source/sdr/properties/itemsettools.cxx | 2
svx/source/sdr/properties/properties.cxx | 6
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 56 ++--
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdibrow.cxx | 2
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdotxat.cxx | 2
svx/source/svdraw/svdpntv.cxx | 6
svx/source/svdraw/svdtext.cxx | 2
svx/source/svdraw/svdundo.cxx | 4
svx/source/table/cell.cxx | 4
svx/source/table/svdotable.cxx | 4
svx/source/table/tablecontroller.cxx | 30 +-
svx/source/table/tablertfimporter.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/unodraw/unoshape.cxx | 6
svx/source/xoutdev/xexch.cxx | 2
svx/source/xoutdev/xpool.cxx | 2
sw/inc/docstyle.hxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/attr/format.cxx | 2
sw/source/core/attr/swatrset.cxx | 14 -
sw/source/core/bastyp/init.cxx | 2
sw/source/core/crsr/findattr.cxx | 16 -
sw/source/core/doc/dbgoutsw.cxx | 2
sw/source/core/doc/docedt.cxx | 12 -
sw/source/core/doc/docfly.cxx | 14 -
sw/source/core/doc/docfmt.cxx | 24 +-
sw/source/core/doc/doclay.cxx | 28 +-
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/fmtcol.cxx | 18 -
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/doc/tblcpy.cxx | 2
sw/source/core/doc/tblrwcl.cxx | 2
sw/source/core/docnode/ndcopy.cxx | 16 -
sw/source/core/docnode/ndtbl.cxx | 24 +-
sw/source/core/docnode/ndtbl1.cxx | 4
sw/source/core/docnode/node.cxx | 14 -
sw/source/core/docnode/section.cxx | 18 -
sw/source/core/draw/dcontact.cxx | 20 -
sw/source/core/edit/acorrect.cxx | 4
sw/source/core/edit/autofmt.cxx | 10
sw/source/core/edit/edfcol.cxx | 8
sw/source/core/edit/edfmt.cxx | 2
sw/source/core/edit/edsect.cxx | 2
sw/source/core/edit/edtab.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 12 -
sw/source/core/frmedt/tblsel.cxx | 2
sw/source/core/layout/atrfrm.cxx | 4
sw/source/core/layout/flycnt.cxx | 2
sw/source/core/layout/flyincnt.cxx | 4
sw/source/core/layout/flylay.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/layout/tabfrm.cxx | 12 -
sw/source/core/table/swtable.cxx | 14 -
sw/source/core/text/txtfrm.cxx | 28 +-
sw/source/core/txtnode/ndtxt.cxx | 48 ++--
sw/source/core/txtnode/swfont.cxx | 82 +++---
sw/source/core/txtnode/thints.cxx | 12 -
sw/source/core/txtnode/txtedt.cxx | 6
sw/source/core/undo/SwUndoPageDesc.cxx | 24 +-
sw/source/core/undo/unattr.cxx | 10
sw/source/core/undo/undel.cxx | 4
sw/source/core/undo/unspnd.cxx | 4
sw/source/core/undo/untbl.cxx | 8
sw/source/core/unocore/unodraw.cxx | 2
sw/source/core/unocore/unoframe.cxx | 4
sw/source/core/unocore/unoobj.cxx | 6
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unoparagraph.cxx | 2
sw/source/core/unocore/unostyle.cxx | 24 +-
sw/source/core/unocore/unotbl.cxx | 8
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/html/css1atr.cxx | 34 +-
sw/source/filter/html/htmlatr.cxx | 18 -
sw/source/filter/html/htmlcss1.cxx | 58 ++--
sw/source/filter/html/htmldraw.cxx | 8
sw/source/filter/html/htmlfly.cxx | 22 -
sw/source/filter/html/htmlform.cxx | 20 -
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlplug.cxx | 4
sw/source/filter/html/htmlsect.cxx | 14 -
sw/source/filter/html/htmltab.cxx | 16 -
sw/source/filter/html/htmltabw.cxx | 6
sw/source/filter/html/svxcss1.cxx | 84 +++----
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/html/wrthtml.cxx | 12 -
sw/source/filter/writer/wrtswtbl.cxx | 10
sw/source/filter/ww1/fltshell.cxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/rtfexport.cxx | 8
sw/source/filter/ww8/wrtw8nds.cxx | 4
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/xml/xmlfmt.cxx | 2
sw/source/filter/xml/xmlfmte.cxx | 4
sw/source/filter/xml/xmlimpit.cxx | 4
sw/source/filter/xml/xmliteme.cxx | 2
sw/source/filter/xml/xmlitemi.cxx | 6
sw/source/filter/xml/xmltble.cxx | 32 +-
sw/source/filter/xml/xmltbli.cxx | 8
sw/source/ui/app/apphdl.cxx | 6
sw/source/ui/app/appopt.cxx | 22 -
sw/source/ui/app/docsh.cxx | 12 -
sw/source/ui/app/docsh2.cxx | 10
sw/source/ui/app/docshini.cxx | 2
sw/source/ui/app/docst.cxx | 22 -
sw/source/ui/app/docstyle.cxx | 16 -
sw/source/ui/chrdlg/chardlg.cxx | 6
sw/source/ui/chrdlg/numpara.cxx | 2
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 10
sw/source/ui/config/optpage.cxx | 46 +--
sw/source/ui/dbui/dbinsdlg.cxx | 4
sw/source/ui/dialog/macassgn.cxx | 2
sw/source/ui/dialog/regionsw.cxx | 24 +-
sw/source/ui/dialog/uiregionsw.cxx | 20 -
sw/source/ui/docvw/HeaderFooterWin.cxx | 8
sw/source/ui/docvw/edtwin.cxx | 4
sw/source/ui/envelp/envfmt.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 4
sw/source/ui/frmdlg/colex.cxx | 18 -
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/frmmgr.cxx | 6
sw/source/ui/frmdlg/frmpage.cxx | 22 -
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/glshell.cxx | 2
sw/source/ui/misc/num.cxx | 4
sw/source/ui/misc/pgfnote.cxx | 6
sw/source/ui/misc/pggrid.cxx | 4
sw/source/ui/misc/titlepage.cxx | 2
sw/source/ui/shells/annotsh.cxx | 22 -
sw/source/ui/shells/basesh.cxx | 24 +-
sw/source/ui/shells/beziersh.cxx | 2
sw/source/ui/shells/drawsh.cxx | 2
sw/source/ui/shells/drformsh.cxx | 2
sw/source/ui/shells/drwbassh.cxx | 26 +-
sw/source/ui/shells/drwtxtex.cxx | 10
sw/source/ui/shells/drwtxtsh.cxx | 8
sw/source/ui/shells/frmsh.cxx | 32 +-
sw/source/ui/shells/grfsh.cxx | 14 -
sw/source/ui/shells/langhelper.cxx | 2
sw/source/ui/shells/mediash.cxx | 2
sw/source/ui/shells/navsh.cxx | 2
sw/source/ui/shells/tabsh.cxx | 36 +--
sw/source/ui/shells/textfld.cxx | 26 +-
sw/source/ui/shells/textglos.cxx | 8
sw/source/ui/shells/textidx.cxx | 2
sw/source/ui/shells/textsh.cxx | 20 -
sw/source/ui/shells/textsh1.cxx | 26 +-
sw/source/ui/shells/textsh2.cxx | 16 -
sw/source/ui/shells/txtattr.cxx | 16 -
sw/source/ui/shells/txtcrsr.cxx | 4
sw/source/ui/shells/txtnum.cxx | 4
sw/source/ui/table/tabledlg.cxx | 28 +-
sw/source/ui/uiview/formatclipboard.cxx | 30 +-
sw/source/ui/uiview/pview.cxx | 12 -
sw/source/ui/uiview/srcview.cxx | 2
sw/source/ui/uiview/view.cxx | 6
sw/source/ui/uiview/view0.cxx | 2
sw/source/ui/uiview/view2.cxx | 52 ++--
sw/source/ui/uiview/viewcoll.cxx | 2
sw/source/ui/uiview/viewdlg.cxx | 2
sw/source/ui/uiview/viewdraw.cxx | 2
sw/source/ui/uiview/viewprt.cxx | 2
sw/source/ui/uiview/viewsrch.cxx | 2
sw/source/ui/uiview/viewstat.cxx | 2
sw/source/ui/uiview/viewtab.cxx | 2
sw/source/ui/utlui/numfmtlb.cxx | 4
sw/source/ui/utlui/uitool.cxx | 34 +-
415 files changed, 2174 insertions(+), 2174 deletions(-)
New commits:
commit 12f1faf7bf7b236f54f740a9f65646749fc266ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Feb 19 21:49:02 2014 +0100
svl: sal_Bool -> bool
Change-Id: Ic31455a1f5ffffa35d4fdde901dd70734207b6f4
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index bb9569b..cbbe3ca 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -650,7 +650,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewMethod->pMod = this;
pNewMethod->SetParent( this );
pMethods->PutDirect( pNewMethod, i );
- StartListening( pNewMethod->GetBroadcaster(), sal_True );
+ StartListening( pNewMethod->GetBroadcaster(), true );
}
}
}
@@ -702,7 +702,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
pProcedureProp->SetFlags( nFlags_ );
pProps->PutDirect( pNewProp, i );
- StartListening( pNewProp->GetBroadcaster(), sal_True );
+ StartListening( pNewProp->GetBroadcaster(), true );
}
else
{
@@ -1091,7 +1091,7 @@ void StarBASIC::Insert( SbxVariable* pVar )
{
pModules->Insert( pVar, pModules->Count() );
pVar->SetParent( this );
- StartListening( pVar->GetBroadcaster(), sal_True );
+ StartListening( pVar->GetBroadcaster(), true );
}
else
{
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 15d869f..8857404 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3546,7 +3546,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType )
// Take us out as listener at once,
// the values are all constant
if( pRes->IsBroadcaster() )
- EndListening( pRes->GetBroadcaster(), sal_True );
+ EndListening( pRes->GetBroadcaster(), true );
}
}
return pRes;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0e90a25..b840f23 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -575,7 +575,7 @@ SbMethod* SbModule::GetMethod( const OUString& rName, SbxDataType t )
pMeth->SetParent( this );
pMeth->SetFlags( SBX_READ );
pMethods->Put( pMeth, pMethods->Count() );
- StartListening( pMeth->GetBroadcaster(), sal_True );
+ StartListening( pMeth->GetBroadcaster(), true );
}
// The method is per default valid, because it could be
// created from the compiler (code generator) as well.
@@ -607,7 +607,7 @@ SbProperty* SbModule::GetProperty( const OUString& rName, SbxDataType t )
pProp->SetFlag( SBX_READWRITE );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), sal_True );
+ StartListening( pProp->GetBroadcaster(), true );
}
return pProp;
}
@@ -626,7 +626,7 @@ SbProcedureProperty* SbModule::GetProcedureProperty( const OUString& rName, SbxD
pProp->SetFlag( SBX_READWRITE );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), sal_True );
+ StartListening( pProp->GetBroadcaster(), true );
}
return pProp;
}
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 267a252..13cd646 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -48,7 +48,7 @@ SbxCollection::SbxCollection( const OUString& rClass )
}
Initialize();
// For Access on itself
- StartListening( GetBroadcaster(), sal_True );
+ StartListening( GetBroadcaster(), true );
}
SbxCollection::SbxCollection( const SbxCollection& rColl )
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 135fcc4..803efaf 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -84,7 +84,7 @@ static void CheckParentsOnDelete( SbxObject* pObj, SbxArray* p )
SbxVariableRef& rRef = p->GetRef( i );
if( rRef->IsBroadcaster() )
{
- pObj->EndListening( rRef->GetBroadcaster(), sal_True );
+ pObj->EndListening( rRef->GetBroadcaster(), true );
}
// does the element have more then one reference and still a Listener?
if( rRef->GetRefCount() > 1 )
@@ -419,7 +419,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp
pArray->Put( pVar, pArray->Count() );
SetModified( sal_True );
// The object listen always
- StartListening( pVar->GetBroadcaster(), sal_True );
+ StartListening( pVar->GetBroadcaster(), true );
Broadcast( SBX_HINT_OBJECTCHANGED );
return pVar;
}
@@ -443,7 +443,7 @@ SbxObject* SbxObject::MakeObject( const OUString& rName, const OUString& rClass
pObjs->Put( pVar, pObjs->Count() );
SetModified( sal_True );
// The object listen always
- StartListening( pVar->GetBroadcaster(), sal_True );
+ StartListening( pVar->GetBroadcaster(), true );
Broadcast( SBX_HINT_OBJECTCHANGED );
}
return pVar;
@@ -472,7 +472,7 @@ void SbxObject::Insert( SbxVariable* pVar )
{
return;
}
- EndListening( pOld->GetBroadcaster(), sal_True );
+ EndListening( pOld->GetBroadcaster(), true );
if( pVar->GetClass() == SbxCLASS_PROPERTY )
{
if( pOld == pDfltProp )
@@ -482,7 +482,7 @@ void SbxObject::Insert( SbxVariable* pVar )
}
}
}
- StartListening( pVar->GetBroadcaster(), sal_True );
+ StartListening( pVar->GetBroadcaster(), true );
pArray->Put( pVar, nIdx );
if( pVar->GetParent() != this )
{
@@ -526,7 +526,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
}
if( pArray )
{
- StartListening( pVar->GetBroadcaster(), sal_True );
+ StartListening( pVar->GetBroadcaster(), true );
pArray->Put( pVar, pArray->Count() );
if( pVar->GetParent() != this )
{
@@ -576,7 +576,7 @@ void SbxObject::Remove( SbxVariable* pVar )
SbxVariableRef pVar_ = pArray->Get( nIdx );
if( pVar_->IsBroadcaster() )
{
- EndListening( pVar_->GetBroadcaster(), sal_True );
+ EndListening( pVar_->GetBroadcaster(), true );
}
if( (SbxVariable*) pVar_ == pDfltProp )
{
@@ -606,7 +606,7 @@ static bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
if( pVar )
{
pVar->SetParent( pThis );
- pThis->StartListening( pVar->GetBroadcaster(), sal_True );
+ pThis->StartListening( pVar->GetBroadcaster(), true );
}
}
pArray->Merge( p );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 4fe9a07..caf17e6 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -51,7 +51,7 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueW
{
bool bSet = false;
const SfxPoolItem *pItem1 = NULL;
- if( rSet.GetItemState( nValueWhich, sal_True, &pItem1 ) == SFX_ITEM_SET )
+ if( rSet.GetItemState( nValueWhich, true, &pItem1 ) == SFX_ITEM_SET )
{
const SfxUInt32Item * pNumItem = dynamic_cast< const SfxUInt32Item * >( pItem1 );
if( pNumItem )
@@ -63,7 +63,7 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueW
rbSourceFormatMixedStateOut=true;
const SfxPoolItem *pItem2 = NULL;
- if( rSet.GetItemState( nSourceFormatWhich, sal_True, &pItem2 ) == SFX_ITEM_SET )
+ if( rSet.GetItemState( nSourceFormatWhich, true, &pItem2 ) == SFX_ITEM_SET )
{
const SfxBoolItem * pBoolItem = dynamic_cast< const SfxBoolItem * >( pItem2 );
if( pBoolItem )
@@ -80,7 +80,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId,
rCheckbox.EnableTriState( sal_False );
const SfxPoolItem *pPoolItem = NULL;
- if( rInAttrs.GetItemState(nWhichId, sal_True, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(nWhichId, true, &pPoolItem) == SFX_ITEM_SET )
rCheckbox.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() );
else
{
@@ -141,7 +141,7 @@ DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, Window* pPa
::com::sun::star::uno::Sequence < sal_Int32 > aAvailabelPlacementList;
const SfxPoolItem *pPoolItem = NULL;
- if( rInAttrs.GetItemState(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, sal_True, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, true, &pPoolItem) == SFX_ITEM_SET )
aAvailabelPlacementList =((const SfxIntegerListItem*)pPoolItem)->GetConstSequence();
m_pLB_LabelPlacement->Clear();
@@ -166,7 +166,7 @@ DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, Window* pPa
m_bNumberFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, m_nNumberFormatForValue, m_bSourceFormatForValue, m_bSourceFormatMixedState );
m_bPercentFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_nNumberFormatForPercent, m_bSourceFormatForPercent , m_bPercentSourceMixedState);
- if( rInAttrs.GetItemState(SCHATTR_DATADESCR_NO_PERCENTVALUE, sal_True, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_NO_PERCENTVALUE, true, &pPoolItem) == SFX_ITEM_SET )
{
bool bForbidPercentValue = (static_cast< const SfxBoolItem & >( rInAttrs.Get( SCHATTR_DATADESCR_NO_PERCENTVALUE )).GetValue() );
if( bForbidPercentValue )
@@ -335,7 +335,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
m_bPercentFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_nNumberFormatForPercent, m_bSourceFormatForPercent , m_bPercentSourceMixedState);
const SfxPoolItem *pPoolItem = NULL;
- if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SEPARATOR, sal_True, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SEPARATOR, true, &pPoolItem) == SFX_ITEM_SET )
for(sal_Int32 i=0; i < NUMBER_SEPARATORS; ++i )
{
if( m_aEntryMap[i] == ((const SfxStringItem*)pPoolItem)->GetValue())
@@ -345,7 +345,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
m_pLB_Separator->SelectEntryPos( 0 );
- if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, sal_True, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, true, &pPoolItem) == SFX_ITEM_SET )
{
sal_Int32 nPlacement = ((const SfxInt32Item*)pPoolItem)->GetValue();
::std::map< sal_Int32, sal_uInt16 >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) );
@@ -360,10 +360,10 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
else
m_pLB_LabelPlacement->SetNoSelection();
- if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
m_pLB_TextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
- if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_Int32 nDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
m_pDC_Dial->SetRotation( nDegrees );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index b5a8650..ec3c63a 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -488,7 +488,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
// category
m_eErrorKind = CHERROR_NONE;
- aState = rInAttrs.GetItemState( SCHATTR_STAT_KIND_ERROR, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_STAT_KIND_ERROR, true, &pPoolItem );
m_bErrorKindUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
@@ -529,7 +529,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
}
// parameters
- aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, true, &pPoolItem );
m_bPlusUnique = ( aState != SFX_ITEM_DONTCARE );
double fPlusValue = 0.0;
if( aState == SFX_ITEM_SET )
@@ -539,7 +539,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
m_pMfPositive->SetValue( nPlusValue );
}
- aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, true, &pPoolItem );
m_bMinusUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
@@ -553,7 +553,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
}
// indicator
- aState = rInAttrs.GetItemState( SCHATTR_STAT_INDICATE, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_STAT_INDICATE, true, &pPoolItem );
m_bIndicatorUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET)
m_eIndicate = ((const SvxChartIndicateItem * ) pPoolItem)->GetValue();
@@ -582,7 +582,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
}
// ranges
- aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_POS, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_POS, true, &pPoolItem );
m_bRangePosUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
@@ -590,7 +590,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
m_pEdRangePositive->SetText( sRangePositive );
}
- aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_NEG, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_NEG, true, &pPoolItem );
m_bRangeNegUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index fb05a6a..12d4b62 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -182,7 +182,7 @@ IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl)
void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs )
{
const SfxPoolItem* pPoolItem = NULL;
- if( rInAttrs.GetItemState( SCHATTR_LEGEND_POS, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_Int32 nLegendPosition = ((const SfxInt32Item*)pPoolItem)->GetValue();
switch( nLegendPosition )
@@ -204,7 +204,7 @@ void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs )
}
}
- if( m_pCbxShow && rInAttrs.GetItemState( SCHATTR_LEGEND_SHOW, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( m_pCbxShow && rInAttrs.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem ) == SFX_ITEM_SET )
{
bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCbxShow->Check(bShow);
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 91552e4..108ae3b 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -113,7 +113,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
{
const SfxPoolItem *pPoolItem = NULL;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_CURVE_NAME, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_CURVE_NAME, true, &pPoolItem ) == SFX_ITEM_SET )
{
OUString aName = static_cast< const SfxStringItem* >(pPoolItem)->GetValue();
m_pEE_Name->SetText(aName);
@@ -123,7 +123,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_pEE_Name->SetText("");
}
- SfxItemState aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_TYPE, sal_True, &pPoolItem );
+ SfxItemState aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem );
m_bTrendLineUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
@@ -134,7 +134,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
}
}
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_DEGREE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_DEGREE, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_Int32 nDegree = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
m_pNF_Degree->SetValue( nDegree );
@@ -144,7 +144,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_pNF_Degree->SetValue( 2 );
}
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_PERIOD, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_PERIOD, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_Int32 nPeriod = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
m_pNF_Period->SetValue( nPeriod );
@@ -155,27 +155,27 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
}
double nValue = 0.0;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, true, &pPoolItem ) == SFX_ITEM_SET )
{
nValue = ((const SvxDoubleItem*)pPoolItem)->GetValue() ;
}
lcl_setValue( *m_pFmtFld_ExtrapolateForward, nValue );
nValue = 0.0;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, true, &pPoolItem ) == SFX_ITEM_SET )
{
nValue = ((const SvxDoubleItem*)pPoolItem)->GetValue() ;
}
lcl_setValue( *m_pFmtFld_ExtrapolateBackward, nValue );
nValue = 0.0;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_INTERCEPT_VALUE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_INTERCEPT_VALUE, true, &pPoolItem ) == SFX_ITEM_SET )
{
nValue = ((const SvxDoubleItem*)pPoolItem)->GetValue() ;
}
lcl_setValue( *m_pFmtFld_InterceptValue, nValue );
- aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SET_INTERCEPT, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SET_INTERCEPT, true, &pPoolItem );
if( aState == SFX_ITEM_DONTCARE )
{
m_pCB_SetIntercept->EnableTriState( sal_True );
@@ -188,7 +188,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_pCB_SetIntercept->Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue());
}
- aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, true, &pPoolItem );
if( aState == SFX_ITEM_DONTCARE )
{
m_pCB_ShowEquation->EnableTriState( sal_True );
@@ -201,7 +201,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_pCB_ShowEquation->Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue());
}
- aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, sal_True, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, true, &pPoolItem );
if( aState == SFX_ITEM_DONTCARE )
{
m_pCB_ShowCorrelationCoeff->EnableTriState( sal_True );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 582660e..f6619c0 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -143,7 +143,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
const SfxPoolItem* pPoolItem = NULL;
// show description
- SfxItemState aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, sal_False, &pPoolItem );
+ SfxItemState aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem );
if( aState == SFX_ITEM_DONTCARE )
{
m_pCbShowDescription->EnableTriState( sal_True );
@@ -165,7 +165,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
// check new degree item
m_nInitialDegrees = 0;
- aState = rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, sal_False, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, false, &pPoolItem );
if( aState == SFX_ITEM_SET )
m_nInitialDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
@@ -177,7 +177,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
// check stacked item
m_bInitialStacking = false;
- aState = rInAttrs.GetItemState( SCHATTR_TEXT_STACKED, sal_False, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_TEXT_STACKED, false, &pPoolItem );
if( aState == SFX_ITEM_SET )
m_bInitialStacking = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
@@ -187,11 +187,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
else
m_pOrientHlp->SetStackedState( STATE_DONTKNOW );
- if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
// Text overlap ----------
- aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, sal_False, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem );
if( aState == SFX_ITEM_DONTCARE )
{
m_pCbTextOverlap->EnableTriState( sal_True );
@@ -210,7 +210,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
}
// text break ----------
- aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, sal_False, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem );
if( aState == SFX_ITEM_DONTCARE )
{
m_pCbTextBreak->EnableTriState( sal_True );
@@ -235,7 +235,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
// text order ----------
if( m_bShowStaggeringControls )
{
- aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, sal_False, &pPoolItem );
+ aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, false, &pPoolItem );
if( aState == SFX_ITEM_SET )
{
SvxChartTextOrder eOrder = static_cast< const SvxChartTextOrderItem * >( pPoolItem )->GetValue();
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 1aa2d38..b087aaf 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -168,7 +168,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
const SfxPoolItem *pPoolItem = NULL;
//axis line
- if(rInAttrs.GetItemState(SCHATTR_AXIS_POSITION,sal_True, &pPoolItem)== SFX_ITEM_SET)
+ if(rInAttrs.GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)== SFX_ITEM_SET)
{
bool bZero = false;
sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
@@ -185,7 +185,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
m_pLB_CrossesAt->SelectEntryPos( nPos );
CrossesAtSelectHdl( (void*)0 );
- if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,sal_True, &pPoolItem)== SFX_ITEM_SET || bZero )
+ if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SFX_ITEM_SET || bZero )
{
double fCrossover = 0.0;
if( !bZero )
@@ -208,7 +208,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
}
// Labels
- if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, sal_False, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
{
sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
if( nPos < m_pLB_PlaceLabels->GetEntryCount() )
@@ -220,9 +220,9 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
// Tick marks
long nTicks=0,nMinorTicks=0;
- if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,sal_True, &pPoolItem)== SFX_ITEM_SET)
+ if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET)
nTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
- if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,sal_True, &pPoolItem)== SFX_ITEM_SET)
+ if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET)
nMinorTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
m_pCB_TicksInner->Check(sal_Bool(nTicks&CHAXIS_MARK_INNER));
@@ -231,7 +231,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
m_pCB_MinorOuter->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_OUTER));
// Tick position
- if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, sal_False, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
{
sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
if( nPos < m_pLB_PlaceTicks->GetEntryCount() )
@@ -276,7 +276,7 @@ void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter )
m_pED_CrossesAt->UseInputStringForFormatting();
const SfxPoolItem *pPoolItem = NULL;
- if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_uLong nFmt = (sal_uLong)((const SfxInt32Item*)pPoolItem)->GetValue();
m_pED_CrossesAt->SetFormatKey( nFmt );
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index c3376b0..878eaf9 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -61,7 +61,7 @@ void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
m_aLegendPositionResources.initFromItemSet(rInAttrs);
const SfxPoolItem* pPoolItem = 0;
- if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
}
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 36c8c7c..e78b5ec 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -74,7 +74,7 @@ void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs)
{
const SfxPoolItem *pPoolItem = NULL;
- if (rInAttrs.GetItemState(SCHATTR_STYLE_SHAPE,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) == SFX_ITEM_SET)
{
long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
if(m_pGeometryResources)
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 0bf9fb8..c4f6771 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -74,7 +74,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
{
const SfxPoolItem *pPoolItem = NULL;
- if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) == SFX_ITEM_SET)
{
long nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
m_pAngleDial->SetRotation( nTmp*100 );
@@ -83,7 +83,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
{
m_pFL_StartingAngle->Show(false);
}
- if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET)
{
sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCB_Clockwise->Check(bCheck);
@@ -92,7 +92,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
{
m_pCB_Clockwise->Show(false);
}
- if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET)
{
bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
m_pCB_IncludeHiddenCells->Check(bVal);
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 13ba028..0da4722 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -288,17 +288,17 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
return;
const SfxPoolItem *pPoolItem = NULL;
- if (rInAttrs.GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET)
m_bAllowDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
m_nAxisType=chart2::AxisType::REALNUMBER;
- if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) == SFX_ITEM_SET)
m_nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue();
if( m_nAxisType==chart2::AxisType::DATE && !m_bAllowDateAxis )
m_nAxisType=chart2::AxisType::CATEGORY;
if( m_bAllowDateAxis )
{
bool bAutoDateAxis = false;
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET)
bAutoDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
sal_uInt16 nPos = 0;
@@ -318,66 +318,66 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
m_pCbxAutoOrigin->Check( true );
m_pCbx_AutoTimeResolution->Check( true );
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,sal_True,&pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) == SFX_ITEM_SET)
m_pCbxAutoMin->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) == SFX_ITEM_SET)
{
fMin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldMin, fMin );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbxAutoMax->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) == SFX_ITEM_SET)
{
fMax = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldMax, fMax );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbxAutoStepMain->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET)
{
fStepMain = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldStepMain, fStepMain );
m_pMt_MainDateStep->SetValue( static_cast<sal_Int32>(fStepMain) );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbxAutoStepHelp->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_LOGARITHM,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbxLogarithm->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_REVERSE,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbxReverse->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_HELP,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET)
{
nStepHelp = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pMtStepHelp->SetValue( nStepHelp );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbxAutoOrigin->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET)
{
fOrigin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldOrigin, fOrigin );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET)
m_pCbx_AutoTimeResolution->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET)
{
m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pLB_TimeResolution->SelectEntryPos( m_nTimeResolution );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET)
{
m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pLB_MainTimeUnit->SelectEntryPos( m_nMainTimeUnit );
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET)
{
m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pLB_HelpTimeUnit->SelectEntryPos( m_nHelpTimeUnit );
@@ -530,7 +530,7 @@ void ScaleTabPage::SetNumFormat()
{
const SfxPoolItem *pPoolItem = NULL;
- if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_uLong nFmt = (sal_uLong)((const SfxInt32Item*)pPoolItem)->GetValue();
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index cb9d7e7..010b6e7 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -122,7 +122,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
m_pRbtAxis1->Check(sal_True);
m_pRbtAxis2->Check(sal_False);
- if (rInAttrs.GetItemState(SCHATTR_AXIS,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET)
{
long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
if(nVal==CHART_AXIS_SECONDARY_Y)
@@ -133,30 +133,30 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
}
long nTmp;
- if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) == SFX_ITEM_SET)
{
nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
m_pMTGap->SetValue(nTmp);
}
- if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) == SFX_ITEM_SET)
{
nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
m_pMTOverlap->SetValue(nTmp);
}
- if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET)
{
sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCBConnect->Check(bCheck);
}
- if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem) == SFX_ITEM_SET)
{
m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
m_pCBAxisSideBySide->Disable();
}
- if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem) == SFX_ITEM_SET)
{
// model property is "group bars per axis", UI feature is the other way
// round: "show bars side by side"
@@ -171,10 +171,10 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
//missing value treatment
{
::com::sun::star::uno::Sequence < sal_Int32 > aMissingValueTreatments;
- if( rInAttrs.GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, sal_True, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, true, &pPoolItem) == SFX_ITEM_SET )
aMissingValueTreatments =((const SfxIntegerListItem*)pPoolItem)->GetConstSequence();
- if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) == SFX_ITEM_SET)
{
m_pRB_DontPaint->Enable(false);
m_pRB_AssumeZero->Enable(false);
@@ -206,7 +206,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
}
// Include hidden cells
- if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET)
{
bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
m_pCBIncludeHiddenCells->Check(bVal);
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 3571297..08823d6 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -99,7 +99,7 @@ void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
bool bStacked = pItem && ((const SfxBoolItem*)pItem)->GetValue();
m_pOrientHlp->SetStackedState( bStacked ? STATE_CHECK : STATE_NOCHECK );
- if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, sal_True, &pItem) == SFX_ITEM_SET)
+ if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pItem) == SFX_ITEM_SET)
m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) );
}
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 7839993..6c35654 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -187,7 +187,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
while( pItem )
{
- if( rItemSet.GetItemState( pItem->Which(), sal_False ) == SFX_ITEM_SET )
+ if( rItemSet.GetItemState( pItem->Which(), false ) == SFX_ITEM_SET )
{
if( GetItemProperty( pItem->Which(), aProperty ))
{
@@ -236,8 +236,8 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem
while (nWhich)
{
- if ((rSourceSet.GetItemState(nWhich, sal_True, &pPoolItem) == SFX_ITEM_SET) &&
- (rDestSet.GetItemState(nWhich, sal_True, &pPoolItem) == SFX_ITEM_SET))
+ if ((rSourceSet.GetItemState(nWhich, true, &pPoolItem) == SFX_ITEM_SET) &&
+ (rDestSet.GetItemState(nWhich, true, &pPoolItem) == SFX_ITEM_SET))
{
if (rSourceSet.Get(nWhich) != rDestSet.Get(nWhich))
{
@@ -247,7 +247,7 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem
}
}
}
- else if( rSourceSet.GetItemState(nWhich, sal_True, &pPoolItem) == SFX_ITEM_DONTCARE )
+ else if( rSourceSet.GetItemState(nWhich, true, &pPoolItem) == SFX_ITEM_DONTCARE )
rDestSet.InvalidateItem(nWhich);
nWhich = aIter.NextWhich ();
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index de1246e..d57e698 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -107,7 +107,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
case SCHATTR_LEGEND_SHOW:
{
const SfxPoolItem* pPoolItem = NULL;
- if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem ) == SFX_ITEM_SET )
{
sal_Bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
sal_Bool bWasShown = sal_True;
@@ -124,7 +124,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
case SCHATTR_LEGEND_POS:
{
const SfxPoolItem* pPoolItem = NULL;
- if( rInItemSet.GetItemState( SCHATTR_LEGEND_POS, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( rInItemSet.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem ) == SFX_ITEM_SET )
{
chart2::LegendPosition eNewPos = static_cast<chart2::LegendPosition>(((const SfxInt32Item*)pPoolItem)->GetValue());
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 506be48..3ea3a80 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -148,7 +148,7 @@ uno::Reference< beans::XPropertySet > lcl_getEquationProperties(
{
SvxChartRegress eRegress = CHREGRESS_NONE;
const SfxPoolItem *pPoolItem = NULL;
- if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem ) == SFX_ITEM_SET )
{
eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem )->GetValue();
bEquationExists = ( eRegress != CHREGRESS_NONE );
@@ -179,7 +179,7 @@ uno::Reference< beans::XPropertySet > lcl_getCurveProperties(
{
SvxChartRegress eRegress = CHREGRESS_NONE;
const SfxPoolItem *pPoolItem = NULL;
- if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
+ if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem ) == SFX_ITEM_SET )
{
eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem )->GetValue();
bExists = ( eRegress != CHREGRESS_NONE );
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 2af88ba..e77fa95 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -58,16 +58,16 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang
const SfxPoolItem* pPoolItem=NULL;
//read position
- if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem))
+ if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_X,true,&pPoolItem))
nPosX=((const SfxInt32Item*)pPoolItem)->GetValue();
- if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem))
+ if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_Y,true,&pPoolItem))
nPosY=((const SfxInt32Item*)pPoolItem)->GetValue();
//read size
- if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem))
+ if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_WIDTH,true,&pPoolItem))
nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
- if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem))
+ if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,true,&pPoolItem))
nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
- if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_SIZE_POINT,sal_True,&pPoolItem))
+ if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_SIZE_POINT,true,&pPoolItem))
eRP=(RECT_POINT)((const SfxAllEnumItem*)pPoolItem)->GetValue();
switch( eRP )
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index a1028dd..08939aa 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -178,7 +178,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
const SfxItemSet* pSet = pDlg->GetOutputItemSet();
const SfxPoolItem* pItem=0;
OUString aString;
- if ( pSet && pSet->GetItemState( SID_CHARMAP, sal_True, &pItem) == SFX_ITEM_SET &&
+ if ( pSet && pSet->GetItemState( SID_CHARMAP, true, &pItem) == SFX_ITEM_SET &&
pItem->ISA(SfxStringItem) )
aString = dynamic_cast<const SfxStringItem*>(pItem)->GetValue();
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index df3c474..4199a75 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1444,7 +1444,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
RadioHdl(0);
const SfxPoolItem* pMacroItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, sal_True, &pMacroItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, true, &pMacroItem ) )
{
m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem );
pGroupLBox->SelectMacro( m_pMacroInfoItem );
@@ -1452,11 +1452,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
else
{
const SfxPoolItem* pStringItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, sal_True, &pStringItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, true, &pStringItem ) )
m_pStringItem = PTR_CAST( SfxStringItem, pStringItem );
const SfxPoolItem* pFontItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, sal_True, &pFontItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) )
m_pFontItem = PTR_CAST( SfxStringItem, pFontItem );
}
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 44acf93..e819809 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -62,7 +62,7 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet )
, bIDEDialogMode(false)
{
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, false, &pItem ) )
bIDEDialogMode = ((const SfxBoolItem*)pItem)->GetValue();
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 5cd21e4..198289f 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -379,7 +379,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
{
const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ))
+ if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem ))
{
pHyperlinkItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() );
}
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index b32599d..e9769ab 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -73,7 +73,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
OUString aAuthorStr, aDateStr;
- if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
bNew = sal_False;
const SvxPostItAuthorItem& rAuthor =
@@ -85,7 +85,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
- if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
const SvxPostItDateItem& rDate =
(const SvxPostItDateItem&)rSet.Get( nWhich );
@@ -100,7 +100,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT );
OUString aTextStr;
- if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
const SvxPostItTextItem& rText =
(const SvxPostItTextItem&)rSet.Get( nWhich );
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 4f2de22..fc36452 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -243,7 +243,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
}
const SfxPoolItem* pViewLayoutItem = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, sal_False, &pViewLayoutItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, false, &pViewLayoutItem ) )
{
const sal_uInt16 nColumns = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->GetValue();
const bool bBookMode = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->IsBookMode();
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index d66a595..1f4a2b2 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -160,7 +160,7 @@ namespace offapp
sal_Bool bNeedCommit = sal_False;
// the global "enabled" flag
- SFX_ITEMSET_GET( _rSourceItems, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, sal_True );
+ SFX_ITEMSET_GET( _rSourceItems, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true );
if (pEnabled)
{
sal_Bool bEnabled = pEnabled->GetValue();
@@ -169,7 +169,7 @@ namespace offapp
}
// the settings for the single drivers
- SFX_ITEMSET_GET( _rSourceItems, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, sal_True );
+ SFX_ITEMSET_GET( _rSourceItems, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, true );
if (pDriverSettings)
{
OConfigurationNode aDriverSettings = aConnectionPoolRoot.openNode(getDriverSettingsNodeName());
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 988ddd8..d58d38d 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -350,14 +350,14 @@ namespace offapp
void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bFromReset*/)
{
// the enabled flag
- SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, sal_True );
+ SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true );
OSL_ENSURE(pEnabled, "ConnectionPoolOptionsPage::implInitControls: missing the Enabled item!");
m_pEnablePooling->Check(pEnabled ? pEnabled->GetValue() : sal_True);
m_pEnablePooling->SaveValue();
// the settings for the single drivers
- SFX_ITEMSET_GET( _rSet, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, sal_True );
+ SFX_ITEMSET_GET( _rSet, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, true );
if (pDriverSettings)
m_pDriverList->Update(pDriverSettings->getSettings());
else
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 5ea23ef..4ec978d 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -213,7 +213,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
{
// the settings for the single drivers
- SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, sal_True );
+ SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true );
if ( !pRegistrations )
return;
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 8ecfa8d..b802ad9 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -77,7 +77,7 @@ namespace svx
void DbRegisteredNamesConfig::SetOptions(const SfxItemSet& _rSourceItems)
{
// the settings for the single drivers
- SFX_ITEMSET_GET( _rSourceItems, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, sal_True );
+ SFX_ITEMSET_GET( _rSourceItems, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true );
if ( !pRegistrations )
return;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 313c7e1..a9f5ff8 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -66,7 +66,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet
pColorList = XColorList::CreateStdColorList();
const SfxPoolItem* pItem = NULL;
- if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET )
+ if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) == SFX_ITEM_SET )
{
pColorConfig = (static_cast< SvxChartColorTableItem* >(pItem->Clone()) );
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 45e0d32..682469f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -316,7 +316,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
m_pDocStatusCB->SaveValue();
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
{
m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() );
TwoFigureConfigHdl(m_pYearValueField);
@@ -1517,21 +1517,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
m_pCurrentDocCB->Enable(true);
m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl);
const SfxPoolItem* pLang;
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, sal_False, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang)
eCurLang = eTempCurLang;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang)
eCurLangCJK = eTempCurLang;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang)
@@ -1576,7 +1576,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
// check the box "For the current document only"
// set the focus to the Western Language box
const SfxPoolItem* pLang = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
+ if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
{
m_pWesternLanguageLB->GrabFocus();
m_pCurrentDocCB->Enable(true);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 16b891b..f6e2be5 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1153,7 +1153,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
const SfxSpellCheckItem* pItem = 0;
SfxItemState eItemState = rSet.GetItemState( GetWhich( SID_ATTR_SPELL ),
- sal_False, (const SfxPoolItem**)&pItem );
+ false, (const SfxPoolItem**)&pItem );
// is it about a default-item?
if ( eItemState == SFX_ITEM_DEFAULT )
@@ -1512,7 +1512,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
const SfxHyphenRegionItem *pHyp = NULL;
sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION );
- if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) );
pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND );
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 3eca0b5..e912183 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -239,7 +239,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
(officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::
get())));
- SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, sal_False, &pItem );
+ SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem );
if ( SFX_ITEM_SET == eState )
m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() );
else if ( SFX_ITEM_DISABLED == eState )
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b3089e5..13dc1e8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1370,7 +1370,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
// evaluate Year2000
// -------------------------------------------------------------------------
sal_uInt16 nY2K = USHRT_MAX;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
nY2K = ((const SfxUInt16Item*)pItem)->GetValue();
if( USHRT_MAX != nY2K )
{
@@ -1385,10 +1385,10 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
// -------------------------------------------------------------------------
// evaluate print
// -------------------------------------------------------------------------
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem))
aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, false, &pItem))
{
const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem;
aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE ));
@@ -1435,13 +1435,13 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
sal_Bool bSaveSpellCheck = sal_False;
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) )
{
bSaveSpellCheck = ( (const SfxBoolItem*)pItem )->GetValue();
}
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< XLinguProperties > xProp = LinguProperties::create( xContext );
- if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, false, &pItem ) )
{
const SfxHyphenRegionItem* pHyphenItem = (const SfxHyphenRegionItem*)pItem;
@@ -1455,23 +1455,23 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
pItem = 0;
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = sal_True;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = sal_True;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = sal_True;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, sal_False, &pItem ))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false, &pItem ))
{
sal_Bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue();
pDispatch->Execute(SID_AUTOSPELL_CHECK,
@@ -1488,7 +1488,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
}
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, sal_False, &pItem ))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, false, &pItem ))
{
SfxViewFrame* _pViewFrame = SfxViewFrame::GetFirst();
while ( _pViewFrame )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7e07163..f033a6d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -116,7 +116,7 @@ void lcl_MaybeResetAlignToDistro(
ListBox& rLB, sal_uInt16 nListPos, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichAlign, sal_uInt16 nWhichJM, _JustEnumType eBlock)
{
const SfxPoolItem* pItem;
- if (rCoreAttrs.GetItemState(nWhichAlign, sal_True, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichAlign, true, &pItem) != SFX_ITEM_SET)
// alignment not set.
return;
@@ -126,7 +126,7 @@ void lcl_MaybeResetAlignToDistro(
// alignment is not 'justify'. No need to go further.
return;
- if (rCoreAttrs.GetItemState(nWhichJM, sal_True, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichJM, true, &pItem) != SFX_ITEM_SET)
// justification method is not set.
return;
@@ -391,13 +391,13 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n
const SfxPoolItem* pItem;
SvxCellJustifyMethod eMethodOld = SVX_JUSTIFY_METHOD_AUTO;
SvxCellJustifyMethod eMethodNew = SVX_JUSTIFY_METHOD_AUTO;
- if (rOld.GetItemState(nWhich, sal_True, &pItem) == SFX_ITEM_SET)
+ if (rOld.GetItemState(nWhich, true, &pItem) == SFX_ITEM_SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
}
- if (rNew.GetItemState(nWhich, sal_True, &pItem) == SFX_ITEM_SET)
+ if (rNew.GetItemState(nWhich, true, &pItem) == SFX_ITEM_SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodNew = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index d7c5439..c7d9c9a 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -416,7 +416,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_HTML_MODE, sal_False, &pItem )
+ if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_HTML_MODE, false, &pItem )
|| ( 0 != ( pShell = SfxObjectShell::Current()) &&
0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
@@ -489,7 +489,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
// but it must be existing in the rSet!
// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), sal_False))
+ if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
{
ResetFromWallpaperItem( rSet );
return;
@@ -510,7 +510,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
sal_uInt16 nDestValue = USHRT_MAX;
if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION,
- sal_False, &pItem ) )
+ false, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
m_pTblLBox->SelectEntryPos(nDestValue);
@@ -529,7 +529,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
}
}
else if( SFX_ITEM_SET == rSet.GetItemState(
- SID_PARA_BACKGRND_DESTINATION, sal_False, &pItem ) )
+ SID_PARA_BACKGRND_DESTINATION, false, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
// character activated?
@@ -556,7 +556,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
nDestValue = 0;
sal_uInt16 nWhich = GetWhich( nSlot );
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
m_pBtnTile->Check();
@@ -597,21 +597,21 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
pTableBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nCellWhich = nWhich;
- if ( rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( SID_ATTR_BRUSH_ROW, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_ROW ) );
pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nRowWhich = SID_ATTR_BRUSH_ROW;
- if ( rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_TABLE ) );
pTableBck_Impl->pTableBrush = new SvxBrushItem(*pBgdAttr);
@@ -636,16 +636,16 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
pParaBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr);
}
nWhich = GetWhich( SID_ATTR_BRUSH_CHAR );
- rSet.GetItemState( nWhich, sal_True );
- rSet.GetItemState( nWhich, sal_False );
- if ( rSet.GetItemState( nWhich, sal_True ) > SFX_ITEM_AVAILABLE )
+ rSet.GetItemState( nWhich, true );
+ rSet.GetItemState( nWhich, false );
+ if ( rSet.GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
pParaBck_Impl->pCharBrush = new SvxBrushItem(*pBgdAttr);
@@ -673,7 +673,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
sal_uInt16 nWhich = GetWhich( nSlot );
SvxBrushItem* pTemp = 0;
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
{
const CntWallpaperItem* pItem = (const CntWallpaperItem*)&rSet.Get( nWhich );
pTemp = new SvxBrushItem( *pItem, nWhich );
@@ -744,7 +744,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), sal_False))
+ if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC );
sal_Bool bModified = sal_False;
@@ -780,7 +780,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
sal_uInt16 nWhich = GetWhich( nSlot );
const SfxPoolItem* pOld = GetOldItem( rCoreSet, nSlot );
- SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, sal_False);
+ SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, false);
const SfxItemSet& rOldSet = GetItemSet();
sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue());
@@ -813,7 +813,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
bModified = sal_True;
rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
// Handle XFILL_GRADIENT -> XFILL_SOLID
XFillStyleItem aFillStyleItem(XFILL_SOLID, GetWhich(SID_SW_ATTR_FILL_STYLE));
@@ -868,7 +868,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
rCoreSet.Put(aTmpBrush);
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
}
}
@@ -1038,7 +1038,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe
aItem.SetColor( aBgdColor );
rCoreSet.Put( aItem );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
}
else
@@ -1060,7 +1060,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe
aItem.SetBitmapURL( aBgdGraphicPath );
rCoreSet.Put( aItem );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 4696e325..ed31b01 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -154,7 +154,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
/* Use SvxMarginItem instead of margins from SvxBoxItem, if present.
-> Remember this state in mbUseMarginItem, because other special handling
is needed across various functions... */
- mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),sal_True) != SFX_ITEM_UNKNOWN;
+ mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),true) != SFX_ITEM_UNKNOWN;
const SfxPoolItem* pItem = NULL;
if (rCoreAttrs.HasItem(SID_ATTR_BORDER_STYLES, &pItem))
@@ -208,7 +208,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
sal_Bool bIsDontCare = sal_True;
- if ( rCoreAttrs.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
// paragraph or table
const SvxBoxInfoItem* pBoxInfo =
@@ -418,7 +418,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
if ( pBoxInfoItem->IsDist() )
{
- if( rSet.GetItemState( nWhichBox, sal_True ) >= SFX_ITEM_DEFAULT )
+ if( rSet.GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT )
{
sal_Bool bIsAnyBorderVisible = m_pFrameSel->IsAnyBorderVisible();
if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist() )
@@ -543,7 +543,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) ||
( 0 != (pShell = SfxObjectShell::Current()) &&
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
@@ -590,7 +590,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
bool bPut = true;
sal_uInt16 nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER );
- sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+ sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, false );
const SfxItemSet& rOldSet = GetItemSet();
SvxBoxItem aBoxItem ( nBoxWhich );
SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich );
@@ -697,11 +697,11 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
//
bPut = true;
- if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, sal_False ))
+ if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, false ))
{
bPut = aBoxItem != (const SvxBoxItem&)(rOldSet.Get(nBoxWhich)) ? sal_True : sal_False;
}
- if( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxInfoWhich, sal_False ) )
+ if( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxInfoWhich, false ) )
{
const SvxBoxInfoItem& rOldBoxInfo = (const SvxBoxInfoItem&)
rOldSet.Get(nBoxInfoWhich);
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index d2b44bb..1053240 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -908,7 +908,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
bChanged = pNameBox->GetSavedValue().isEmpty();
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName() )
bChanged = true;
@@ -917,7 +917,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( aFontItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rSet.ClearItem( nWhich );
@@ -953,7 +953,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
}
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
( (SvxWeightItem*)pItem )->GetValue() != aWeightItem.GetValue() )
bChanged = true;
@@ -967,7 +967,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( aWeightItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -1002,7 +1002,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
}
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() )
bChanged = true;
@@ -1014,7 +1014,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( aPostureItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// FontSize
@@ -1042,7 +1042,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
bChanged = ( nSize != nSavedSize );
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET )
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET )
{
float fSize = (float)nSize / 10;
long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) );
@@ -1074,7 +1074,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
}
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -1105,7 +1105,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( SvxLanguageItem( eLangType, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -1327,7 +1327,7 @@ void SvxCharEffectsPage::Initialize()
// HTML-Mode
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if ( SFX_ITEM_SET == GetItemSet().GetItemState( SID_HTML_MODE, sal_False, &pItem ) ||
+ if ( SFX_ITEM_SET == GetItemSet().GetItemState( SID_HTML_MODE, false, &pItem ) ||
( NULL != ( pShell = SfxObjectShell::Current() ) &&
NULL != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
@@ -1589,7 +1589,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
bChanged = ( m_pFontColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND );
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET &&
( (SvxColorItem*)pItem )->GetValue() != aSelectedColor )
bChanged = sal_True;
@@ -1600,7 +1600,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
rSet.Put( SvxColorItem( aSelectedColor, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -2181,7 +2181,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the underline style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxUnderlineItem& rItem = *( (const SvxUnderlineItem*)pOld );
if ( (FontUnderline)rItem.GetValue() == eUnder &&
@@ -2197,7 +2197,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( aNewItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2215,7 +2215,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the underline style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxOverlineItem& rItem = *( (const SvxOverlineItem*)pOld );
if ( (FontUnderline)rItem.GetValue() == eOver &&
@@ -2231,7 +2231,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( aNewItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2249,7 +2249,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the strikeout style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld );
if ( !m_pStrikeoutLB->IsEnabled()
@@ -2262,7 +2262,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2287,7 +2287,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2323,7 +2323,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2347,7 +2347,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the effect style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld );
if ( (SvxCaseMap)rItem.GetValue() == eCaseMap && !bAllowChg )
@@ -2359,7 +2359,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2387,7 +2387,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxContourItem*)pItem )->GetValue() )
bChanged = true;
@@ -2396,7 +2396,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2413,7 +2413,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxShadowedItem*)pItem )->GetValue() )
bChanged = true;
@@ -2422,7 +2422,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2439,7 +2439,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxBlinkItem*)pItem )->GetValue() )
bChanged = true;
@@ -2448,7 +2448,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// Hidden
@@ -2464,7 +2464,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxCharHiddenItem*)pItem )->GetValue() )
bChanged = true;
@@ -2473,7 +2473,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bModified |= FillItemSetColor_Impl( rSet );
@@ -3164,7 +3164,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = sal_True;
@@ -3203,7 +3203,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxKerningItem( nKerning, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = sal_True;
@@ -3216,7 +3216,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// Scale Width
@@ -3226,7 +3226,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// Rotation
@@ -3244,7 +3244,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( aItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -3490,7 +3490,7 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 8d8ce6f..0c049c4 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -136,7 +136,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
const SfxItemPool& rPool = *rSet.GetPool();
if(SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich(
- SID_ATTR_GRAF_KEEP_ZOOM ), sal_True, &pItem ))
+ SID_ATTR_GRAF_KEEP_ZOOM ), true, &pItem ))
{
if( ((const SfxBoolItem*)pItem)->GetValue() )
m_pZoomConstRB->Check();
@@ -146,7 +146,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
}
sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP );
- if( SFX_ITEM_SET == rSet.GetItemState( nW, sal_True, &pItem))
+ if( SFX_ITEM_SET == rSet.GetItemState( nW, true, &pItem))
{
FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -171,7 +171,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
}
nW = rPool.GetWhich( SID_ATTR_PAGE_SIZE );
- if ( SFX_ITEM_SET == rSet.GetItemState( nW, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( nW, false, &pItem ) )
{
// orientation and size from the PageItem
FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -195,7 +195,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
}
sal_Bool bFound = sal_False;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
{
OUString referer;
SfxStringItem const * it = static_cast<SfxStringItem const *>(
@@ -249,7 +249,7 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
const SfxPoolItem* pItem = 0;
if( pExSet && SFX_ITEM_SET ==
- pExSet->GetItemState( nW, sal_False, &pItem ) )
+ pExSet->GetItemState( nW, false, &pItem ) )
aSz = *(const SvxSizeItem*)pItem;
else
aSz = (const SvxSizeItem&)GetItemSet().Get( nW );
@@ -309,7 +309,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
// Size
Size aSize;
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_FRMSIZE, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_FRMSIZE, false, &pItem ) )
aSize = ((const SvxSizeItem*)pItem)->GetSize();
nOldWidth = aSize.Width();
@@ -345,7 +345,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
m_pHeightMF->SaveValue();
bInitialized = sal_True;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
{
const SvxBrushItem& rBrush = *(SvxBrushItem*)pItem;
if( !rBrush.GetGraphicLink().isEmpty() &&
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e1057ca..e1c9d32 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -178,7 +178,7 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl;
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET != GetItemSet().GetItemState( aItem.Which(), sal_True, &pItem )
+ if( SFX_ITEM_SET != GetItemSet().GetItemState( aItem.Which(), true, &pItem )
|| aItem != *(SvxMacroItem*)pItem )
{
rSet.Put( aItem );
@@ -212,7 +212,7 @@ void _SfxMacroTabPage::ActivatePage( const SfxItemSet& )
void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
{
const SfxPoolItem* pEventsItem;
- if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, sal_True, &pEventsItem ) )
+ if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) )
{
mpImpl->bGotEvents = sal_True;
const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list