avmedia/source/framework/mediatoolbox.cxx | 4
basctl/source/basicide/basicbox.cxx | 4
chart2/source/controller/dialogs/res_DataLabel.cxx | 18
chart2/source/controller/dialogs/res_ErrorBar.cxx | 26 -
chart2/source/controller/dialogs/res_LegendPosition.cxx | 4
chart2/source/controller/dialogs/res_Trendline.cxx | 28 -
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 30 -
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/inc/ItemConverter.hxx | 2
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 8
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 8
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 4
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 4
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 8
chart2/source/controller/main/ChartController_Position.cxx | 10
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
chart2/source/controller/main/DrawCommandDispatch.cxx | 2
cui/source/customize/acccfg.cxx | 6
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/cuihyperdlg.cxx | 2
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/postdlg.cxx | 6
cui/source/dialogs/zoom.cxx | 2
cui/source/options/optchart.cxx | 2
cui/source/options/optgdlg.cxx | 10
cui/source/options/optgenrl.cxx | 2
cui/source/options/optlingu.cxx | 2
cui/source/options/optmemory.cxx | 4
cui/source/options/optpath.cxx | 10
cui/source/options/treeopt.cxx | 30 -
cui/source/tabpages/align.cxx | 8
cui/source/tabpages/backgrnd.cxx | 34 -
cui/source/tabpages/border.cxx | 12
cui/source/tabpages/chardlg.cxx | 246
+++++-----
cui/source/tabpages/grfpage.cxx | 14
cui/source/tabpages/macroass.cxx | 8
cui/source/tabpages/measure.cxx | 16
cui/source/tabpages/numfmt.cxx | 16
cui/source/tabpages/numpages.cxx | 86 +--
cui/source/tabpages/page.cxx | 42 -
cui/source/tabpages/paragrph.cxx | 64 +-
cui/source/tabpages/tabstpge.cxx | 6
cui/source/tabpages/textattr.cxx | 22
cui/source/tabpages/tparea.cxx | 70 +-
cui/source/tabpages/tpbitmap.cxx | 6
cui/source/tabpages/tpcolor.cxx | 4
cui/source/tabpages/tpgradnt.cxx | 4
cui/source/tabpages/tphatch.cxx | 4
cui/source/tabpages/tpline.cxx | 46 -
cui/source/tabpages/tplnedef.cxx | 2
cui/source/tabpages/tpshadow.cxx | 30 -
cui/source/tabpages/transfrm.cxx | 6
desktop/source/app/app.cxx | 2
editeng/source/editeng/editdbg.cxx | 8
editeng/source/editeng/editdoc.cxx | 56 +-
editeng/source/editeng/editobj.cxx | 10
editeng/source/editeng/eertfpar.cxx | 4
editeng/source/editeng/impedit4.cxx | 6
editeng/source/editeng/impedit5.cxx | 18
editeng/source/items/textitem.cxx | 4
editeng/source/outliner/outliner.cxx | 4
editeng/source/outliner/outlvw.cxx | 6
editeng/source/rtf/rtfitem.cxx | 12
editeng/source/rtf/svxrtf.cxx | 14
editeng/source/uno/unofored.cxx | 16
editeng/source/uno/unoipset.cxx | 4
editeng/source/uno/unotext.cxx | 100 ++--
extensions/source/propctrlr/fontdialog.cxx | 20
extensions/source/propctrlr/formcomponenthandler.cxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
forms/source/richtext/rtattributehandler.cxx | 2
include/sfx2/shell.hxx | 2
include/svl/itemset.hxx | 4
include/svl/poolitem.hxx | 14
include/svx/sdr/properties/e3dcompoundproperties.hxx | 2
include/svx/sdr/properties/properties.hxx | 4
reportdesign/source/ui/misc/UITools.cxx | 56 +-
reportdesign/source/ui/misc/statusbarcontroller.cxx | 4
reportdesign/source/ui/misc/toolboxcontroller.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 12
sc/source/core/data/attarray.cxx | 14
sc/source/core/data/column2.cxx | 12
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/documen4.cxx | 4
sc/source/core/data/documen8.cxx | 6
sc/source/core/data/document.cxx | 2
sc/source/core/data/fillinfo.cxx | 16
sc/source/core/data/global.cxx | 10
sc/source/core/data/patattr.cxx | 166
+++---
sc/source/core/data/stlpool.cxx | 12
sc/source/core/data/table2.cxx | 8
sc/source/core/data/table3.cxx | 2
sc/source/core/data/table4.cxx | 4
sc/source/core/data/table5.cxx | 4
sc/source/core/tool/detfunc.cxx | 2
sc/source/core/tool/editutil.cxx | 14
sc/source/core/tool/progress.cxx | 2
sc/source/filter/excel/xehelper.cxx | 4
sc/source/filter/excel/xestyle.cxx | 4
sc/source/filter/excel/xistyle.cxx | 2
sc/source/filter/ftools/ftools.cxx | 2
sc/source/filter/html/htmlexp.cxx | 4
sc/source/filter/oox/numberformatsbuffer.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 34 -
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/ui/app/inputhdl.cxx | 16
sc/source/ui/app/scmod.cxx | 6
sc/source/ui/attrdlg/tabpages.cxx | 6
sc/source/ui/cctrl/tbinsert.cxx | 4
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 4
sc/source/ui/dbgui/tpsubt.cxx | 4
sc/source/ui/dbgui/validate.cxx | 26 -
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/docsh.cxx | 20
sc/source/ui/docshell/docsh4.cxx | 28 -
sc/source/ui/docshell/docsh6.cxx | 6
sc/source/ui/docshell/tablink.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 2
sc/source/ui/drawfunc/drawsh2.cxx | 8
sc/source/ui/drawfunc/drawsh5.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 50 +-
sc/source/ui/drawfunc/fuins1.cxx | 6
sc/source/ui/drawfunc/mediash.cxx | 2
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 2
sc/source/ui/optdlg/tpprint.cxx | 4
sc/source/ui/optdlg/tpview.cxx | 30 -
sc/source/ui/pagedlg/tptable.cxx | 8
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 16
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 24
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 4
sc/source/ui/undo/undocell.cxx | 6
sc/source/ui/unoobj/cellsuno.cxx | 8
sc/source/ui/unoobj/styleuno.cxx | 14
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbafont.cxx | 18
sc/source/ui/vba/vbaformat.cxx | 4
sc/source/ui/vba/vbarange.cxx | 6
sc/source/ui/view/auditsh.cxx | 4
sc/source/ui/view/cellsh.cxx | 2
sc/source/ui/view/cellsh1.cxx | 8
sc/source/ui/view/cellsh2.cxx | 54 +-
sc/source/ui/view/cellsh3.cxx | 10
sc/source/ui/view/editsh.cxx | 18
sc/source/ui/view/formatsh.cxx | 82 +--
sc/source/ui/view/output2.cxx | 26 -
sc/source/ui/view/preview.cxx | 4
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/printfun.cxx | 10
sc/source/ui/view/tabvwsh2.cxx | 6
sc/source/ui/view/tabvwsh3.cxx | 38 -
sc/source/ui/view/tabvwsha.cxx | 8
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/tabvwshe.cxx | 8
sc/source/ui/view/tabvwshh.cxx | 2
sc/source/ui/view/viewfun2.cxx | 6
sc/source/ui/view/viewfunc.cxx | 22
sc/source/ui/view/viewutil.cxx | 6
sd/source/core/sdpage.cxx | 10
sd/source/core/sdpage2.cxx | 2
sd/source/core/stlsheet.cxx | 20
sd/source/filter/grf/sdgrffilter.cxx | 2
sd/source/filter/html/htmlex.cxx | 14
sd/source/filter/html/sdhtmlfilter.cxx | 4
sd/source/filter/ppt/pptin.cxx | 2
sd/source/filter/xml/sdtransform.cxx | 6
sd/source/ui/annotations/annotationmanager.cxx | 14
sd/source/ui/app/sdmod1.cxx | 26 -
sd/source/ui/app/sdmod2.cxx | 20
sd/source/ui/app/tbxww.cxx | 2
sd/source/ui/app/tmplctrl.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 18
sd/source/ui/dlg/diactrl.cxx | 4
sd/source/ui/dlg/dlgfield.cxx | 2
sd/source/ui/dlg/dlgolbul.cxx | 8
sd/source/ui/dlg/gluectrl.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/dlg/paragr.cxx | 4
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/tpaction.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 8
sd/source/ui/docshell/docshel4.cxx | 12
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/func/fubullet.cxx | 16
sd/source/ui/func/fuchar.cxx | 6
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/fucopy.cxx | 20
sd/source/ui/func/fuhhconv.cxx | 4
sd/source/ui/func/fuoaprms.cxx | 32 -
sd/source/ui/func/fuolbull.cxx | 12
sd/source/ui/func/fupage.cxx | 22
sd/source/ui/func/fuparagr.cxx | 4
sd/source/ui/func/fupoor.cxx | 2
sd/source/ui/func/fuprlout.cxx | 16
sd/source/ui/func/futempl.cxx | 32 -
sd/source/ui/func/futext.cxx | 4
sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 12
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 52 +-
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 4
sd/source/ui/unoidl/unopback.cxx | 14
sd/source/ui/view/MediaObjectBar.cxx | 2
sd/source/ui/view/drawview.cxx | 8
sd/source/ui/view/drtxtob.cxx | 4
sd/source/ui/view/drtxtob1.cxx | 4
sd/source/ui/view/drviews2.cxx | 10
sd/source/ui/view/drviews3.cxx | 10
sd/source/ui/view/drviews6.cxx | 16
sd/source/ui/view/drviews7.cxx | 112 ++--
sd/source/ui/view/drviewsa.cxx | 8
sd/source/ui/view/drviewse.cxx | 2
sd/source/ui/view/drviewsf.cxx | 30 -
sd/source/ui/view/drviewsj.cxx | 98 +--
sd/source/ui/view/outlnvsh.cxx | 34 -
sd/source/ui/view/outlview.cxx | 2
sd/source/ui/view/viewshe3.cxx | 10
sd/source/ui/view/viewshel.cxx | 8
sfx2/source/appl/appcfg.cxx | 68 +-
sfx2/source/appl/appserv.cxx | 14
sfx2/source/appl/appuno.cxx | 214
++++----
sfx2/source/control/bindings.cxx | 64 +-
sfx2/source/control/ctrlitem.cxx | 16
sfx2/source/control/dispatch.cxx | 12
sfx2/source/control/querystatus.cxx | 10
sfx2/source/control/request.cxx | 8
sfx2/source/control/sfxstatuslistener.cxx | 6
sfx2/source/control/shell.cxx | 16
sfx2/source/control/statcach.cxx | 10
sfx2/source/control/unoctitm.cxx | 18
sfx2/source/dialog/dinfdlg.cxx | 16
sfx2/source/dialog/itemconnect.cxx | 6
sfx2/source/dialog/mgetempl.cxx | 4
sfx2/source/dialog/securitypage.cxx | 4
sfx2/source/dialog/styledlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/dialog/tplcitem.cxx | 24
sfx2/source/dialog/versdlg.cxx | 2
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/objcont.cxx | 2
sfx2/source/doc/objstor.cxx | 12
sfx2/source/inet/inettbc.cxx | 4
sfx2/source/menu/mnuitem.cxx | 4
sfx2/source/sidebar/ControllerItem.cxx | 2
sfx2/source/statbar/stbitem.cxx | 10
sfx2/source/toolbox/tbxitem.cxx | 50 +-
sfx2/source/view/frame.cxx | 2
sfx2/source/view/viewfrm.cxx | 4
sfx2/source/view/viewfrm2.cxx | 2
starmath/source/accessibility.cxx | 20
starmath/source/config.cxx | 16
starmath/source/document.cxx | 2
starmath/source/view.cxx | 4
svl/source/items/itemprop.cxx | 16
svl/source/items/itemset.cxx | 48 -
svx/inc/sdr/properties/e3dsceneproperties.hxx | 2
svx/inc/sdr/properties/groupproperties.hxx | 2
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4
svx/source/dialog/connctrl.cxx | 2
svx/source/dialog/dlgutil.cxx | 4
svx/source/dialog/fntctrl.cxx | 4
svx/source/dialog/grfflt.cxx | 24
svx/source/dialog/hdft.cxx | 44 -
svx/source/dialog/optgrid.cxx | 6
svx/source/dialog/rlrcitem.cxx | 4
svx/source/dialog/rubydialog.cxx | 4
svx/source/dialog/srchctrl.cxx | 2
svx/source/dialog/srchdlg.cxx | 2
svx/source/engine3d/float3d.cxx | 120 ++--
svx/source/fmcomp/fmgridcl.cxx | 4
svx/source/form/datanavi.cxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/fmPropBrw.cxx | 2
svx/source/form/fmexpl.cxx | 2
svx/source/form/fmshell.cxx | 2
svx/source/form/fmshimp.cxx | 4
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/fmview.cxx | 2
svx/source/form/tabwin.cxx | 2
svx/source/form/tbxform.cxx | 4
svx/source/mnuctrls/SmartTagCtl.cxx | 4
svx/source/mnuctrls/clipboardctl.cxx | 6
svx/source/mnuctrls/fntctl.cxx | 4
svx/source/mnuctrls/fntszctl.cxx | 4
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4
svx/source/sdr/properties/attributeproperties.cxx | 6
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/sdr/properties/textproperties.cxx | 4
svx/source/sidebar/area/AreaPropertyPanel.cxx | 40 -
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 32 -
svx/source/sidebar/line/LinePropertyPanel.cxx | 18
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 4
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 28 -
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 24
svx/source/sidebar/text/TextPropertyPanel.cxx | 8
svx/source/stbctrls/insctrl.cxx | 2
svx/source/stbctrls/modctrl.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 4
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 2
svx/source/stbctrls/zoomsliderctrl.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 78 +--
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdetc.cxx | 2
svx/source/svdraw/svdibrow.cxx | 24
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdobj.cxx | 52 +-
svx/source/svdraw/svdpntv.cxx | 6
svx/source/svdraw/svdtext.cxx | 2
svx/source/svdraw/svdundo.cxx | 4
svx/source/table/cell.cxx | 18
svx/source/table/svdotable.cxx | 4
svx/source/table/tablecontroller.cxx | 36 -
svx/source/table/tablertfimporter.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 2
svx/source/tbxctrls/fillctrl.cxx | 4
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 32 -
svx/source/tbxctrls/layctrl.cxx | 8
svx/source/tbxctrls/lboxctrl.cxx | 6
svx/source/tbxctrls/linectrl.cxx | 12
svx/source/tbxctrls/tbcontrl.cxx | 48 -
svx/source/tbxctrls/tbxdrctl.cxx | 2
svx/source/toolbars/extrusionbar.cxx | 54 +-
svx/source/toolbars/fontworkbar.cxx | 22
svx/source/unodraw/unobrushitemhelper.cxx | 2
svx/source/unodraw/unoshape.cxx | 22
svx/source/xoutdev/xexch.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/attr/format.cxx | 16
sw/source/core/attr/swatrset.cxx | 14
sw/source/core/crsr/crstrvl.cxx | 6
sw/source/core/crsr/findattr.cxx | 24
sw/source/core/crsr/trvltbl.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 38 -
sw/source/core/doc/DocumentFieldsManager.cxx | 2
sw/source/core/doc/dbgoutsw.cxx | 2
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docdesc.cxx | 4
sw/source/core/doc/docedt.cxx | 8
sw/source/core/doc/docfly.cxx | 16
sw/source/core/doc/docfmt.cxx | 20
sw/source/core/doc/doclay.cxx | 26 -
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/docsort.cxx | 18
sw/source/core/doc/fmtcol.cxx | 22
sw/source/core/doc/gctable.cxx | 12
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/doc/tblcpy.cxx | 8
sw/source/core/doc/tblrwcl.cxx | 4
sw/source/core/docnode/ndcopy.cxx | 8
sw/source/core/docnode/ndsect.cxx | 8
sw/source/core/docnode/ndtbl.cxx | 50 +-
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 | 18
sw/source/core/edit/acorrect.cxx | 2
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 | 4
sw/source/core/fields/cellfml.cxx | 6
sw/source/core/frmedt/fefly1.cxx | 18
sw/source/core/frmedt/tblsel.cxx | 2
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 | 6
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/table/swtable.cxx | 46 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/atrstck.cxx | 8
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/pormulti.cxx | 4
sw/source/core/text/redlnitr.cxx | 2
sw/source/core/text/txtfrm.cxx | 28 -
sw/source/core/text/txtftn.cxx | 4
sw/source/core/txtnode/ndtxt.cxx | 48 -
sw/source/core/txtnode/swfont.cxx | 82 +--
sw/source/core/txtnode/thints.cxx | 18
sw/source/core/txtnode/txtedt.cxx | 6
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/unattr.cxx | 14
sw/source/core/undo/undel.cxx | 8
sw/source/core/undo/unsect.cxx | 6
sw/source/core/undo/unspnd.cxx | 4
sw/source/core/undo/untbl.cxx | 16
sw/source/core/unocore/unodraw.cxx | 4
sw/source/core/unocore/unoframe.cxx | 14
sw/source/core/unocore/unoobj.cxx | 6
sw/source/core/unocore/unoobj2.cxx | 4
sw/source/core/unocore/unoparagraph.cxx | 6
sw/source/core/unocore/unostyle.cxx | 30 -
sw/source/core/unocore/unotbl.cxx | 14
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/html/css1atr.cxx | 52 +-
sw/source/filter/html/htmlatr.cxx | 20
sw/source/filter/html/htmlcss1.cxx | 58 +-
sw/source/filter/html/htmldrawreader.cxx | 6
sw/source/filter/html/htmldrawwriter.cxx | 2
sw/source/filter/html/htmlflywriter.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 | 18
sw/source/filter/html/htmltabw.cxx | 6
sw/source/filter/html/svxcss1.cxx | 14
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/html/wrthtml.cxx | 14
sw/source/filter/writer/wrt_fn.cxx | 2
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/docxexport.cxx | 4
sw/source/filter/ww8/docxsdrexport.cxx | 4
sw/source/filter/ww8/rtfexport.cxx | 10
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 24
sw/source/filter/ww8/wrtw8nds.cxx | 20
sw/source/filter/ww8/wrtw8sty.cxx | 12
sw/source/filter/ww8/wrtww8.cxx | 12
sw/source/filter/ww8/wrtww8gr.cxx | 4
sw/source/filter/ww8/ww8atr.cxx | 22
sw/source/filter/ww8/ww8graf.cxx | 14
sw/source/filter/ww8/ww8par.cxx | 10
sw/source/filter/ww8/ww8par2.cxx | 6
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 4
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlfmt.cxx | 2
sw/source/filter/xml/xmlfmte.cxx | 4
sw/source/filter/xml/xmlimpit.cxx | 6
sw/source/filter/xml/xmliteme.cxx | 2
sw/source/filter/xml/xmlitemi.cxx | 8
sw/source/filter/xml/xmltble.cxx | 32 -
sw/source/filter/xml/xmltbli.cxx | 12
sw/source/ui/chrdlg/chardlg.cxx | 6
sw/source/ui/chrdlg/numpara.cxx | 12
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 12
sw/source/ui/config/optpage.cxx | 44 -
sw/source/ui/dbui/dbinsdlg.cxx | 4
sw/source/ui/dialog/macassgn.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 36 -
sw/source/ui/envelp/envfmt.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 4
sw/source/ui/frmdlg/column.cxx | 12
sw/source/ui/frmdlg/frmpage.cxx | 30 -
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/num.cxx | 4
sw/source/ui/misc/pgfnote.cxx | 6
sw/source/ui/misc/pggrid.cxx | 6
sw/source/ui/misc/titlepage.cxx | 2
sw/source/ui/table/tabledlg.cxx | 34 -
sw/source/uibase/app/apphdl.cxx | 8
sw/source/uibase/app/appopt.cxx | 24
sw/source/uibase/app/docsh.cxx | 12
sw/source/uibase/app/docsh2.cxx | 10
sw/source/uibase/app/docshini.cxx | 2
sw/source/uibase/app/docst.cxx | 22
sw/source/uibase/app/docstyle.cxx | 20
sw/source/uibase/dialog/regionsw.cxx | 22
sw/source/uibase/docvw/HeaderFooterWin.cxx | 8
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/docvw/romenu.cxx | 8
sw/source/uibase/frmdlg/colex.cxx | 26 -
sw/source/uibase/frmdlg/frmmgr.cxx | 6
sw/source/uibase/misc/glshell.cxx | 2
sw/source/uibase/ribbar/tbxanchr.cxx | 4
sw/source/uibase/ribbar/workctrl.cxx | 14
sw/source/uibase/shells/annotsh.cxx | 16
sw/source/uibase/shells/basesh.cxx | 20
sw/source/uibase/shells/drwbassh.cxx | 8
sw/source/uibase/shells/drwtxtex.cxx | 10
sw/source/uibase/shells/drwtxtsh.cxx | 8
sw/source/uibase/shells/frmsh.cxx | 32 -
sw/source/uibase/shells/grfsh.cxx | 14
sw/source/uibase/shells/langhelper.cxx | 6
sw/source/uibase/shells/mediash.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 38 -
sw/source/uibase/shells/textfld.cxx | 24
sw/source/uibase/shells/textglos.cxx | 6
sw/source/uibase/shells/textsh.cxx | 14
sw/source/uibase/shells/textsh1.cxx | 36 -
sw/source/uibase/shells/txtattr.cxx | 26 -
sw/source/uibase/shells/txtcrsr.cxx | 4
sw/source/uibase/shells/txtnum.cxx | 4
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 12
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2
sw/source/uibase/uiview/formatclipboard.cxx | 22
sw/source/uibase/uiview/pview.cxx | 12
sw/source/uibase/uiview/view.cxx | 10
sw/source/uibase/uiview/view0.cxx | 2
sw/source/uibase/uiview/view2.cxx | 56 +-
sw/source/uibase/uiview/viewcoll.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 4
sw/source/uibase/uiview/viewprt.cxx | 2
sw/source/uibase/uiview/viewsrch.cxx | 2
sw/source/uibase/uiview/viewtab.cxx | 6
sw/source/uibase/utlui/bookctrl.cxx | 2
sw/source/uibase/utlui/numfmtlb.cxx | 4
sw/source/uibase/utlui/tmplctrl.cxx | 2
sw/source/uibase/utlui/uitool.cxx | 40 -
sw/source/uibase/utlui/viewlayoutctrl.cxx | 2
sw/source/uibase/utlui/zoomctrl.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
536 files changed, 3563 insertions(+), 3563 deletions(-)
New commits:
commit ea733ab5b632109d28bb8f1dc37116340b26229b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Sep 10 17:53:41 2014 +0200
Turn SfxItemState into a C++11 scoped enumeration
...to gain further confidence in the claim "that none of the existing
code tries to uses combinations of these enum values"
(d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState")
Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13
Reviewed-on: https://gerrit.libreoffice.org/11384
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/avmedia/source/framework/mediatoolbox.cxx
b/avmedia/source/framework/mediatoolbox.cxx
index 0a1499b..ec44381 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -108,7 +108,7 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID
*/, SfxItemState eSta
DBG_ASSERT( pCtrl, "MediaToolBoxControl::StateChanged: media control not
found" );
- if( eState == SFX_ITEM_DISABLED )
+ if( eState == SfxItemState::DISABLED )
{
pCtrl->Enable( false, false );
pCtrl->SetText( OUString() );
@@ -122,7 +122,7 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID
*/, SfxItemState eSta
const MediaItem* pMediaItem = PTR_CAST( MediaItem, pState );
- if( pMediaItem && ( SFX_ITEM_DEFAULT == eState ) )
+ if( pMediaItem && ( SfxItemState::DEFAULT == eState ) )
pCtrl->setState( *pMediaItem );
}
}
diff --git a/basctl/source/basicide/basicbox.cxx
b/basctl/source/basicide/basicbox.cxx
index 9b9e045..194004b 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -67,7 +67,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState
eState, const SfxPool
if ( !pBox )
return;
- if ( eState != SFX_ITEM_DEFAULT )
+ if ( eState != SfxItemState::DEFAULT )
pBox->Disable();
else
{
@@ -357,7 +357,7 @@ void LanguageBoxControl::StateChanged( sal_uInt16 nID,
SfxItemState eState, cons
(void)nID;
if (LanguageBox* pBox =
static_cast<LanguageBox*>(GetToolBox().GetItemWindow(GetId())))
{
- if (eState != SFX_ITEM_DEFAULT)
+ if (eState != SfxItemState::DEFAULT)
pBox->Disable();
else
{
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index b713879..0057bbe 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -44,7 +44,7 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet,
sal_uInt16 nValueW
{
bool bSet = false;
const SfxPoolItem *pItem1 = NULL;
- if( rSet.GetItemState( nValueWhich, true, &pItem1 ) == SFX_ITEM_SET )
+ if( rSet.GetItemState( nValueWhich, true, &pItem1 ) == SfxItemState::SET )
{
const SfxUInt32Item * pNumItem = dynamic_cast< const SfxUInt32Item *
>( pItem1 );
if( pNumItem )
@@ -56,7 +56,7 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet,
sal_uInt16 nValueW
rbSourceFormatMixedStateOut=true;
const SfxPoolItem *pItem2 = NULL;
- if( rSet.GetItemState( nSourceFormatWhich, true, &pItem2 ) == SFX_ITEM_SET
)
+ if( rSet.GetItemState( nSourceFormatWhich, true, &pItem2 ) ==
SfxItemState::SET )
{
const SfxBoolItem * pBoolItem = dynamic_cast< const SfxBoolItem * >(
pItem2 );
if( pBoolItem )
@@ -73,7 +73,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs,
sal_uInt16 nWhichId,
rCheckbox.EnableTriState( false );
const SfxPoolItem *pPoolItem = NULL;
- if( rInAttrs.GetItemState(nWhichId, true, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(nWhichId, true, &pPoolItem) == SfxItemState::SET
)
rCheckbox.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() );
else
{
@@ -134,7 +134,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, true,
&pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, true,
&pPoolItem) == SfxItemState::SET )
aAvailabelPlacementList =((const
SfxIntegerListItem*)pPoolItem)->GetConstSequence();
m_pLB_LabelPlacement->Clear();
@@ -159,7 +159,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, true,
&pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_NO_PERCENTVALUE, true,
&pPoolItem) == SfxItemState::SET )
{
bool bForbidPercentValue = (static_cast< const SfxBoolItem & >(
rInAttrs.Get( SCHATTR_DATADESCR_NO_PERCENTVALUE )).GetValue() );
if( bForbidPercentValue )
@@ -328,7 +328,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, true, &pPoolItem)
== SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SEPARATOR, true, &pPoolItem)
== SfxItemState::SET )
for(sal_Int32 i=0; i < NUMBER_SEPARATORS; ++i )
{
if( m_aEntryMap[i] == ((const SfxStringItem*)pPoolItem)->GetValue())
@@ -337,7 +337,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
else
m_pLB_Separator->SelectEntryPos( 0 );
- if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, true, &pPoolItem)
== SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, true, &pPoolItem)
== SfxItemState::SET )
{
sal_Int32 nPlacement = ((const SfxInt32Item*)pPoolItem)->GetValue();
::std::map< sal_Int32, sal_uInt16 >::const_iterator aIt(
m_aPlacementToListBoxMap.find(nPlacement) );
@@ -352,10 +352,10 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
else
m_pLB_LabelPlacement->SetNoSelection();
- if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SFX_ITEM_SET )
+ if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SfxItemState::SET )
m_pLB_TextDirection->SelectEntryValue( SvxFrameDirection(((const
SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
- if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, true, &pPoolItem ) ==
SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, true, &pPoolItem ) ==
SfxItemState::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 8157301..d32d63c 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -492,14 +492,14 @@ IMPL_LINK( ErrorBarResources, RangeChanged, Edit *, pEdit
)
void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
{
const SfxPoolItem *pPoolItem = NULL;
- SfxItemState aState = SFX_ITEM_UNKNOWN;
+ SfxItemState aState = SfxItemState::UNKNOWN;
// category
m_eErrorKind = CHERROR_NONE;
aState = rInAttrs.GetItemState( SCHATTR_STAT_KIND_ERROR, true, &pPoolItem
);
- m_bErrorKindUnique = ( aState != SFX_ITEM_DONTCARE );
+ m_bErrorKindUnique = ( aState != SfxItemState::DONTCARE );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
m_eErrorKind = ((const SvxChartKindErrorItem*) pPoolItem)->GetValue();
m_pLbFunction->SelectEntryPos( lcl_getLbEntryPosByErrorKind( m_eErrorKind
));
@@ -538,15 +538,15 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
// parameters
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, true, &pPoolItem );
- m_bPlusUnique = ( aState != SFX_ITEM_DONTCARE );
- if( aState == SFX_ITEM_SET )
+ m_bPlusUnique = ( aState != SfxItemState::DONTCARE );
+ if( aState == SfxItemState::SET )
{
m_fPlusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
}
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, true, &pPoolItem
);
- m_bMinusUnique = ( aState != SFX_ITEM_DONTCARE );
- if( aState == SFX_ITEM_SET )
+ m_bMinusUnique = ( aState != SfxItemState::DONTCARE );
+ if( aState == SfxItemState::SET )
{
m_fMinusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
@@ -557,8 +557,8 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
// indicator
aState = rInAttrs.GetItemState( SCHATTR_STAT_INDICATE, true, &pPoolItem );
- m_bIndicatorUnique = ( aState != SFX_ITEM_DONTCARE );
- if( aState == SFX_ITEM_SET)
+ m_bIndicatorUnique = ( aState != SfxItemState::DONTCARE );
+ if( aState == SfxItemState::SET)
m_eIndicate = ((const SvxChartIndicateItem * ) pPoolItem)->GetValue();
if( m_bIndicatorUnique )
@@ -586,16 +586,16 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
// ranges
aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_POS, true, &pPoolItem );
- m_bRangePosUnique = ( aState != SFX_ITEM_DONTCARE );
- if( aState == SFX_ITEM_SET )
+ m_bRangePosUnique = ( aState != SfxItemState::DONTCARE );
+ if( aState == SfxItemState::SET )
{
OUString sRangePositive = (static_cast< const SfxStringItem * >(
pPoolItem ))->GetValue();
m_pEdRangePositive->SetText( sRangePositive );
}
aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_NEG, true, &pPoolItem );
- m_bRangeNegUnique = ( aState != SFX_ITEM_DONTCARE );
- if( aState == SFX_ITEM_SET )
+ m_bRangeNegUnique = ( aState != SfxItemState::DONTCARE );
+ if( aState == SfxItemState::SET )
{
OUString sRangeNegative = (static_cast< const SfxStringItem * >(
pPoolItem ))->GetValue();
m_pEdRangeNegative->SetText( sRangeNegative );
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 4b7d3de..da9e1dd 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, true, &pPoolItem ) ==
SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem ) ==
SfxItemState::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, true,
&pPoolItem ) == SFX_ITEM_SET )
+ if( m_pCbxShow && rInAttrs.GetItemState( SCHATTR_LEGEND_SHOW, true,
&pPoolItem ) == SfxItemState::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 d2ac636..911f393 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -114,7 +114,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
{
const SfxPoolItem *pPoolItem = NULL;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_CURVE_NAME, true, &pPoolItem
) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_CURVE_NAME, true, &pPoolItem
) == SfxItemState::SET )
{
OUString aName = static_cast< const SfxStringItem*
>(pPoolItem)->GetValue();
m_pEE_Name->SetText(aName);
@@ -125,8 +125,8 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
}
SfxItemState aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_TYPE,
true, &pPoolItem );
- m_bTrendLineUnique = ( aState != SFX_ITEM_DONTCARE );
- if( aState == SFX_ITEM_SET )
+ m_bTrendLineUnique = ( aState != SfxItemState::DONTCARE );
+ if( aState == SfxItemState::SET )
{
const SvxChartRegressItem * pItem = dynamic_cast< const
SvxChartRegressItem * >( pPoolItem );
if( pItem )
@@ -135,7 +135,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
}
}
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_DEGREE, true, &pPoolItem )
== SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_DEGREE, true, &pPoolItem )
== SfxItemState::SET )
{
sal_Int32 nDegree = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
m_pNF_Degree->SetValue( nDegree );
@@ -145,7 +145,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
m_pNF_Degree->SetValue( 2 );
}
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_PERIOD, true, &pPoolItem )
== SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_PERIOD, true, &pPoolItem )
== SfxItemState::SET )
{
sal_Int32 nPeriod = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
m_pNF_Period->SetValue( nPeriod );
@@ -156,28 +156,28 @@ void TrendlineResources::Reset( const SfxItemSet&
rInAttrs )
}
double nValue = 0.0;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, true,
&pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, true,
&pPoolItem ) == SfxItemState::SET )
{
nValue = ((const SvxDoubleItem*)pPoolItem)->GetValue() ;
}
lcl_setValue( *m_pFmtFld_ExtrapolateForward, nValue );
nValue = 0.0;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, true,
&pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, true,
&pPoolItem ) == SfxItemState::SET )
{
nValue = ((const SvxDoubleItem*)pPoolItem)->GetValue() ;
}
lcl_setValue( *m_pFmtFld_ExtrapolateBackward, nValue );
nValue = 0.0;
- if( rInAttrs.GetItemState( SCHATTR_REGRESSION_INTERCEPT_VALUE, true,
&pPoolItem ) == SFX_ITEM_SET )
+ if( rInAttrs.GetItemState( SCHATTR_REGRESSION_INTERCEPT_VALUE, true,
&pPoolItem ) == SfxItemState::SET )
{
nValue = ((const SvxDoubleItem*)pPoolItem)->GetValue() ;
}
lcl_setValue( *m_pFmtFld_InterceptValue, nValue );
aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SET_INTERCEPT, true,
&pPoolItem );
- if( aState == SFX_ITEM_DONTCARE )
+ if( aState == SfxItemState::DONTCARE )
{
m_pCB_SetIntercept->EnableTriState( true );
m_pCB_SetIntercept->SetState( TRISTATE_INDET );
@@ -185,12 +185,12 @@ void TrendlineResources::Reset( const SfxItemSet&
rInAttrs )
else
{
m_pCB_SetIntercept->EnableTriState( false );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
m_pCB_SetIntercept->Check( static_cast< const SfxBoolItem * >(
pPoolItem )->GetValue());
}
aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, true,
&pPoolItem );
- if( aState == SFX_ITEM_DONTCARE )
+ if( aState == SfxItemState::DONTCARE )
{
m_pCB_ShowEquation->EnableTriState( true );
m_pCB_ShowEquation->SetState( TRISTATE_INDET );
@@ -198,12 +198,12 @@ void TrendlineResources::Reset( const SfxItemSet&
rInAttrs )
else
{
m_pCB_ShowEquation->EnableTriState( false );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
m_pCB_ShowEquation->Check( static_cast< const SfxBoolItem * >(
pPoolItem )->GetValue());
}
aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, true,
&pPoolItem );
- if( aState == SFX_ITEM_DONTCARE )
+ if( aState == SfxItemState::DONTCARE )
{
m_pCB_ShowCorrelationCoeff->EnableTriState( true );
m_pCB_ShowCorrelationCoeff->SetState( TRISTATE_INDET );
@@ -211,7 +211,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
else
{
m_pCB_ShowCorrelationCoeff->EnableTriState( false );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
m_pCB_ShowCorrelationCoeff->Check( static_cast< const SfxBoolItem
* >( pPoolItem )->GetValue());
}
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 5163ebb..5181402 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -140,7 +140,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs
)
// show description
SfxItemState aState = rInAttrs->GetItemState( SCHATTR_AXIS_SHOWDESCR,
false, &pPoolItem );
- if( aState == SFX_ITEM_DONTCARE )
+ if( aState == SfxItemState::DONTCARE )
{
m_pCbShowDescription->EnableTriState( true );
m_pCbShowDescription->SetState( TRISTATE_INDET );
@@ -149,11 +149,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet*
rInAttrs )
{
m_pCbShowDescription->EnableTriState( false );
bool bCheck = false;
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
bCheck = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
m_pCbShowDescription->Check( bCheck );
- if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET )
+ if( aState != SfxItemState::DEFAULT && aState != SfxItemState::SET )
m_pCbShowDescription->Hide();
}
@@ -162,10 +162,10 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet*
rInAttrs )
// check new degree item
m_nInitialDegrees = 0;
aState = rInAttrs->GetItemState( SCHATTR_TEXT_DEGREES, false, &pPoolItem );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
m_nInitialDegrees = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
- m_bHasInitialDegrees = aState != SFX_ITEM_DONTCARE;
+ m_bHasInitialDegrees = aState != SfxItemState::DONTCARE;
if( m_bHasInitialDegrees )
m_pCtrlDial->SetRotation( m_nInitialDegrees );
else
@@ -174,21 +174,21 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet*
rInAttrs )
// check stacked item
m_bInitialStacking = false;
aState = rInAttrs->GetItemState( SCHATTR_TEXT_STACKED, false, &pPoolItem );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
m_bInitialStacking = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
- m_bHasInitialStacking = aState != SFX_ITEM_DONTCARE;
+ m_bHasInitialStacking = aState != SfxItemState::DONTCARE;
if( m_bHasInitialDegrees )
m_pOrientHlp->SetStackedState( m_bInitialStacking ? TRISTATE_TRUE :
TRISTATE_FALSE );
else
m_pOrientHlp->SetStackedState( TRISTATE_INDET );
- if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SFX_ITEM_SET )
+ if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SfxItemState::SET )
m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const
SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
// Text overlap ----------
aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false,
&pPoolItem );
- if( aState == SFX_ITEM_DONTCARE )
+ if( aState == SfxItemState::DONTCARE )
{
m_pCbTextOverlap->EnableTriState( true );
m_pCbTextOverlap->SetState( TRISTATE_INDET );
@@ -197,17 +197,17 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet*
rInAttrs )
{
m_pCbTextOverlap->EnableTriState( false );
bool bCheck = false;
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
bCheck = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
m_pCbTextOverlap->Check( bCheck );
- if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET )
+ if( aState != SfxItemState::DEFAULT && aState != SfxItemState::SET )
m_pCbTextOverlap->Hide();
}
// text break ----------
aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_BREAK, false,
&pPoolItem );
- if( aState == SFX_ITEM_DONTCARE )
+ if( aState == SfxItemState::DONTCARE )
{
m_pCbTextBreak->EnableTriState( true );
m_pCbTextBreak->SetState( TRISTATE_INDET );
@@ -216,11 +216,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet*
rInAttrs )
{
m_pCbTextBreak->EnableTriState( false );
bool bCheck = false;
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
bCheck = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
m_pCbTextBreak->Check( bCheck );
- if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET )
+ if( aState != SfxItemState::DEFAULT && aState != SfxItemState::SET )
{
m_pCbTextBreak->Hide();
if( ! m_pCbTextOverlap->IsVisible() )
@@ -232,7 +232,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs
)
if( m_bShowStaggeringControls )
{
aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_ORDER, false,
&pPoolItem );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::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 e72c30d..71b5221 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -159,7 +159,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
const SfxPoolItem *pPoolItem = NULL;
//axis line
- if(rInAttrs->GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)==
SFX_ITEM_SET)
+ if(rInAttrs->GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)==
SfxItemState::SET)
{
bool bZero = false;
sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
@@ -176,7 +176,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
m_pLB_CrossesAt->SelectEntryPos( nPos );
CrossesAtSelectHdl( (void*)0 );
- if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true,
&pPoolItem)== SFX_ITEM_SET || bZero )
+ if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true,
&pPoolItem)== SfxItemState::SET || bZero )
{
double fCrossover = 0.0;
if( !bZero )
@@ -199,7 +199,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
}
// Labels
- if( rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem
) == SFX_ITEM_SET )
+ if( rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem
) == SfxItemState::SET )
{
sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
if( nPos < m_pLB_PlaceLabels->GetEntryCount() )
@@ -211,9 +211,9 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
// Tick marks
long nTicks = 0, nMinorTicks = 0;
- if(rInAttrs->GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)==
SFX_ITEM_SET)
+ if(rInAttrs->GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)==
SfxItemState::SET)
nTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
- if(rInAttrs->GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)==
SFX_ITEM_SET)
+ if(rInAttrs->GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)==
SfxItemState::SET)
nMinorTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pCB_TicksInner->Check(bool(nTicks&CHAXIS_MARK_INNER));
@@ -222,7 +222,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
m_pCB_MinorOuter->Check(bool(nMinorTicks&CHAXIS_MARK_OUTER));
// Tick position
- if( rInAttrs->GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem
) == SFX_ITEM_SET )
+ if( rInAttrs->GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem
) == SfxItemState::SET )
{
sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
if( nPos < m_pLB_PlaceTicks->GetEntryCount() )
@@ -267,7 +267,7 @@ void AxisPositionsTabPage::SetNumFormatter(
SvNumberFormatter* pFormatter )
m_pED_CrossesAt->UseInputStringForFormatting();
const SfxPoolItem *pPoolItem = NULL;
- if( GetItemSet().GetItemState(
SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, true, &pPoolItem ) ==
SFX_ITEM_SET )
+ if( GetItemSet().GetItemState(
SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, true, &pPoolItem ) ==
SfxItemState::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 c80dc22..1381159 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, true, &pPoolItem ) ==
SFX_ITEM_SET )
+ if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SfxItemState::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 5456b69..da008a1 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -69,7 +69,7 @@ void SchLayoutTabPage::Reset(const SfxItemSet* rInAttrs)
{
const SfxPoolItem *pPoolItem = NULL;
- if (rInAttrs->GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) ==
SfxItemState::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 fe3db2a..73a9d41 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, true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) ==
SfxItemState::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, true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) ==
SfxItemState::SET)
{
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, true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem)
== SfxItemState::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 8970e9d..e0cefa0 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -283,17 +283,17 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs)
return;
const SfxPoolItem *pPoolItem = NULL;
- if (rInAttrs->GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem)
== SfxItemState::SET)
m_bAllowDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
m_nAxisType=chart2::AxisType::REALNUMBER;
- if (rInAttrs->GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) ==
SfxItemState::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, true,
&pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, true,
&pPoolItem) == SfxItemState::SET)
bAutoDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
sal_uInt16 nPos = 0;
@@ -313,66 +313,66 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs)
m_pCbxAutoOrigin->Check( true );
m_pCbx_AutoTimeResolution->Check( true );
- if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) ==
SfxItemState::SET)
m_pCbxAutoMin->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) ==
SfxItemState::SET)
{
fMin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldMin, fMin );
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) ==
SfxItemState::SET)
m_pCbxAutoMax->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) ==
SfxItemState::SET)
{
fMax = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldMax, fMax );
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem)
== SfxItemState::SET)
m_pCbxAutoStepMain->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) ==
SfxItemState::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,true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,true, &pPoolItem)
== SfxItemState::SET)
m_pCbxAutoStepHelp->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) ==
SfxItemState::SET)
m_pCbxLogarithm->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) ==
SfxItemState::SET)
m_pCbxReverse->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) ==
SfxItemState::SET)
{
nStepHelp = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pMtStepHelp->SetValue( nStepHelp );
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) ==
SfxItemState::SET)
m_pCbxAutoOrigin->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) ==
SfxItemState::SET)
{
fOrigin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
lcl_setValue( *m_pFmtFldOrigin, fOrigin );
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true,
&pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true,
&pPoolItem) == SfxItemState::SET)
m_pCbx_AutoTimeResolution->Check(((const
SfxBoolItem*)pPoolItem)->GetValue());
- if (rInAttrs->GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem)
== SfxItemState::SET)
{
m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pLB_TimeResolution->SelectEntryPos( m_nTimeResolution );
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem)
== SfxItemState::SET)
{
m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pLB_MainTimeUnit->SelectEntryPos( m_nMainTimeUnit );
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem)
== SfxItemState::SET)
{
m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
m_pLB_HelpTimeUnit->SelectEntryPos( m_nHelpTimeUnit );
@@ -525,7 +525,7 @@ void ScaleTabPage::SetNumFormat()
{
const SfxPoolItem *pPoolItem = NULL;
- if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, true,
&pPoolItem ) == SFX_ITEM_SET )
+ if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, true,
&pPoolItem ) == SfxItemState::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 76142ad..a04d2ef 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -121,7 +121,7 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
m_pRbtAxis1->Check(true);
m_pRbtAxis2->Check(false);
- if (rInAttrs->GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS,true, &pPoolItem) ==
SfxItemState::SET)
{
long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
if(nVal==CHART_AXIS_SECONDARY_Y)
@@ -132,30 +132,30 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
}
long nTmp;
- if (rInAttrs->GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) ==
SfxItemState::SET)
{
nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
m_pMTGap->SetValue(nTmp);
}
- if (rInAttrs->GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) ==
SfxItemState::SET)
{
nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
m_pMTOverlap->SetValue(nTmp);
}
- if (rInAttrs->GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) ==
SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) ==
SfxItemState::SET)
{
bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
m_pCBConnect->Check(bCheck);
}
- if (rInAttrs->GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem)
== SfxItemState::SET)
{
m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem
)->GetValue();
m_pCBAxisSideBySide->Disable();
}
- if (rInAttrs->GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem)
== SfxItemState::SET)
{
// model property is "group bars per axis", UI feature is the other way
// round: "show bars side by side"
@@ -170,10 +170,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,
true, &pPoolItem) == SFX_ITEM_SET )
+ if( rInAttrs->GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,
true, &pPoolItem) == SfxItemState::SET )
aMissingValueTreatments =((const
SfxIntegerListItem*)pPoolItem)->GetConstSequence();
- if ( aMissingValueTreatments.getLength()>1 &&
rInAttrs->GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) ==
SFX_ITEM_SET)
+ if ( aMissingValueTreatments.getLength()>1 &&
rInAttrs->GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) ==
SfxItemState::SET)
{
m_pRB_DontPaint->Enable(false);
m_pRB_AssumeZero->Enable(false);
@@ -205,7 +205,7 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
}
// Include hidden cells
- if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem)
== SFX_ITEM_SET)
+ if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem)
== SfxItemState::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 9305545..89f78a9 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -98,7 +98,7 @@ void SchAlignmentTabPage::Reset(const SfxItemSet* rInAttrs)
bool bStacked = pItem && ((const SfxBoolItem*)pItem)->GetValue();
m_pOrientHlp->SetStackedState( bStacked ? TRISTATE_TRUE : TRISTATE_FALSE );
- if( rInAttrs->GetItemState(EE_PARA_WRITINGDIR, true, &pItem) ==
SFX_ITEM_SET)
+ if( rInAttrs->GetItemState(EE_PARA_WRITINGDIR, true, &pItem) ==
SfxItemState::SET)
m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const
SvxFrameDirectionItem*)pItem)->GetValue()) );
}
diff --git a/chart2/source/controller/inc/ItemConverter.hxx
b/chart2/source/controller/inc/ItemConverter.hxx
index c4055fb..4d3e215 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -110,7 +110,7 @@ public:
*/
SfxItemSet CreateEmptyItemSet() const;
- /** Invalidates all items in rDestSet, that are set (state SFX_ITEM_SET) in
+ /** Invalidates all items in rDestSet, that are set (state
SfxItemState::SET) in
both item sets (rDestSet and rSourceSet) and have differing content.
*/
static void InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItemSet
&rSourceSet );
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index e1c13a1..e2cd620 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -934,7 +934,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16
nWhichId, const SfxItemSet
if( ! bUseSourceFormat )
{
SfxItemState aState = rItemSet.GetItemState(
SID_ATTR_NUMBERFORMAT_VALUE );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
{
sal_Int32 nFormatKey = static_cast< sal_Int32 >(
static_cast< const SfxUInt32Item & >(
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 1637858..ed9ea94 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -103,7 +103,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16
nWhichId, const SfxItemSe
OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ?
OUString(CHART_UNONAME_NUMFMT) : OUString( "PercentageNumberFormat" );
sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ?
SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE;
- if( SFX_ITEM_SET != rItemSet.GetItemState( nSourceWhich ) )
+ if( SfxItemState::SET != rItemSet.GetItemState( nSourceWhich ) )
return bChanged;
uno::Any aValue;
@@ -112,7 +112,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16
nWhichId, const SfxItemSe
if( !bUseSourceFormat )
{
SfxItemState aState = rItemSet.GetItemState( nWhichId );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
{
sal_Int32 nFmt = static_cast< sal_Int32 >(
static_cast< const SfxUInt32Item & >(
@@ -150,7 +150,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16
nWhichId, const SfxIte
OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ?
OUString(CHART_UNONAME_NUMFMT) : OUString( "PercentageNumberFormat" );
sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ?
SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE;
- if( SFX_ITEM_SET != rItemSet.GetItemState( nWhichId ) )
+ if( SfxItemState::SET != rItemSet.GetItemState( nWhichId ) )
return bChanged;
uno::Any aNewValue;
@@ -159,7 +159,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16
nWhichId, const SfxIte
if( !bUseSourceFormat )
{
SfxItemState aState = rItemSet.GetItemState( nFormatWhich );
- if( aState == SFX_ITEM_SET )
+ if( aState == SfxItemState::SET )
{
sal_Int32 nFormatKey = static_cast< sal_Int32 >(
static_cast< const SfxUInt32Item & >(
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index dedcdea..1e0e5a5 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -175,7 +175,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet &
rItemSet )
while( pItem )
{
- if( rItemSet.GetItemState( pItem->Which(), false ) == SFX_ITEM_SET )
+ if( rItemSet.GetItemState( pItem->Which(), false ) ==
SfxItemState::SET )
{
if( GetItemProperty( pItem->Which(), aProperty ))
{
@@ -224,8 +224,8 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet
&rDestSet, const SfxItem
while (nWhich)
{
- if ((rSourceSet.GetItemState(nWhich, true, &pPoolItem) ==
SFX_ITEM_SET) &&
- (rDestSet.GetItemState(nWhich, true, &pPoolItem) == SFX_ITEM_SET))
+ if ((rSourceSet.GetItemState(nWhich, true, &pPoolItem) ==
SfxItemState::SET) &&
+ (rDestSet.GetItemState(nWhich, true, &pPoolItem) ==
SfxItemState::SET))
{
if (rSourceSet.Get(nWhich) != rDestSet.Get(nWhich))
{
@@ -235,7 +235,7 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet
&rDestSet, const SfxItem
}
}
}
- else if( rSourceSet.GetItemState(nWhich, true, &pPoolItem) ==
SFX_ITEM_DONTCARE )
+ else if( rSourceSet.GetItemState(nWhich, true, &pPoolItem) ==
SfxItemState::DONTCARE )
rDestSet.InvalidateItem(nWhich);
nWhich = aIter.NextWhich ();
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 561f234..49cd67f 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -106,7 +106,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16
nWhichId, const SfxItemSe
case SCHATTR_LEGEND_SHOW:
{
const SfxPoolItem* pPoolItem = NULL;
- if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem
) == SFX_ITEM_SET )
+ if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem
) == SfxItemState::SET )
{
bool bShow = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
bool bWasShown = true;
@@ -123,7 +123,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16
nWhichId, const SfxItemSe
case SCHATTR_LEGEND_POS:
{
const SfxPoolItem* pPoolItem = NULL;
- if( rInItemSet.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem
) == SFX_ITEM_SET )
+ if( rInItemSet.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem
) == SfxItemState::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 64ad666..f7d905c 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -120,7 +120,7 @@ uno::Reference< beans::XPropertySet >
lcl_getEquationProperties(
{
SvxChartRegress eRegress = CHREGRESS_NONE;
const SfxPoolItem *pPoolItem = NULL;
- if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem
) == SFX_ITEM_SET )
+ if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem
) == SfxItemState::SET )
{
eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem
)->GetValue();
bEquationExists = ( eRegress != CHREGRESS_NONE );
@@ -151,7 +151,7 @@ uno::Reference< beans::XPropertySet >
lcl_getCurveProperties(
{
SvxChartRegress eRegress = CHREGRESS_NONE;
const SfxPoolItem *pPoolItem = NULL;
- if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem
) == SFX_ITEM_SET )
+ if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem
) == SfxItemState::SET )
{
eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem
)->GetValue();
bExists = ( eRegress != CHREGRESS_NONE );
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index c182475..e0e5bbe 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -95,7 +95,7 @@ bool numberFormatFromItemToPropertySet(
OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE == nWhichId) ?
OUString(CHART_UNONAME_NUMFMT) : OUString("PercentageNumberFormat");
sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE == nWhichId) ?
SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE;
- if (SFX_ITEM_SET != rItemSet.GetItemState(nSourceWhich))
+ if (SfxItemState::SET != rItemSet.GetItemState(nSourceWhich))
return bChanged;
uno::Any aValue;
@@ -103,7 +103,7 @@ bool numberFormatFromItemToPropertySet(
if (!bUseSourceFormat)
{
SfxItemState aState = rItemSet.GetItemState(nWhichId);
- if (aState == SFX_ITEM_SET)
+ if (aState == SfxItemState::SET)
{
sal_Int32 nFmt = static_cast<sal_Int32>(
static_cast<const SfxUInt32Item&>(
@@ -143,7 +143,7 @@ bool useSourceFormatFromItemToPropertySet(
OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE == nWhichId) ?
OUString(CHART_UNONAME_NUMFMT) : OUString("PercentageNumberFormat");
sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE == nWhichId) ?
SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE;
- if (SFX_ITEM_SET != rItemSet.GetItemState(nWhichId))
+ if (SfxItemState::SET != rItemSet.GetItemState(nWhichId))
return bChanged;
uno::Any aNewValue;
@@ -152,7 +152,7 @@ bool useSourceFormatFromItemToPropertySet(
if (!bUseSourceFormat)
{
SfxItemState aState = rItemSet.GetItemState(nFormatWhich);
- if (aState == SFX_ITEM_SET)
+ if (aState == SfxItemState::SET)
{
sal_Int32 nFormatKey = static_cast<sal_Int32>(
static_cast<const SfxUInt32Item&>(
diff --git a/chart2/source/controller/main/ChartController_Position.cxx
b/chart2/source/controller/main/ChartController_Position.cxx
index 91d0f8e..daf03c8 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,true,&pPoolItem))
+ if
(SfxItemState::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,true,&pPoolItem))
+ if
(SfxItemState::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,true,&pPoolItem))
+ if
(SfxItemState::SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_WIDTH,true,&pPoolItem))
nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
- if
(SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,true,&pPoolItem))
+ if
(SfxItemState::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,true,&pPoolItem))
+ if
(SfxItemState::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 43050bf..e5effb8 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -176,7 +176,7 @@ void
ChartController::executeDispatch_InsertSpecialCharacter()
const SfxItemSet* pSet = pDlg->GetOutputItemSet();
const SfxPoolItem* pItem=0;
OUString aString;
- if ( pSet && pSet->GetItemState( SID_CHARMAP, true, &pItem) ==
SFX_ITEM_SET &&
+ if ( pSet && pSet->GetItemState( SID_CHARMAP, true, &pItem) ==
SfxItemState::SET &&
pItem->ISA(SfxStringItem) )
aString = dynamic_cast<const
SfxStringItem*>(pItem)->GetValue();
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index f107662..70bf900 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -211,7 +211,7 @@ void DrawCommandDispatch::setLineEnds( SfxItemSet& rAttr )
pDrawViewWrapper->GetAttributes( aSet );
long nWidth = 300; // (1/100th mm)
- if ( aSet.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE )
+ if ( aSet.GetItemState( XATTR_LINEWIDTH ) !=
SfxItemState::DONTCARE )
{
long nValue = ( ( const XLineWidthItem& ) aSet.Get(
XATTR_LINEWIDTH ) ).GetValue();
if ( nValue > 0 )
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 037abce..cedfccc 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1465,7 +1465,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet*
rSet )
RadioHdl(0);
const SfxPoolItem* pMacroItem=0;
- if( SFX_ITEM_SET == rSet->GetItemState( SID_MACROINFO, true, &pMacroItem )
)
+ if( SfxItemState::SET == rSet->GetItemState( SID_MACROINFO, true,
&pMacroItem ) )
{
m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem );
m_pGroupLBox->SelectMacro( m_pMacroInfoItem );
@@ -1473,11 +1473,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet*
rSet )
else
{
const SfxPoolItem* pStringItem=0;
- if( SFX_ITEM_SET == rSet->GetItemState( SID_CHARMAP, true,
&pStringItem ) )
+ if( SfxItemState::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, true,
&pFontItem ) )
+ if( SfxItemState::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 fcb3af8..f8398a9 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -61,7 +61,7 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const
SfxItemSet& rAttrSet )
, bIDEDialogMode(false)
{
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, false,
&pItem ) )
+ if ( SfxItemState::SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM,
false, &pItem ) )
bIDEDialogMode = ((const SfxBoolItem*)pItem)->GetValue();
}
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index 9b1a65f..ae8cf48 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -45,7 +45,7 @@ SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings &
rBindings, SvxHpLinkD
void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
- if ( eState == SFX_ITEM_DEFAULT )
+ if ( eState == SfxItemState::DEFAULT )
{
switch ( nSID )
{
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3b3cd20..c59eda4 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -344,7 +344,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase,
ClickScriptHdl_Impl)
{
const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM,
false, &pItem ))
+ if( SfxItemState::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 acfd02d..2566f9b 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, true ) >= SFX_ITEM_DEFAULT )
+ if ( rSet.GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
{
bNew = 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, true ) >= SFX_ITEM_DEFAULT )
+ if ( rSet.GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
{
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, true ) >= SFX_ITEM_DEFAULT )
+ if ( rSet.GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
{
const SvxPostItTextItem& rText =
(const SvxPostItTextItem&)rSet.Get( nWhich );
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index d619cfa..c253773 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -242,7 +242,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const
SfxItemSet& rCoreSet )
}
const SfxPoolItem* pViewLayoutItem = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, false,
&pViewLayoutItem ) )
+ if ( SfxItemState::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/optchart.cxx b/cui/source/options/optchart.cxx
index f7d0d9f..ac3d5a2 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, false, &pItem ) ==
SFX_ITEM_SET )
+ if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) ==
SfxItemState::SET )
{
pColorConfig = (static_cast< SvxChartColorTableItem* >(pItem->Clone())
);
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b80faa3..e6d0710 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_pDocStatusCB->SaveValue();
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem
) )
+ if ( SfxItemState::SET == rSet->GetItemState( SID_ATTR_YEAR2000, false,
&pItem ) )
{
m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() );
TwoFigureConfigHdl(m_pYearValueField);
@@ -1509,21 +1509,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, false,
&pLang))
+ if( SfxItemState::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,
false, &pLang))
+ if( SfxItemState::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,
false, &pLang))
+ if( SfxItemState::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)
@@ -1568,7 +1568,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, false,
&pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
+ if ( SfxItemState::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/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7e3f877..20303de 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -328,7 +328,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS);
- if (rSet->GetItemState(nWhich) == SFX_ITEM_SET)
+ if (rSet->GetItemState(nWhich) == SfxItemState::SET)
{
if (sal_uInt16 const nField =
((SfxUInt16Item&)rSet->Get(nWhich)).GetValue())
{
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3f43ee7..469b1f9 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1478,7 +1478,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
const SfxHyphenRegionItem *pHyp = NULL;
sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION );
- if ( rSet->GetItemState( nWhich, false ) == SFX_ITEM_SET )
+ if ( rSet->GetItemState( nWhich, false ) == SfxItemState::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 34f8a17..bae13c5 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -240,9 +240,9 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet )
get())));
SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false,
&pItem );
- if ( SFX_ITEM_SET == eState )
+ if ( SfxItemState::SET == eState )
m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() );
- else if ( SFX_ITEM_DISABLED == eState )
+ else if ( SfxItemState::DISABLED == eState )
{
// quickstart not installed
m_pQuickStarterFrame->Hide();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 4ffc216..eb212b3 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -95,7 +95,7 @@ struct PathUserData_Impl
OUString sWritablePath;
PathUserData_Impl( sal_uInt16 nId ) :
- nRealId( nId ), eState( SFX_ITEM_UNKNOWN ) {}
+ nRealId( nId ), eState( SfxItemState::UNKNOWN ) {}
};
struct Handle2CfgNameMapping_Impl
@@ -269,7 +269,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* )
{
PathUserData_Impl* pPathImpl =
(PathUserData_Impl*)pPathBox->GetEntry(i)->GetUserData();
sal_uInt16 nRealId = pPathImpl->nRealId;
- if ( pPathImpl->eState == SFX_ITEM_SET )
+ if ( pPathImpl->eState == SfxItemState::SET )
SetPathList( nRealId, pPathImpl->sUserPath,
pPathImpl->sWritablePath );
}
return true;
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
sWritablePath = sTemp.getToken( nOldCount - 1, MULTIPATH_DELIMITER
);
pPathBox->SetEntryText( Convert_Impl( sTemp ), pEntry, 1 );
- pPathImpl->eState = SFX_ITEM_SET;
+ pPathImpl->eState = SfxItemState::SET;
pPathImpl->sUserPath = sUserPath;
pPathImpl->sWritablePath = sWritablePath;
}
@@ -503,7 +503,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString&
_rFolder )
pPathBox->SetEntryText( Convert_Impl( sNewPathStr ), pEntry, 1 );
nPos = (sal_uInt16)pPathBox->GetModel()->GetAbsPos( pEntry );
pPathImpl =
(PathUserData_Impl*)pPathBox->GetEntry(nPos)->GetUserData();
- pPathImpl->eState = SFX_ITEM_SET;
+ pPathImpl->eState = SfxItemState::SET;
pPathImpl->sWritablePath = sNewPathStr;
if ( SvtPathOptions::PATH_WORK == pPathImpl->nRealId )
{
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
pPathBox->SetEntryText( Convert_Impl( sFullPath ), pEntry, 1 );
// save modified flag
PathUserData_Impl* pPathImpl =
(PathUserData_Impl*)pEntry->GetUserData();
- pPathImpl->eState = SFX_ITEM_SET;
+ pPathImpl->eState = SfxItemState::SET;
pPathImpl->sUserPath = sUser;
pPathImpl->sWritablePath = sWritable;
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index d5cf0e3..ab93566 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1198,7 +1198,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet(
sal_uInt16 nId )
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
// miscellaneous - Year2000
- if( SFX_ITEM_DEFAULT <= pDispatch->QueryState(
SID_ATTR_YEAR2000, pItem ) )
+ if( SfxItemState::DEFAULT <= pDispatch->QueryState(
SID_ATTR_YEAR2000, pItem ) )
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const
SfxUInt16Item*)pItem)->GetValue() ) );
else
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000,
(sal_uInt16)aMisc.GetYear2000() ) );
@@ -1247,15 +1247,15 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet(
sal_uInt16 nId )
if ( pViewFrame )
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
- if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
+ if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_LANGUAGE, ((const
SvxLanguageItem*)pItem)->GetLanguage()));
- if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
+ if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CJK_LANGUAGE,
((const SvxLanguageItem*)pItem)->GetLanguage()));
- if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
+ if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CTL_LANGUAGE,
((const SvxLanguageItem*)pItem)->GetLanguage()));
pRet->Put(aHyphen);
- if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem))
+ if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem))
{
pClone = pItem->Clone();
pRet->Put(*pClone);
@@ -1335,7 +1335,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, false,
&pItem ) )
+ if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_YEAR2000,
false, &pItem ) )
nY2K = ((const SfxUInt16Item*)pItem)->GetValue();
if( USHRT_MAX != nY2K )
{
@@ -1350,10 +1350,10 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16
nId, const SfxItemSet& rSet
// evaluate print
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN,
false, &pItem))
+ if(SfxItemState::SET ==
rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem))
aMisc.SetNotFoundWarning(((const
SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC,
false, &pItem))
+ if(SfxItemState::SET ==
rSet.GetItemState(SID_PRINTER_CHANGESTODOC, false, &pItem))
{
const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem;
aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() &
SFX_PRINTER_CHG_SIZE ));
@@ -1400,13 +1400,13 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const
SfxItemSet& rSet)
bool bSaveSpellCheck = false;
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem
) )
+ if ( SfxItemState::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, false,
&pItem ) )
+ if ( SfxItemState::SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, false,
&pItem ) )
{
const SfxHyphenRegionItem* pHyphenItem = (const
SfxHyphenRegionItem*)pItem;
@@ -1420,23 +1420,23 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const
SfxItemSet& rSet)
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
pItem = 0;
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem
))
+ if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false,
&pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON,
pItem, 0L);
bSaveSpellCheck = true;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE,
false, &pItem ))
+ if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE,
false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON,
pItem, 0L);
bSaveSpellCheck = true;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE,
false, &pItem ))
+ if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE,
false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON,
pItem, 0L);
bSaveSpellCheck = true;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false,
&pItem ))
+ if( SfxItemState::SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false,
&pItem ))
{
bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue();
pDispatch->Execute(SID_AUTOSPELL_CHECK,
@@ -1453,7 +1453,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const
SfxItemSet& rSet)
}
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, false,
&pItem ))
+ if( SfxItemState::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 d278737..c2f0752 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -115,7 +115,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, true, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichAlign, true, &pItem) !=
SfxItemState::SET)
// alignment not set.
return;
@@ -125,7 +125,7 @@ void lcl_MaybeResetAlignToDistro(
// alignment is not 'justify'. No need to go further.
return;
- if (rCoreAttrs.GetItemState(nWhichJM, true, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichJM, true, &pItem) != SfxItemState::SET)
// justification method is not set.
return;
@@ -389,13 +389,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, true, &pItem) == SFX_ITEM_SET)
+ if (rOld.GetItemState(nWhich, true, &pItem) == SfxItemState::SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
}
- if (rNew.GetItemState(nWhich, true, &pItem) == SFX_ITEM_SET)
+ if (rNew.GetItemState(nWhich, true, &pItem) == SfxItemState::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 2885744..3f48db5 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -403,7 +403,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent,
const SfxItemSet& rC
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_HTML_MODE, false, &pItem )
+ if ( SfxItemState::SET == rCoreSet.GetItemState( SID_HTML_MODE, false,
&pItem )
|| ( 0 != ( pShell = SfxObjectShell::Current()) &&
0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
@@ -476,7 +476,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_DEFAULT <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC),
false))
+ if(SfxItemState::DEFAULT <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC),
false))
{
ResetFromWallpaperItem( *rSet );
return;
@@ -496,7 +496,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
const SfxPoolItem* pItem;
sal_uInt16 nDestValue = USHRT_MAX;
- if ( SFX_ITEM_SET == rSet->GetItemState( SID_BACKGRND_DESTINATION,
+ if ( SfxItemState::SET == rSet->GetItemState( SID_BACKGRND_DESTINATION,
false, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
@@ -515,7 +515,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
break;
}
}
- else if( SFX_ITEM_SET == rSet->GetItemState(
+ else if( SfxItemState::SET == rSet->GetItemState(
SID_PARA_BACKGRND_DESTINATION, false, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
@@ -543,7 +543,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
nDestValue = 0;
sal_uInt16 nWhich = GetWhich( nSlot );
- if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
+ if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
m_pBtnTile->Check();
@@ -584,21 +584,21 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
pTableBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
+ if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nCellWhich = nWhich;
- if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >=
SFX_ITEM_DEFAULT )
+ if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >=
SfxItemState::DEFAULT )
{
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, false ) >=
SFX_ITEM_DEFAULT )
+ if ( rSet->GetItemState( SID_ATTR_BRUSH_TABLE, false ) >=
SfxItemState::DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get(
SID_ATTR_BRUSH_TABLE ) );
pTableBck_Impl->pTableBrush = new SvxBrushItem(*pBgdAttr);
@@ -623,7 +623,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
pParaBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
+ if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr);
@@ -632,7 +632,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_BRUSH_CHAR );
rSet->GetItemState( nWhich, true );
rSet->GetItemState( nWhich, false );
- if ( rSet->GetItemState( nWhich, true ) > SFX_ITEM_DEFAULT )
+ if ( rSet->GetItemState( nWhich, true ) > SfxItemState::DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
pParaBck_Impl->pCharBrush = new SvxBrushItem(*pBgdAttr);
@@ -660,7 +660,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const
SfxItemSet& rSet )
sal_uInt16 nWhich = GetWhich( nSlot );
boost::scoped_ptr<SvxBrushItem> pTemp;
- if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
+ if ( rSet.GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
{
const CntWallpaperItem* pItem = (const CntWallpaperItem*)&rSet.Get(
nWhich );
pTemp.reset(new SvxBrushItem( *pItem, nWhich ));
@@ -729,7 +729,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_DEFAULT <= rCoreSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC),
false))
+ if(SfxItemState::DEFAULT <=
rCoreSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
return FillItemSetWithWallpaperItem( *rCoreSet, SID_VIEW_FLD_PIC );
bool bModified = false;
@@ -790,12 +790,12 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
{
// Brush-treatment:
if ( rOldItem.GetColor() != aBgdColor ||
- (SFX_ITEM_DEFAULT >= eOldItemState &&
!m_pBackgroundColorSet->IsNoSelection()))
+ (SfxItemState::DEFAULT >= eOldItemState &&
!m_pBackgroundColorSet->IsNoSelection()))
{
bModified = true;
rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich,
false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState(
nWhich, false ) )
rCoreSet->ClearItem( nWhich );
}
else
@@ -837,7 +837,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
rCoreSet->Put(aTmpBrush);
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich,
false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState(
nWhich, false ) )
rCoreSet->ClearItem( nWhich );
}
}
@@ -998,7 +998,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem(
SfxItemSet& rCoreSet, s
aItem.SetColor( aBgdColor );
rCoreSet.Put( aItem );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false
) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich,
false ) )
rCoreSet.ClearItem( nWhich );
}
else
@@ -1020,7 +1020,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem(
SfxItemSet& rCoreSet, s
aItem.SetBitmapURL( aBgdGraphicPath );
rCoreSet.Put( aItem );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false
) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich,
false ) )
rCoreSet.ClearItem( nWhich );
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 4ddeea5..6ccba2e 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -156,7 +156,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),true) !=
SFX_ITEM_UNKNOWN;
+ mbUseMarginItem =
rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),true) !=
SfxItemState::UNKNOWN;
const SfxPoolItem* pItem = NULL;
if (rCoreAttrs.HasItem(SID_ATTR_BORDER_STYLES, &pItem))
@@ -217,7 +217,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const
SfxItemSet& rCoreAttrs
sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, false );
bool bIsDontCare = true;
- if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
+ if ( rCoreAttrs.GetItemState( nWhich, true ) >= SfxItemState::DEFAULT )
{
// paragraph or table
const SvxBoxInfoItem* pBoxInfo =
@@ -427,7 +427,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
if ( pBoxInfoItem->IsDist() )
{
- if( rSet->GetItemState( nWhichBox, true ) >=
SFX_ITEM_DEFAULT )
+ if( rSet->GetItemState( nWhichBox, true ) >=
SfxItemState::DEFAULT )
{
bool bIsAnyBorderVisible =
m_pFrameSel->IsAnyBorderVisible();
if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist()
)
@@ -552,7 +552,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) ||
+ if(SfxItemState::SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) ||
( 0 != (pShell = SfxObjectShell::Current()) &&
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
@@ -706,11 +706,11 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet*
rCoreAttrs )
bPut = true;
- if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, false ))
+ if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nBoxWhich, false
))
{
bPut = aBoxItem != (const SvxBoxItem&)(rOldSet.Get(nBoxWhich));
}
- if( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxInfoWhich, false ) )
+ if( SfxItemState::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 71e22ee..05781ce 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
// define ----------------------------------------------------------------
-#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT
+#define ISITEMSET rSet.GetItemState(nWhich)>=SfxItemState::DEFAULT
#define CLEARTITEM rSet.InvalidateItem(nWhich)
@@ -457,7 +457,7 @@ namespace
{
//get the font from itemset
SfxItemState eState = _pPage->GetItemSet().GetItemState(
_nFontWhich );
- if ( eState >= SFX_ITEM_DEFAULT )
+ if ( eState >= SfxItemState::DEFAULT )
{
const SvxFontItem* pFontItem = (const SvxFontItem*)&(
_pPage->GetItemSet().Get( _nFontWhich ) );
aFontInfo.SetName(pFontItem->GetFamilyName());
@@ -669,7 +669,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
const SvxFontItem* pFontItem = NULL;
SfxItemState eState = rSet.GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DEFAULT )
+ if ( eState >= SfxItemState::DEFAULT )
{
pFontItem = (const SvxFontItem*)&( rSet.Get( nWhich ) );
pNameBox->SetText( pFontItem->GetFamilyName() );
@@ -693,13 +693,13 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
}
eState = rSet.GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DEFAULT )
+ if ( eState >= SfxItemState::DEFAULT )
{
const SvxPostureItem& rItem = (SvxPostureItem&)rSet.Get( nWhich );
eItalic = (FontItalic)rItem.GetValue();
bStyle = true;
}
- bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE);
+ bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::DONTCARE);
switch ( eLangGrp )
{
@@ -709,14 +709,14 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
}
eState = rSet.GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DEFAULT )
+ if ( eState >= SfxItemState::DEFAULT )
{
SvxWeightItem& rItem = (SvxWeightItem&)rSet.Get( nWhich );
eWeight = (FontWeight)rItem.GetValue();
}
else
bStyle = false;
- bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE);
+ bStyleAvailable = bStyleAvailable && (eState >= SfxItemState::DONTCARE);
// currently chosen font
if ( bStyle && pFontItem )
@@ -765,7 +765,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
pSizeBox->SetValue( (long)CalcToPoint( rItem.GetHeight(), eUnit,
10 ) );
}
}
- else if ( eState >= SFX_ITEM_DEFAULT )
+ else if ( eState >= SfxItemState::DEFAULT )
{
SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
const SvxFontHeightItem& rItem = (SvxFontHeightItem&)rSet.Get( nWhich
);
@@ -774,7 +774,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
else
{
pSizeBox->SetText( OUString() );
- if ( eState <= SFX_ITEM_READONLY )
+ if ( eState <= SfxItemState::READONLY )
{
pSizeBox->Disable( );
pSizeLabel->Disable( );
@@ -792,19 +792,19 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
switch ( eState )
{
- case SFX_ITEM_UNKNOWN:
+ case SfxItemState::UNKNOWN:
pLangFT->Hide();
pLangBox->HideLBB();
break;
- case SFX_ITEM_DISABLED:
- case SFX_ITEM_READONLY:
+ case SfxItemState::DISABLED:
+ case SfxItemState::READONLY:
pLangFT->Disable();
pLangBox->DisableLBB();
break;
- case SFX_ITEM_DEFAULT:
- case SFX_ITEM_SET:
+ case SfxItemState::DEFAULT:
+ case SfxItemState::SET:
{
const SvxLanguageItem& rItem = (SvxLanguageItem&)rSet.Get( nWhich
);
LanguageType eLangType = (LanguageType)rItem.GetValue();
@@ -813,7 +813,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet,
LanguageGroup eLangGrp
pLangBox->SelectLanguage( eLangType );
break;
}
- case SFX_ITEM_DONTCARE:
+ case SfxItemState::DONTCARE:
break;
}
@@ -911,7 +911,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
bChanged = pNameBox->GetSavedValue().isEmpty();
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) ==
SfxItemState::SET &&
( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName()
)
bChanged = true;
@@ -920,7 +920,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
rSet.Put( aFontItem );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rSet.ClearItem( nWhich );
@@ -956,7 +956,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
}
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) ==
SfxItemState::SET &&
( (SvxWeightItem*)pItem )->GetValue() != aWeightItem.GetValue() )
bChanged = true;
@@ -970,7 +970,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
rSet.Put( aWeightItem );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -1005,7 +1005,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
}
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) ==
SfxItemState::SET &&
( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() )
bChanged = true;
@@ -1017,7 +1017,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
rSet.Put( aPostureItem );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// FontSize
@@ -1045,7 +1045,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
bChanged = ( nSize != nSavedSize );
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET )
+ pExampleSet->GetItemState( nWhich, false, &pItem ) ==
SfxItemState::SET )
{
float fSize = (float)nSize / 10;
long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) );
@@ -1077,7 +1077,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
}
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -1132,7 +1132,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet,
LanguageGroup eLangGrp
rSet.Put( SvxLanguageItem( eLangType, nWhich ) );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -1354,7 +1354,7 @@ void SvxCharEffectsPage::Initialize()
// HTML-Mode
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if ( SFX_ITEM_SET == GetItemSet().GetItemState( SID_HTML_MODE, false,
&pItem ) ||
+ if ( SfxItemState::SET == GetItemSet().GetItemState( SID_HTML_MODE, false,
&pItem ) ||
( NULL != ( pShell = SfxObjectShell::Current() ) &&
NULL != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
@@ -1388,7 +1388,7 @@ void SvxCharEffectsPage::Initialize()
SfxPoolItem* pDummy = NULL;
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocSh );
if ( !pFrame ||
- SFX_ITEM_DEFAULT > pFrame->GetBindings().QueryState(
SID_ATTR_AUTO_COLOR_INVALID, pDummy ) )
+ SfxItemState::DEFAULT > pFrame->GetBindings().QueryState(
SID_ATTR_AUTO_COLOR_INVALID, pDummy ) )
{
m_pUnderlineColorLB->InsertAutomaticEntryColor( Color( COL_AUTO )
);
m_pOverlineColorLB->InsertAutomaticEntryColor( Color( COL_AUTO ) );
@@ -1543,23 +1543,23 @@ void SvxCharEffectsPage::ResetColor_Impl( const
SfxItemSet& rSet )
switch ( eState )
{
- case SFX_ITEM_UNKNOWN:
+ case SfxItemState::UNKNOWN:
m_pFontColorFT->Hide();
m_pFontColorLB->Hide();
break;
- case SFX_ITEM_DISABLED:
- case SFX_ITEM_READONLY:
+ case SfxItemState::DISABLED:
+ case SfxItemState::READONLY:
m_pFontColorFT->Disable();
m_pFontColorLB->Disable();
break;
- case SFX_ITEM_DONTCARE:
+ case SfxItemState::DONTCARE:
m_pFontColorLB->SetNoSelection();
break;
- case SFX_ITEM_DEFAULT:
- case SFX_ITEM_SET:
+ case SfxItemState::DEFAULT:
+ case SfxItemState::SET:
{
SvxFont& rFont = GetPreviewFont();
SvxFont& rCJKFont = GetPreviewCJKFont();
@@ -1616,7 +1616,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl(
SfxItemSet& rSet )
bChanged = ( m_pFontColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND
);
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, false, (const SfxPoolItem**)&pItem
) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, (const SfxPoolItem**)&pItem
) == SfxItemState::SET &&
( (SvxColorItem*)pItem )->GetValue() != aSelectedColor )
bChanged = true;
@@ -1627,7 +1627,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl(
SfxItemSet& rSet )
rSet.Put( SvxColorItem( aSelectedColor, nWhich ) );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+ else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -1758,9 +1758,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
m_pUnderlineLB->SelectEntryPos( 0 );
SfxItemState eState = rSet->GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DONTCARE )
+ if ( eState >= SfxItemState::DONTCARE )
{
- if ( eState == SFX_ITEM_DONTCARE )
+ if ( eState == SfxItemState::DONTCARE )
m_pUnderlineLB->SetNoSelection();
else
{
@@ -1815,9 +1815,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
m_pOverlineLB->SelectEntryPos( 0 );
eState = rSet->GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DONTCARE )
+ if ( eState >= SfxItemState::DONTCARE )
{
- if ( eState == SFX_ITEM_DONTCARE )
+ if ( eState == SfxItemState::DONTCARE )
m_pOverlineLB->SetNoSelection();
else
{
@@ -1872,9 +1872,9 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
m_pStrikeoutLB->SelectEntryPos( 0 );
eState = rSet->GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DONTCARE )
+ if ( eState >= SfxItemState::DONTCARE )
{
- if ( eState == SFX_ITEM_DONTCARE )
+ if ( eState == SfxItemState::DONTCARE )
m_pStrikeoutLB->SetNoSelection();
else
{
@@ -1903,21 +1903,21 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE );
switch ( eState )
{
- case SFX_ITEM_UNKNOWN:
+ case SfxItemState::UNKNOWN:
m_pIndividualWordsBtn->Hide();
break;
- case SFX_ITEM_DISABLED:
- case SFX_ITEM_READONLY:
+ case SfxItemState::DISABLED:
+ case SfxItemState::READONLY:
m_pIndividualWordsBtn->Disable();
break;
- case SFX_ITEM_DONTCARE:
+ case SfxItemState::DONTCARE:
m_pIndividualWordsBtn->SetState( TRISTATE_INDET );
break;
- case SFX_ITEM_DEFAULT:
- case SFX_ITEM_SET:
+ case SfxItemState::DEFAULT:
+ case SfxItemState::SET:
{
const SvxWordLineModeItem& rItem =
(SvxWordLineModeItem&)rSet->Get( nWhich );
rFont.SetWordLineMode( rItem.GetValue() );
@@ -1934,7 +1934,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK );
eState = rSet->GetItemState( nWhich );
- if ( eState >= SFX_ITEM_DEFAULT )
+ if ( eState >= SfxItemState::DEFAULT )
{
const SvxEmphasisMarkItem& rItem = (SvxEmphasisMarkItem&)rSet->Get(
nWhich );
FontEmphasisMark eMark = rItem.GetEmphasisMark();
@@ -1957,14 +1957,14 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
}
}
}
- else if ( eState == SFX_ITEM_DONTCARE )
+ else if ( eState == SfxItemState::DONTCARE )
m_pEmphasisLB->SetNoSelection( );
- else if ( eState == SFX_ITEM_UNKNOWN )
+ else if ( eState == SfxItemState::UNKNOWN )
{
m_pEmphasisFT->Hide();
m_pEmphasisLB->Hide();
}
- else // SFX_ITEM_DISABLED or SFX_ITEM_READONLY
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
