summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--avmedia/source/framework/mediaitem.cxx2
-rw-r--r--basctl/source/basicide/basdoc.cxx1
-rw-r--r--basctl/source/basicide/basdoc.hxx1
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/bastypes.cxx2
-rw-r--r--basctl/source/basicide/sbxitem.cxx2
-rw-r--r--basctl/source/dlged/dlgedmod.cxx2
-rw-r--r--basctl/source/dlged/dlgedobj.cxx2
-rw-r--r--basctl/source/dlged/dlgedpage.cxx1
-rw-r--r--basctl/source/dlged/dlgedview.cxx1
-rw-r--r--basctl/source/inc/basidesh.hxx1
-rw-r--r--basctl/source/inc/dlgedmod.hxx1
-rw-r--r--basctl/source/inc/dlgedobj.hxx2
-rw-r--r--basctl/source/inc/dlgedpage.hxx1
-rw-r--r--basctl/source/inc/dlgedview.hxx1
-rw-r--r--basctl/source/inc/sbxitem.hxx2
-rw-r--r--basic/inc/sbobjmod.hxx2
-rw-r--r--basic/inc/sbprop.hxx2
-rw-r--r--basic/inc/sbstdobj.hxx3
-rw-r--r--basic/source/basmgr/basmgr.cxx1
-rw-r--r--basic/source/classes/sb.cxx3
-rw-r--r--basic/source/classes/sbunoobj.cxx10
-rw-r--r--basic/source/classes/sbxmod.cxx9
-rw-r--r--basic/source/inc/sbjsmeth.hxx1
-rw-r--r--basic/source/inc/sbjsmod.hxx1
-rw-r--r--basic/source/inc/sbunoobj.hxx11
-rw-r--r--basic/source/runtime/stdobj1.cxx3
-rw-r--r--basic/source/sbx/sbxarray.cxx2
-rw-r--r--basic/source/sbx/sbxbase.cxx1
-rw-r--r--basic/source/sbx/sbxcoll.cxx2
-rw-r--r--basic/source/sbx/sbxobj.cxx3
-rw-r--r--basic/source/sbx/sbxvalue.cxx1
-rw-r--r--basic/source/sbx/sbxvar.cxx1
-rw-r--r--compilerplugins/clang/store/constantfunction.cxx2
-rw-r--r--connectivity/source/drivers/file/fcode.cxx25
-rw-r--r--connectivity/source/inc/file/fcode.hxx24
-rw-r--r--cui/inc/pch/precompiled_cui.hxx1
-rw-r--r--cui/source/options/cfgchart.cxx1
-rw-r--r--cui/source/options/cfgchart.hxx2
-rw-r--r--cui/source/options/connpoolsettings.cxx1
-rw-r--r--cui/source/options/connpoolsettings.hxx1
-rw-r--r--cui/source/options/dbregistersettings.cxx1
-rw-r--r--cui/source/options/dbregistersettings.hxx1
-rw-r--r--cui/source/tabpages/measure.cxx5
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.hxx2
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx1
-rw-r--r--dbaccess/source/ui/dlg/dsnItem.hxx1
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.cxx1
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.hxx1
-rw-r--r--dbaccess/source/ui/inc/GeneralUndo.hxx1
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableConnection.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableConnectionData.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx1
-rw-r--r--dbaccess/source/ui/inc/propertysetitem.hxx1
-rw-r--r--dbaccess/source/ui/inc/stringlistitem.hxx1
-rw-r--r--dbaccess/source/ui/misc/propertysetitem.cxx1
-rw-r--r--dbaccess/source/ui/misc/stringlistitem.cxx1
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.hxx1
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.hxx1
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx1
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.cxx9
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.hxx8
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx1
-rw-r--r--editeng/source/items/bulitem.cxx1
-rw-r--r--editeng/source/items/charhiddenitem.cxx3
-rw-r--r--editeng/source/items/flditem.cxx33
-rw-r--r--editeng/source/items/frmitems.cxx32
-rw-r--r--editeng/source/items/justifyitem.cxx5
-rw-r--r--editeng/source/items/optitems.cxx2
-rw-r--r--editeng/source/items/paraitem.cxx27
-rw-r--r--editeng/source/items/textitem.cxx69
-rw-r--r--editeng/source/items/writingmodeitem.cxx3
-rw-r--r--editeng/source/items/xmlcnitm.cxx1
-rw-r--r--idl/inc/basobj.hxx3
-rw-r--r--idl/inc/module.hxx1
-rw-r--r--idl/inc/object.hxx2
-rw-r--r--idl/inc/slot.hxx1
-rw-r--r--idl/inc/types.hxx6
-rw-r--r--idl/source/objects/basobj.cxx3
-rw-r--r--idl/source/objects/module.cxx1
-rw-r--r--idl/source/objects/object.cxx2
-rw-r--r--idl/source/objects/slot.cxx1
-rw-r--r--idl/source/objects/types.cxx12
-rw-r--r--include/avmedia/mediaitem.hxx3
-rw-r--r--include/basic/basmgr.hxx1
-rw-r--r--include/basic/sbmeth.hxx2
-rw-r--r--include/basic/sbmod.hxx2
-rw-r--r--include/basic/sbstar.hxx1
-rw-r--r--include/basic/sbx.hxx4
-rw-r--r--include/basic/sbxcore.hxx2
-rw-r--r--include/basic/sbxmeth.hxx1
-rw-r--r--include/basic/sbxobj.hxx1
-rw-r--r--include/basic/sbxprop.hxx1
-rw-r--r--include/basic/sbxvar.hxx2
-rw-r--r--include/editeng/adjustitem.hxx2
-rw-r--r--include/editeng/autokernitem.hxx2
-rw-r--r--include/editeng/blinkitem.hxx2
-rw-r--r--include/editeng/boxitem.hxx4
-rw-r--r--include/editeng/brushitem.hxx2
-rw-r--r--include/editeng/bulletitem.hxx2
-rw-r--r--include/editeng/charhiddenitem.hxx2
-rw-r--r--include/editeng/charreliefitem.hxx2
-rw-r--r--include/editeng/charrotateitem.hxx2
-rw-r--r--include/editeng/charscaleitem.hxx2
-rw-r--r--include/editeng/charsetcoloritem.hxx2
-rw-r--r--include/editeng/cmapitem.hxx2
-rw-r--r--include/editeng/colritem.hxx4
-rw-r--r--include/editeng/contouritem.hxx2
-rw-r--r--include/editeng/crossedoutitem.hxx2
-rw-r--r--include/editeng/editeng.hxx1
-rw-r--r--include/editeng/emphasismarkitem.hxx2
-rw-r--r--include/editeng/escapementitem.hxx2
-rw-r--r--include/editeng/fhgtitem.hxx2
-rw-r--r--include/editeng/flditem.hxx2
-rw-r--r--include/editeng/flstitem.hxx2
-rw-r--r--include/editeng/fontitem.hxx2
-rw-r--r--include/editeng/forbiddenruleitem.hxx2
-rw-r--r--include/editeng/formatbreakitem.hxx2
-rw-r--r--include/editeng/frmdiritem.hxx2
-rw-r--r--include/editeng/fwdtitem.hxx2
-rw-r--r--include/editeng/hngpnctitem.hxx2
-rw-r--r--include/editeng/hyphenzoneitem.hxx2
-rw-r--r--include/editeng/justifyitem.hxx4
-rw-r--r--include/editeng/keepitem.hxx2
-rw-r--r--include/editeng/kernitem.hxx2
-rw-r--r--include/editeng/langitem.hxx2
-rw-r--r--include/editeng/lcolitem.hxx2
-rw-r--r--include/editeng/lineitem.hxx2
-rw-r--r--include/editeng/lrspitem.hxx2
-rw-r--r--include/editeng/lspcitem.hxx2
-rw-r--r--include/editeng/nhypitem.hxx2
-rw-r--r--include/editeng/nlbkitem.hxx2
-rw-r--r--include/editeng/opaqitem.hxx2
-rw-r--r--include/editeng/optitems.hxx2
-rw-r--r--include/editeng/orphitem.hxx2
-rw-r--r--include/editeng/outliner.hxx1
-rw-r--r--include/editeng/paravertalignitem.hxx2
-rw-r--r--include/editeng/pbinitem.hxx2
-rw-r--r--include/editeng/pgrditem.hxx2
-rw-r--r--include/editeng/pmdlitem.hxx2
-rw-r--r--include/editeng/postitem.hxx2
-rw-r--r--include/editeng/prntitem.hxx2
-rw-r--r--include/editeng/protitem.hxx2
-rw-r--r--include/editeng/prszitem.hxx2
-rw-r--r--include/editeng/rsiditem.hxx2
-rw-r--r--include/editeng/scriptspaceitem.hxx2
-rw-r--r--include/editeng/scripttypeitem.hxx4
-rw-r--r--include/editeng/shaditem.hxx2
-rw-r--r--include/editeng/shdditem.hxx2
-rw-r--r--include/editeng/sizeitem.hxx2
-rw-r--r--include/editeng/spltitem.hxx2
-rw-r--r--include/editeng/svxacorr.hxx1
-rw-r--r--include/editeng/tstpitem.hxx2
-rw-r--r--include/editeng/twolinesitem.hxx2
-rw-r--r--include/editeng/udlnitem.hxx6
-rw-r--r--include/editeng/ulspitem.hxx2
-rw-r--r--include/editeng/wghtitem.hxx2
-rw-r--r--include/editeng/widwitem.hxx2
-rw-r--r--include/editeng/writingmodeitem.hxx2
-rw-r--r--include/editeng/wrlmitem.hxx2
-rw-r--r--include/editeng/xmlcnitm.hxx1
-rw-r--r--include/sfx2/app.hxx1
-rw-r--r--include/sfx2/dinfdlg.hxx2
-rw-r--r--include/sfx2/docfac.hxx1
-rw-r--r--include/sfx2/evntconf.hxx2
-rw-r--r--include/sfx2/frame.hxx5
-rw-r--r--include/sfx2/frmdescr.hxx1
-rw-r--r--include/sfx2/linksrc.hxx2
-rw-r--r--include/sfx2/lnkbase.hxx1
-rw-r--r--include/sfx2/minfitem.hxx2
-rw-r--r--include/sfx2/mnuitem.hxx6
-rw-r--r--include/sfx2/module.hxx1
-rw-r--r--include/sfx2/msg.hxx35
-rw-r--r--include/sfx2/msgpool.hxx2
-rw-r--r--include/sfx2/objitem.hxx2
-rw-r--r--include/sfx2/objsh.hxx4
-rw-r--r--include/sfx2/shell.hxx2
-rw-r--r--include/sfx2/stbitem.hxx6
-rw-r--r--include/sfx2/tabdlg.hxx1
-rw-r--r--include/sfx2/tbxctrl.hxx8
-rw-r--r--include/sfx2/tplpitem.hxx3
-rw-r--r--include/sfx2/viewfrm.hxx3
-rw-r--r--include/sfx2/viewsh.hxx1
-rw-r--r--include/sfx2/zoomitem.hxx2
-rw-r--r--include/sot/factory.hxx1
-rw-r--r--include/sot/stg.hxx8
-rw-r--r--include/svl/SfxBroadcaster.hxx2
-rw-r--r--include/svl/aeitem.hxx3
-rw-r--r--include/svl/cenumitm.hxx1
-rw-r--r--include/svl/cintitem.hxx4
-rw-r--r--include/svl/cntwall.hxx2
-rw-r--r--include/svl/ctypeitm.hxx1
-rw-r--r--include/svl/custritm.hxx1
-rw-r--r--include/svl/eitem.hxx3
-rw-r--r--include/svl/flagitem.hxx2
-rw-r--r--include/svl/globalnameitem.hxx4
-rw-r--r--include/svl/grabbagitem.hxx2
-rw-r--r--include/svl/ilstitem.hxx3
-rw-r--r--include/svl/imageitm.hxx2
-rw-r--r--include/svl/intitem.hxx10
-rw-r--r--include/svl/itemset.hxx1
-rw-r--r--include/svl/lckbitem.hxx3
-rw-r--r--include/svl/lstner.hxx2
-rw-r--r--include/svl/macitem.hxx3
-rw-r--r--include/svl/metitem.hxx1
-rw-r--r--include/svl/poolitem.hxx6
-rw-r--r--include/svl/ptitem.hxx2
-rw-r--r--include/svl/rectitem.hxx2
-rw-r--r--include/svl/rngitem.hxx2
-rw-r--r--include/svl/slstitm.hxx3
-rw-r--r--include/svl/srchitem.hxx2
-rw-r--r--include/svl/stritem.hxx3
-rw-r--r--include/svl/style.hxx2
-rw-r--r--include/svl/szitem.hxx1
-rw-r--r--include/svl/undo.hxx5
-rw-r--r--include/svl/visitem.hxx1
-rw-r--r--include/svtools/editbrowsebox.hxx8
-rw-r--r--include/svtools/xwindowitem.hxx1
-rw-r--r--include/svx/AffineMatrixItem.hxx1
-rw-r--r--include/svx/SmartTagItem.hxx2
-rw-r--r--include/svx/algitem.hxx4
-rw-r--r--include/svx/chrtitem.hxx9
-rw-r--r--include/svx/clipfmtitem.hxx2
-rw-r--r--include/svx/cube3d.hxx1
-rw-r--r--include/svx/drawitem.hxx17
-rw-r--r--include/svx/e3ditem.hxx1
-rw-r--r--include/svx/e3dundo.hxx3
-rw-r--r--include/svx/extrud3d.hxx1
-rw-r--r--include/svx/extrusionbar.hxx1
-rw-r--r--include/svx/fmmodel.hxx1
-rw-r--r--include/svx/fmpage.hxx1
-rw-r--r--include/svx/fmshell.hxx1
-rw-r--r--include/svx/fmview.hxx1
-rw-r--r--include/svx/fontworkbar.hxx1
-rw-r--r--include/svx/galleryitem.hxx2
-rw-r--r--include/svx/grafctrl.hxx1
-rw-r--r--include/svx/hlnkitem.hxx2
-rw-r--r--include/svx/lathe3d.hxx1
-rw-r--r--include/svx/numinf.hxx1
-rw-r--r--include/svx/obj3d.hxx3
-rw-r--r--include/svx/pageitem.hxx2
-rw-r--r--include/svx/polygn3d.hxx1
-rw-r--r--include/svx/polysc3d.hxx1
-rw-r--r--include/svx/postattr.hxx6
-rw-r--r--include/svx/rotmodit.hxx2
-rw-r--r--include/svx/rulritem.hxx10
-rw-r--r--include/svx/scene3d.hxx1
-rw-r--r--include/svx/sdangitm.hxx1
-rw-r--r--include/svx/sdasaitm.hxx11
-rw-r--r--include/svx/sdasitm.hxx5
-rw-r--r--include/svx/sdgcoitm.hxx3
-rw-r--r--include/svx/sdgcpitm.hxx1
-rw-r--r--include/svx/sdggaitm.hxx1
-rw-r--r--include/svx/sdginitm.hxx1
-rw-r--r--include/svx/sdgluitm.hxx2
-rw-r--r--include/svx/sdgmoitm.hxx1
-rw-r--r--include/svx/sdgtritm.hxx1
-rw-r--r--include/svx/sdmetitm.hxx1
-rw-r--r--include/svx/sdooitm.hxx1
-rw-r--r--include/svx/sdprcitm.hxx2
-rw-r--r--include/svx/sdtaaitm.hxx1
-rw-r--r--include/svx/sdtaditm.hxx1
-rw-r--r--include/svx/sdtaiitm.hxx8
-rw-r--r--include/svx/sdtaitm.hxx2
-rw-r--r--include/svx/sdtakitm.hxx1
-rw-r--r--include/svx/sdtayitm.hxx1
-rw-r--r--include/svx/sdtfchim.hxx1
-rw-r--r--include/svx/sdtfsitm.hxx2
-rw-r--r--include/svx/sdynitm.hxx1
-rw-r--r--include/svx/sphere3d.hxx1
-rw-r--r--include/svx/svddrgmt.hxx4
-rw-r--r--include/svx/svdmodel.hxx1
-rw-r--r--include/svx/svdoashp.hxx1
-rw-r--r--include/svx/svdoattr.hxx1
-rw-r--r--include/svx/svdobj.hxx2
-rw-r--r--include/svx/svdocapt.hxx1
-rw-r--r--include/svx/svdocirc.hxx1
-rw-r--r--include/svx/svdoedge.hxx1
-rw-r--r--include/svx/svdograf.hxx1
-rw-r--r--include/svx/svdogrp.hxx1
-rw-r--r--include/svx/svdomeas.hxx1
-rw-r--r--include/svx/svdomedia.hxx1
-rw-r--r--include/svx/svdoole2.hxx1
-rw-r--r--include/svx/svdopage.hxx1
-rw-r--r--include/svx/svdopath.hxx1
-rw-r--r--include/svx/svdorect.hxx1
-rw-r--r--include/svx/svdotable.hxx1
-rw-r--r--include/svx/svdotext.hxx1
-rw-r--r--include/svx/svdouno.hxx1
-rw-r--r--include/svx/svdovirt.hxx1
-rw-r--r--include/svx/svdpage.hxx2
-rw-r--r--include/svx/svdpntv.hxx1
-rw-r--r--include/svx/svdundo.hxx1
-rw-r--r--include/svx/svdview.hxx1
-rw-r--r--include/svx/svxdlg.hxx1
-rw-r--r--include/svx/svxgrahicitem.hxx1
-rw-r--r--include/svx/sxcecitm.hxx9
-rw-r--r--include/svx/sxcllitm.hxx8
-rw-r--r--include/svx/sxctitm.hxx1
-rw-r--r--include/svx/sxekitm.hxx1
-rw-r--r--include/svx/sxfiitm.hxx1
-rw-r--r--include/svx/sxmbritm.hxx4
-rw-r--r--include/svx/sxmspitm.hxx35
-rw-r--r--include/svx/sxmsuitm.hxx31
-rw-r--r--include/svx/sxmtfitm.hxx12
-rw-r--r--include/svx/sxmtpitm.hxx2
-rw-r--r--include/svx/sxmtritm.hxx8
-rw-r--r--include/svx/sxmuitm.hxx1
-rw-r--r--include/svx/sxsiitm.hxx1
-rw-r--r--include/svx/view3d.hxx1
-rw-r--r--include/svx/viewlayoutitem.hxx2
-rw-r--r--include/svx/xbtmpit.hxx2
-rw-r--r--include/svx/xcolit.hxx2
-rw-r--r--include/svx/xfillit0.hxx3
-rw-r--r--include/svx/xflasit.hxx1
-rw-r--r--include/svx/xflbckit.hxx3
-rw-r--r--include/svx/xflbmpit.hxx2
-rw-r--r--include/svx/xflbmsli.hxx2
-rw-r--r--include/svx/xflbmsxy.hxx4
-rw-r--r--include/svx/xflbmtit.hxx2
-rw-r--r--include/svx/xflboxy.hxx4
-rw-r--r--include/svx/xflbstit.hxx2
-rw-r--r--include/svx/xflbtoxy.hxx4
-rw-r--r--include/svx/xflclit.hxx2
-rw-r--r--include/svx/xflftrit.hxx2
-rw-r--r--include/svx/xflgrit.hxx2
-rw-r--r--include/svx/xflhtit.hxx2
-rw-r--r--include/svx/xfltrit.hxx2
-rw-r--r--include/svx/xftadit.hxx3
-rw-r--r--include/svx/xftdiit.hxx2
-rw-r--r--include/svx/xftmrit.hxx2
-rw-r--r--include/svx/xftouit.hxx3
-rw-r--r--include/svx/xftshcit.hxx2
-rw-r--r--include/svx/xftshit.hxx3
-rw-r--r--include/svx/xftshtit.hxx3
-rw-r--r--include/svx/xftshxy.hxx5
-rw-r--r--include/svx/xftstit.hxx3
-rw-r--r--include/svx/xgrscit.hxx2
-rw-r--r--include/svx/xit.hxx1
-rw-r--r--include/svx/xlineit0.hxx2
-rw-r--r--include/svx/xlinjoit.hxx2
-rw-r--r--include/svx/xlnasit.hxx1
-rw-r--r--include/svx/xlncapit.hxx2
-rw-r--r--include/svx/xlnclit.hxx2
-rw-r--r--include/svx/xlndsit.hxx2
-rw-r--r--include/svx/xlnedcit.hxx2
-rw-r--r--include/svx/xlnedit.hxx2
-rw-r--r--include/svx/xlnedwit.hxx2
-rw-r--r--include/svx/xlnstcit.hxx2
-rw-r--r--include/svx/xlnstit.hxx2
-rw-r--r--include/svx/xlnstwit.hxx2
-rw-r--r--include/svx/xlntrit.hxx2
-rw-r--r--include/svx/xlnwtit.hxx2
-rw-r--r--include/svx/xsflclit.hxx2
-rw-r--r--include/svx/xtextit0.hxx4
-rw-r--r--include/svx/zoomslideritem.hxx2
-rw-r--r--include/tools/errinf.hxx6
-rw-r--r--include/tools/pstm.hxx4
-rw-r--r--include/tools/stream.hxx4
-rw-r--r--include/vcl/apptypes.hxx1
-rw-r--r--include/vcl/extoutdevdata.hxx2
-rw-r--r--include/vcl/pdfextoutdevdata.hxx2
-rw-r--r--include/vcl/vclevent.hxx4
-rw-r--r--include/xmloff/XMLBase64ImportContext.hxx1
-rw-r--r--include/xmloff/XMLCharContext.hxx1
-rw-r--r--include/xmloff/XMLEventsImportContext.hxx1
-rw-r--r--include/xmloff/XMLFontStylesContext.hxx1
-rw-r--r--include/xmloff/XMLGraphicsDefaultStyle.hxx1
-rw-r--r--include/xmloff/XMLShapeStyleContext.hxx1
-rw-r--r--include/xmloff/XMLTextMasterPageContext.hxx1
-rw-r--r--include/xmloff/XMLTextMasterStylesContext.hxx1
-rw-r--r--include/xmloff/XMLTextShapeStyleContext.hxx1
-rw-r--r--include/xmloff/XMLTextTableContext.hxx1
-rw-r--r--include/xmloff/prstylei.hxx1
-rw-r--r--include/xmloff/shapeimport.hxx1
-rw-r--r--include/xmloff/txtstyli.hxx1
-rw-r--r--include/xmloff/xmlictxt.hxx2
-rw-r--r--include/xmloff/xmlnumi.hxx1
-rw-r--r--include/xmloff/xmlstyle.hxx3
-rw-r--r--reportdesign/inc/RptModel.hxx1
-rw-r--r--reportdesign/inc/RptObject.hxx3
-rw-r--r--reportdesign/inc/RptPage.hxx1
-rw-r--r--reportdesign/inc/UndoActions.hxx1
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx1
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx3
-rw-r--r--reportdesign/source/core/sdr/RptPage.cxx1
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx1
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
-rw-r--r--reportdesign/source/ui/inc/RptUndo.hxx4
-rw-r--r--reportdesign/source/ui/inc/SectionView.hxx1
-rw-r--r--reportdesign/source/ui/misc/RptUndo.cxx4
-rw-r--r--reportdesign/source/ui/report/SectionView.cxx1
-rw-r--r--salhelper/test/rtti/rttitest.cxx1
-rw-r--r--salhelper/test/rtti/samplelibrtti.cxx1
-rw-r--r--sc/inc/arealink.hxx1
-rw-r--r--sc/inc/attrib.hxx17
-rw-r--r--sc/inc/defaultsoptions.hxx1
-rw-r--r--sc/inc/docoptio.hxx2
-rw-r--r--sc/inc/formulaopt.hxx1
-rw-r--r--sc/inc/pch/precompiled_sc.hxx1
-rw-r--r--sc/inc/pch/precompiled_scfilt.hxx1
-rw-r--r--sc/inc/printopt.hxx2
-rw-r--r--sc/inc/stlsheet.hxx1
-rw-r--r--sc/inc/tablink.hxx1
-rw-r--r--sc/inc/viewopti.hxx2
-rw-r--r--sc/source/core/data/attrib.cxx16
-rw-r--r--sc/source/core/data/stlsheet.cxx1
-rw-r--r--sc/source/core/inc/ddelink.hxx1
-rw-r--r--sc/source/core/tool/chgtrack.cxx1
-rw-r--r--sc/source/core/tool/ddelink.cxx1
-rw-r--r--sc/source/core/tool/defaultsoptions.cxx1
-rw-r--r--sc/source/core/tool/detfunc.cxx2
-rw-r--r--sc/source/core/tool/docoptio.cxx1
-rw-r--r--sc/source/core/tool/formulaopt.cxx1
-rw-r--r--sc/source/core/tool/printopt.cxx1
-rw-r--r--sc/source/core/tool/viewopti.cxx1
-rw-r--r--sc/source/filter/excel/xeescher.cxx1
-rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.hxx2
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx3
-rw-r--r--sc/source/filter/xml/xmlstyli.hxx3
-rw-r--r--sc/source/ui/app/scmod.cxx6
-rw-r--r--sc/source/ui/app/uiitems.cxx9
-rw-r--r--sc/source/ui/docshell/arealink.cxx1
-rw-r--r--sc/source/ui/docshell/docsh.cxx1
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/docshell/tablink.cxx1
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx1
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx1
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx1
-rw-r--r--sc/source/ui/inc/auditsh.hxx1
-rw-r--r--sc/source/ui/inc/cellsh.hxx1
-rw-r--r--sc/source/ui/inc/chartsh.hxx1
-rw-r--r--sc/source/ui/inc/docsh.hxx1
-rw-r--r--sc/source/ui/inc/drawsh.hxx1
-rw-r--r--sc/source/ui/inc/drformsh.hxx1
-rw-r--r--sc/source/ui/inc/drtxtob.hxx1
-rw-r--r--sc/source/ui/inc/editsh.hxx1
-rw-r--r--sc/source/ui/inc/formatsh.hxx1
-rw-r--r--sc/source/ui/inc/graphsh.hxx1
-rw-r--r--sc/source/ui/inc/mediash.hxx1
-rw-r--r--sc/source/ui/inc/oleobjsh.hxx1
-rw-r--r--sc/source/ui/inc/pgbrksh.hxx1
-rw-r--r--sc/source/ui/inc/pivotsh.hxx1
-rw-r--r--sc/source/ui/inc/prevwsh.hxx1
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx1
-rw-r--r--sc/source/ui/inc/target.hxx1
-rw-r--r--sc/source/ui/inc/uiitems.hxx9
-rw-r--r--sc/source/ui/inc/undobase.hxx6
-rw-r--r--sc/source/ui/inc/undoblk.hxx32
-rw-r--r--sc/source/ui/inc/undocell.hxx11
-rw-r--r--sc/source/ui/inc/undodat.hxx16
-rw-r--r--sc/source/ui/inc/undodraw.hxx1
-rw-r--r--sc/source/ui/inc/undostyl.hxx2
-rw-r--r--sc/source/ui/inc/undotab.hxx15
-rw-r--r--sc/source/ui/undo/target.cxx1
-rw-r--r--sc/source/ui/undo/undobase.cxx6
-rw-r--r--sc/source/ui/undo/undoblk.cxx17
-rw-r--r--sc/source/ui/undo/undoblk2.cxx1
-rw-r--r--sc/source/ui/undo/undoblk3.cxx14
-rw-r--r--sc/source/ui/undo/undocell.cxx11
-rw-r--r--sc/source/ui/undo/undodat.cxx16
-rw-r--r--sc/source/ui/undo/undodraw.cxx1
-rw-r--r--sc/source/ui/undo/undostyl.cxx2
-rw-r--r--sc/source/ui/undo/undotab.cxx15
-rw-r--r--sc/source/ui/view/auditsh.cxx1
-rw-r--r--sc/source/ui/view/cellsh.cxx1
-rw-r--r--sc/source/ui/view/editsh.cxx1
-rw-r--r--sc/source/ui/view/formatsh.cxx1
-rw-r--r--sc/source/ui/view/pgbrksh.cxx1
-rw-r--r--sc/source/ui/view/pivotsh.cxx1
-rw-r--r--sc/source/ui/view/prevwsh.cxx1
-rw-r--r--sc/source/ui/view/tabcont.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh.cxx1
-rw-r--r--sd/inc/drawdoc.hxx1
-rw-r--r--sd/inc/pch/precompiled_sd.hxx1
-rw-r--r--sd/inc/sdattr.hxx4
-rw-r--r--sd/inc/sdmod.hxx1
-rw-r--r--sd/inc/sdpage.hxx1
-rw-r--r--sd/inc/sdundo.hxx1
-rw-r--r--sd/source/core/drawdoc.cxx1
-rw-r--r--sd/source/core/drawdoc4.cxx3
-rw-r--r--sd/source/core/sdattr.cxx4
-rw-r--r--sd/source/core/sdpage.cxx1
-rw-r--r--sd/source/ui/app/sdmod.cxx1
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx2
-rw-r--r--sd/source/ui/dlg/unchss.cxx1
-rw-r--r--sd/source/ui/docshell/docshell.cxx1
-rw-r--r--sd/source/ui/docshell/grdocsh.cxx1
-rw-r--r--sd/source/ui/func/fuarea.cxx1
-rw-r--r--sd/source/ui/func/fubullet.cxx1
-rw-r--r--sd/source/ui/func/fuchar.cxx1
-rw-r--r--sd/source/ui/func/fucon3d.cxx1
-rw-r--r--sd/source/ui/func/fuconarc.cxx1
-rw-r--r--sd/source/ui/func/fuconbez.cxx1
-rw-r--r--sd/source/ui/func/fuconcs.cxx1
-rw-r--r--sd/source/ui/func/fuconnct.cxx1
-rw-r--r--sd/source/ui/func/fuconrec.cxx1
-rw-r--r--sd/source/ui/func/fuconstr.cxx1
-rw-r--r--sd/source/ui/func/fuconuno.cxx1
-rw-r--r--sd/source/ui/func/fucopy.cxx1
-rw-r--r--sd/source/ui/func/fucushow.cxx1
-rw-r--r--sd/source/ui/func/fudraw.cxx1
-rw-r--r--sd/source/ui/func/fudspord.cxx1
-rw-r--r--sd/source/ui/func/fuediglu.cxx1
-rw-r--r--sd/source/ui/func/fuexpand.cxx1
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx1
-rw-r--r--sd/source/ui/func/fuhhconv.cxx1
-rw-r--r--sd/source/ui/func/fuinsert.cxx5
-rw-r--r--sd/source/ui/func/fuinsfil.cxx1
-rw-r--r--sd/source/ui/func/fuline.cxx1
-rw-r--r--sd/source/ui/func/fulinend.cxx1
-rw-r--r--sd/source/ui/func/fulink.cxx1
-rw-r--r--sd/source/ui/func/fumeasur.cxx1
-rw-r--r--sd/source/ui/func/fumorph.cxx1
-rw-r--r--sd/source/ui/func/funavig.cxx1
-rw-r--r--sd/source/ui/func/fuoaprms.cxx1
-rw-r--r--sd/source/ui/func/fuolbull.cxx1
-rw-r--r--sd/source/ui/func/fuoltext.cxx1
-rw-r--r--sd/source/ui/func/fuoutl.cxx1
-rw-r--r--sd/source/ui/func/fupage.cxx1
-rw-r--r--sd/source/ui/func/fuparagr.cxx1
-rw-r--r--sd/source/ui/func/fupoor.cxx1
-rw-r--r--sd/source/ui/func/fuprlout.cxx1
-rw-r--r--sd/source/ui/func/fuprobjs.cxx1
-rw-r--r--sd/source/ui/func/fuscale.cxx1
-rw-r--r--sd/source/ui/func/fusearch.cxx1
-rw-r--r--sd/source/ui/func/fusel.cxx1
-rw-r--r--sd/source/ui/func/fusldlg.cxx1
-rw-r--r--sd/source/ui/func/fusnapln.cxx1
-rw-r--r--sd/source/ui/func/fusumry.cxx1
-rw-r--r--sd/source/ui/func/futempl.cxx1
-rw-r--r--sd/source/ui/func/futext.cxx1
-rw-r--r--sd/source/ui/func/futhes.cxx1
-rw-r--r--sd/source/ui/func/futransf.cxx1
-rw-r--r--sd/source/ui/func/futxtatt.cxx1
-rw-r--r--sd/source/ui/func/fuvect.cxx1
-rw-r--r--sd/source/ui/func/fuzoom.cxx1
-rw-r--r--sd/source/ui/func/sdundo.cxx1
-rw-r--r--sd/source/ui/func/sdundogr.cxx1
-rw-r--r--sd/source/ui/func/undoback.cxx1
-rw-r--r--sd/source/ui/func/undoheaderfooter.cxx1
-rw-r--r--sd/source/ui/func/undolayer.cxx1
-rw-r--r--sd/source/ui/func/undopage.cxx3
-rw-r--r--sd/source/ui/func/unoaprms.cxx1
-rw-r--r--sd/source/ui/func/unprlout.cxx1
-rw-r--r--sd/source/ui/inc/BezierObjectBar.hxx1
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx1
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx1
-rw-r--r--sd/source/ui/inc/GraphicDocShell.hxx1
-rw-r--r--sd/source/ui/inc/GraphicObjectBar.hxx1
-rw-r--r--sd/source/ui/inc/GraphicViewShell.hxx1
-rw-r--r--sd/source/ui/inc/GraphicViewShellBase.hxx1
-rw-r--r--sd/source/ui/inc/ImpressViewShellBase.hxx1
-rw-r--r--sd/source/ui/inc/MediaObjectBar.hxx1
-rw-r--r--sd/source/ui/inc/OutlineView.hxx1
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx1
-rw-r--r--sd/source/ui/inc/OutlineViewShellBase.hxx1
-rw-r--r--sd/source/ui/inc/PaneShells.hxx3
-rw-r--r--sd/source/ui/inc/PresentationViewShell.hxx1
-rw-r--r--sd/source/ui/inc/PresentationViewShellBase.hxx1
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx1
-rw-r--r--sd/source/ui/inc/SlideSorterViewShellBase.hxx1
-rw-r--r--sd/source/ui/inc/TextObjectBar.hxx1
-rw-r--r--sd/source/ui/inc/View.hxx1
-rw-r--r--sd/source/ui/inc/ViewShell.hxx1
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx1
-rw-r--r--sd/source/ui/inc/drawview.hxx1
-rw-r--r--sd/source/ui/inc/fuarea.hxx1
-rw-r--r--sd/source/ui/inc/fubullet.hxx1
-rw-r--r--sd/source/ui/inc/fuchar.hxx1
-rw-r--r--sd/source/ui/inc/fucon3d.hxx1
-rw-r--r--sd/source/ui/inc/fuconarc.hxx1
-rw-r--r--sd/source/ui/inc/fuconbez.hxx1
-rw-r--r--sd/source/ui/inc/fuconcs.hxx1
-rw-r--r--sd/source/ui/inc/fuconnct.hxx1
-rw-r--r--sd/source/ui/inc/fuconrec.hxx1
-rw-r--r--sd/source/ui/inc/fuconstr.hxx1
-rw-r--r--sd/source/ui/inc/fuconuno.hxx1
-rw-r--r--sd/source/ui/inc/fucopy.hxx1
-rw-r--r--sd/source/ui/inc/fucushow.hxx1
-rw-r--r--sd/source/ui/inc/fudraw.hxx1
-rw-r--r--sd/source/ui/inc/fudspord.hxx1
-rw-r--r--sd/source/ui/inc/fuediglu.hxx1
-rw-r--r--sd/source/ui/inc/fuexpand.hxx1
-rw-r--r--sd/source/ui/inc/fuformatpaintbrush.hxx1
-rw-r--r--sd/source/ui/inc/fuhhconv.hxx1
-rw-r--r--sd/source/ui/inc/fuinsert.hxx5
-rw-r--r--sd/source/ui/inc/fuinsfil.hxx1
-rw-r--r--sd/source/ui/inc/fuline.hxx1
-rw-r--r--sd/source/ui/inc/fulinend.hxx1
-rw-r--r--sd/source/ui/inc/fulink.hxx1
-rw-r--r--sd/source/ui/inc/fumeasur.hxx1
-rw-r--r--sd/source/ui/inc/fumorph.hxx1
-rw-r--r--sd/source/ui/inc/funavig.hxx1
-rw-r--r--sd/source/ui/inc/fuoaprms.hxx1
-rw-r--r--sd/source/ui/inc/fuolbull.hxx1
-rw-r--r--sd/source/ui/inc/fuoltext.hxx1
-rw-r--r--sd/source/ui/inc/fuoutl.hxx1
-rw-r--r--sd/source/ui/inc/fupage.hxx1
-rw-r--r--sd/source/ui/inc/fuparagr.hxx1
-rw-r--r--sd/source/ui/inc/fupoor.hxx2
-rw-r--r--sd/source/ui/inc/fuprlout.hxx1
-rw-r--r--sd/source/ui/inc/fuprobjs.hxx1
-rw-r--r--sd/source/ui/inc/fuscale.hxx1
-rw-r--r--sd/source/ui/inc/fusearch.hxx1
-rw-r--r--sd/source/ui/inc/fusel.hxx1
-rw-r--r--sd/source/ui/inc/fusldlg.hxx1
-rw-r--r--sd/source/ui/inc/fusnapln.hxx1
-rw-r--r--sd/source/ui/inc/fusumry.hxx1
-rw-r--r--sd/source/ui/inc/futempl.hxx1
-rw-r--r--sd/source/ui/inc/futext.hxx1
-rw-r--r--sd/source/ui/inc/futhes.hxx1
-rw-r--r--sd/source/ui/inc/futransf.hxx1
-rw-r--r--sd/source/ui/inc/futxtatt.hxx1
-rw-r--r--sd/source/ui/inc/fuvect.hxx1
-rw-r--r--sd/source/ui/inc/fuzoom.hxx1
-rw-r--r--sd/source/ui/inc/sdundogr.hxx1
-rw-r--r--sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx1
-rw-r--r--sd/source/ui/inc/unchss.hxx1
-rw-r--r--sd/source/ui/inc/undoback.hxx1
-rw-r--r--sd/source/ui/inc/undoheaderfooter.hxx1
-rw-r--r--sd/source/ui/inc/undolayer.hxx1
-rw-r--r--sd/source/ui/inc/undopage.hxx3
-rw-r--r--sd/source/ui/inc/unmodpg.hxx1
-rw-r--r--sd/source/ui/inc/unoaprms.hxx1
-rw-r--r--sd/source/ui/inc/unprlout.hxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx1
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx1
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx1
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx1
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx1
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx1
-rw-r--r--sd/source/ui/table/tableobjectbar.hxx1
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx1
-rw-r--r--sd/source/ui/view/GraphicViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/ImpressViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx1
-rw-r--r--sd/source/ui/view/OutlineViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/PresentationViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/SlideSorterViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/drawview.cxx1
-rw-r--r--sd/source/ui/view/drbezob.cxx1
-rw-r--r--sd/source/ui/view/drtxtob.cxx1
-rw-r--r--sd/source/ui/view/drvwshrg.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx1
-rw-r--r--sd/source/ui/view/outlview.cxx1
-rw-r--r--sd/source/ui/view/presvish.cxx1
-rw-r--r--sd/source/ui/view/sdview.cxx1
-rw-r--r--sd/source/ui/view/unmodpg.cxx1
-rw-r--r--sd/source/ui/view/viewshel.cxx1
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx1
-rw-r--r--sfx2/inc/sorgitm.hxx2
-rw-r--r--sfx2/source/appl/appmain.cxx1
-rw-r--r--sfx2/source/appl/linksrc.cxx1
-rw-r--r--sfx2/source/appl/lnkbase2.cxx1
-rw-r--r--sfx2/source/appl/module.cxx1
-rw-r--r--sfx2/source/bastyp/dummytypes.cxx1
-rw-r--r--sfx2/source/config/evntconf.cxx1
-rw-r--r--sfx2/source/control/minfitem.cxx2
-rw-r--r--sfx2/source/control/msg.cxx2
-rw-r--r--sfx2/source/control/msgpool.cxx2
-rw-r--r--sfx2/source/control/shell.cxx1
-rw-r--r--sfx2/source/control/sorgitm.cxx6
-rw-r--r--sfx2/source/control/statcach.cxx2
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx5
-rw-r--r--sfx2/source/dialog/tabdlg.cxx1
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/dialog/tplpitem.cxx2
-rw-r--r--sfx2/source/doc/frmdescr.cxx1
-rw-r--r--sfx2/source/doc/objitem.cxx6
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/zoomitem.cxx3
-rw-r--r--sfx2/source/inc/templdgi.hxx3
-rw-r--r--sfx2/source/menu/mnuitem.cxx8
-rw-r--r--sfx2/source/statbar/stbitem.cxx6
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx10
-rw-r--r--sfx2/source/view/frame.cxx8
-rw-r--r--sfx2/source/view/viewfrm.cxx2
-rw-r--r--sfx2/source/view/viewsh.cxx1
-rw-r--r--sot/inc/pch/precompiled_sot.hxx1
-rw-r--r--sot/source/base/filelist.cxx1
-rw-r--r--sot/source/sdstor/stg.cxx5
-rw-r--r--sot/source/sdstor/ucbstorage.cxx2
-rw-r--r--starmath/inc/document.hxx1
-rw-r--r--starmath/inc/pch/precompiled_sm.hxx1
-rw-r--r--starmath/inc/smmod.hxx1
-rw-r--r--starmath/inc/view.hxx1
-rw-r--r--starmath/source/document.cxx1
-rw-r--r--starmath/source/smmod.cxx2
-rw-r--r--starmath/source/view.cxx1
-rw-r--r--svl/source/inc/strmadpt.hxx1
-rw-r--r--svl/source/items/aeitem.cxx2
-rw-r--r--svl/source/items/cenumitm.cxx7
-rw-r--r--svl/source/items/cintitem.cxx4
-rw-r--r--svl/source/items/cntwall.cxx1
-rw-r--r--svl/source/items/ctypeitm.cxx1
-rw-r--r--svl/source/items/custritm.cxx1
-rw-r--r--svl/source/items/flagitem.cxx1
-rw-r--r--svl/source/items/globalnameitem.cxx2
-rw-r--r--svl/source/items/grabbagitem.cxx1
-rw-r--r--svl/source/items/ilstitem.cxx3
-rw-r--r--svl/source/items/imageitm.cxx3
-rw-r--r--svl/source/items/intitem.cxx26
-rw-r--r--svl/source/items/itempool.cxx2
-rw-r--r--svl/source/items/itemset.cxx2
-rw-r--r--svl/source/items/lckbitem.cxx3
-rw-r--r--svl/source/items/macitem.cxx3
-rw-r--r--svl/source/items/poolitem.cxx13
-rw-r--r--svl/source/items/ptitem.cxx2
-rw-r--r--svl/source/items/rectitem.cxx2
-rw-r--r--svl/source/items/rngitem.cxx2
-rw-r--r--svl/source/items/slstitm.cxx3
-rw-r--r--svl/source/items/srchitem.cxx2
-rw-r--r--svl/source/items/stritem.cxx6
-rw-r--r--svl/source/items/style.cxx2
-rw-r--r--svl/source/items/szitem.cxx1
-rw-r--r--svl/source/items/visitem.cxx1
-rw-r--r--svl/source/misc/strmadpt.cxx1
-rw-r--r--svl/source/notify/SfxBroadcaster.cxx1
-rw-r--r--svl/source/notify/lstner.cxx1
-rw-r--r--svl/source/undo/undo.cxx4
-rw-r--r--svtools/inc/pch/precompiled_svt.hxx1
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx9
-rw-r--r--svtools/source/misc/xwindowitem.cxx2
-rw-r--r--svtools/source/uno/unoevent.cxx1
-rw-r--r--svx/inc/dragmt3d.hxx3
-rw-r--r--svx/inc/sxcikitm.hxx1
-rw-r--r--svx/inc/sxmkitm.hxx1
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.hxx1
-rw-r--r--svx/source/dialog/rulritem.cxx10
-rw-r--r--svx/source/dialog/svxgrahicitem.cxx1
-rw-r--r--svx/source/engine3d/cube3d.cxx1
-rw-r--r--svx/source/engine3d/dragmt3d.cxx3
-rw-r--r--svx/source/engine3d/e3dundo.cxx3
-rw-r--r--svx/source/engine3d/extrud3d.cxx1
-rw-r--r--svx/source/engine3d/lathe3d.cxx1
-rw-r--r--svx/source/engine3d/obj3d.cxx3
-rw-r--r--svx/source/engine3d/polygn3d.cxx1
-rw-r--r--svx/source/engine3d/polysc3d.cxx1
-rw-r--r--svx/source/engine3d/scene3d.cxx1
-rw-r--r--svx/source/engine3d/sphere3d.cxx1
-rw-r--r--svx/source/engine3d/view3d.cxx1
-rw-r--r--svx/source/fmcomp/gridcell.cxx18
-rw-r--r--svx/source/form/filtnav.cxx6
-rw-r--r--svx/source/form/fmexpl.cxx3
-rw-r--r--svx/source/form/fmitems.cxx1
-rw-r--r--svx/source/form/fmmodel.cxx1
-rw-r--r--svx/source/form/fmobj.cxx1
-rw-r--r--svx/source/form/fmpage.cxx1
-rw-r--r--svx/source/form/fmshell.cxx1
-rw-r--r--svx/source/form/fmview.cxx1
-rw-r--r--svx/source/inc/filtnav.hxx6
-rw-r--r--svx/source/inc/fmexpl.hxx3
-rw-r--r--svx/source/inc/fmitems.hxx1
-rw-r--r--svx/source/inc/fmobj.hxx1
-rw-r--r--svx/source/inc/gridcell.hxx19
-rw-r--r--svx/source/items/SmartTagItem.cxx3
-rw-r--r--svx/source/items/algitem.cxx5
-rw-r--r--svx/source/items/chrtitem.cxx10
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/customshapeitem.cxx1
-rw-r--r--svx/source/items/drawitem.cxx13
-rw-r--r--svx/source/items/e3ditem.cxx2
-rw-r--r--svx/source/items/galleryitem.cxx3
-rw-r--r--svx/source/items/hlnkitem.cxx3
-rw-r--r--svx/source/items/numinf.cxx1
-rw-r--r--svx/source/items/pageitem.cxx3
-rw-r--r--svx/source/items/postattr.cxx7
-rw-r--r--svx/source/items/rotmodit.cxx2
-rw-r--r--svx/source/items/viewlayoutitem.cxx3
-rw-r--r--svx/source/items/zoomslideritem.cxx3
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx6
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx3
-rw-r--r--svx/source/sdr/properties/textproperties.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx133
-rw-r--r--svx/source/svdraw/svdcrtv.cxx2
-rw-r--r--svx/source/svdraw/svddrgm1.hxx8
-rw-r--r--svx/source/svdraw/svddrgmt.cxx12
-rw-r--r--svx/source/svdraw/svddrgv.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx47
-rw-r--r--svx/source/svdraw/svdmodel.cxx1
-rw-r--r--svx/source/svdraw/svdoashp.cxx1
-rw-r--r--svx/source/svdraw/svdoattr.cxx1
-rw-r--r--svx/source/svdraw/svdobj.cxx7
-rw-r--r--svx/source/svdraw/svdocapt.cxx1
-rw-r--r--svx/source/svdraw/svdocirc.cxx1
-rw-r--r--svx/source/svdraw/svdoedge.cxx3
-rw-r--r--svx/source/svdraw/svdograf.cxx1
-rw-r--r--svx/source/svdraw/svdogrp.cxx1
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdomedia.cxx1
-rw-r--r--svx/source/svdraw/svdoole2.cxx1
-rw-r--r--svx/source/svdraw/svdopage.cxx1
-rw-r--r--svx/source/svdraw/svdopath.cxx1
-rw-r--r--svx/source/svdraw/svdorect.cxx1
-rw-r--r--svx/source/svdraw/svdotext.cxx1
-rw-r--r--svx/source/svdraw/svdotxat.cxx8
-rw-r--r--svx/source/svdraw/svdotxdr.cxx4
-rw-r--r--svx/source/svdraw/svdouno.cxx1
-rw-r--r--svx/source/svdraw/svdovirt.cxx1
-rw-r--r--svx/source/svdraw/svdpage.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx1
-rw-r--r--svx/source/svdraw/svdundo.cxx1
-rw-r--r--svx/source/svdraw/svdview.cxx1
-rw-r--r--svx/source/table/svdotable.cxx1
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx1
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx8
-rw-r--r--svx/source/toolbars/extrusionbar.cxx1
-rw-r--r--svx/source/toolbars/fontworkbar.cxx1
-rw-r--r--svx/source/xoutdev/xattr.cxx76
-rw-r--r--svx/source/xoutdev/xattr2.cxx42
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx3
-rw-r--r--sw/inc/anchoreddrawobject.hxx1
-rw-r--r--sw/inc/anchoredobject.hxx2
-rw-r--r--sw/inc/calbck.hxx9
-rw-r--r--sw/inc/ccoll.hxx1
-rw-r--r--sw/inc/charfmt.hxx1
-rw-r--r--sw/inc/crsrsh.hxx2
-rw-r--r--sw/inc/dcontact.hxx4
-rw-r--r--sw/inc/docsh.hxx1
-rw-r--r--sw/inc/fchrfmt.hxx1
-rw-r--r--sw/inc/fesh.hxx1
-rw-r--r--sw/inc/fmtautofmt.hxx1
-rw-r--r--sw/inc/fmtcol.hxx4
-rw-r--r--sw/inc/fmtfld.hxx1
-rw-r--r--sw/inc/fmtfollowtextflow.hxx1
-rw-r--r--sw/inc/fmthdft.hxx2
-rw-r--r--sw/inc/fmtinfmt.hxx2
-rw-r--r--sw/inc/fmtline.hxx2
-rw-r--r--sw/inc/fmtornt.hxx2
-rw-r--r--sw/inc/fmtpdsc.hxx1
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx1
-rw-r--r--sw/inc/format.hxx1
-rw-r--r--sw/inc/frmfmt.hxx3
-rw-r--r--sw/inc/globdoc.hxx1
-rw-r--r--sw/inc/grfatr.hxx2
-rw-r--r--sw/inc/index.hxx1
-rw-r--r--sw/inc/ndtxt.hxx1
-rw-r--r--sw/inc/node.hxx1
-rw-r--r--sw/inc/paratr.hxx7
-rw-r--r--sw/inc/pch/precompiled_sw.hxx1
-rw-r--r--sw/inc/section.hxx3
-rw-r--r--sw/inc/swbaslnk.hxx1
-rw-r--r--sw/inc/swddetbl.hxx1
-rw-r--r--sw/inc/swmodule.hxx1
-rw-r--r--sw/inc/swtable.hxx3
-rw-r--r--sw/inc/swtblfmt.hxx3
-rw-r--r--sw/inc/tox.hxx1
-rw-r--r--sw/inc/txtatr.hxx1
-rw-r--r--sw/inc/txtinet.hxx1
-rw-r--r--sw/inc/undobj.hxx2
-rw-r--r--sw/inc/unodraw.hxx1
-rw-r--r--sw/inc/unoframe.hxx2
-rw-r--r--sw/inc/unoredline.hxx1
-rw-r--r--sw/inc/unostyle.hxx1
-rw-r--r--sw/inc/unotbl.hxx6
-rw-r--r--sw/inc/view.hxx1
-rw-r--r--sw/inc/viewsh.hxx2
-rw-r--r--sw/inc/wdocsh.hxx1
-rw-r--r--sw/qa/core/uwriter.cxx8
-rw-r--r--sw/source/core/attr/calbck.cxx1
-rw-r--r--sw/source/core/attr/fmtfollowtextflow.cxx1
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx1
-rw-r--r--sw/source/core/attr/format.cxx1
-rw-r--r--sw/source/core/crsr/crsrsh.cxx1
-rw-r--r--sw/source/core/doc/doctxm.cxx1
-rw-r--r--sw/source/core/doc/fmtcol.cxx4
-rw-r--r--sw/source/core/docnode/node.cxx1
-rw-r--r--sw/source/core/docnode/section.cxx2
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx1
-rw-r--r--sw/source/core/draw/dcontact.cxx4
-rw-r--r--sw/source/core/draw/dflyobj.cxx2
-rw-r--r--sw/source/core/fields/ddetbl.cxx1
-rw-r--r--sw/source/core/frmedt/fews.cxx1
-rw-r--r--sw/source/core/graphic/grfatr.cxx2
-rw-r--r--sw/source/core/inc/cntfrm.hxx1
-rw-r--r--sw/source/core/inc/dflyobj.hxx2
-rw-r--r--sw/source/core/inc/doctxm.hxx1
-rw-r--r--sw/source/core/inc/flyfrm.hxx1
-rw-r--r--sw/source/core/inc/flyfrms.hxx4
-rw-r--r--sw/source/core/inc/frame.hxx1
-rw-r--r--sw/source/core/inc/layfrm.hxx1
-rw-r--r--sw/source/core/inc/txtfrm.hxx1
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx1
-rw-r--r--sw/source/core/layout/anchoredobject.cxx1
-rw-r--r--sw/source/core/layout/atrfrm.cxx11
-rw-r--r--sw/source/core/layout/fly.cxx1
-rw-r--r--sw/source/core/layout/flycnt.cxx1
-rw-r--r--sw/source/core/layout/flyincnt.cxx1
-rw-r--r--sw/source/core/layout/flylay.cxx2
-rw-r--r--sw/source/core/layout/newfrm.cxx2
-rw-r--r--sw/source/core/layout/wsfrm.cxx1
-rw-r--r--sw/source/core/para/paratr.cxx8
-rw-r--r--sw/source/core/table/swtable.cxx6
-rw-r--r--sw/source/core/text/txtfrm.cxx1
-rw-r--r--sw/source/core/tox/tox.cxx1
-rw-r--r--sw/source/core/txtnode/atrfld.cxx1
-rw-r--r--sw/source/core/txtnode/chrfmt.cxx1
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx4
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx3
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx3
-rw-r--r--sw/source/core/undo/SwUndoField.cxx1
-rw-r--r--sw/source/core/unocore/unodraw.cxx1
-rw-r--r--sw/source/core/unocore/unoframe.cxx2
-rw-r--r--sw/source/core/unocore/unoredline.cxx1
-rw-r--r--sw/source/core/unocore/unostyle.cxx1
-rw-r--r--sw/source/core/unocore/unotbl.cxx6
-rw-r--r--sw/source/core/view/viewsh.cxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx6
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx1
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx1
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx10
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmltbli.cxx3
-rw-r--r--sw/source/filter/xml/xmltbli.hxx1
-rw-r--r--sw/source/uibase/app/docsh.cxx1
-rw-r--r--sw/source/uibase/app/swmodule.cxx1
-rw-r--r--sw/source/uibase/chrdlg/ccoll.cxx1
-rw-r--r--sw/source/uibase/config/cfgitems.cxx4
-rw-r--r--sw/source/uibase/dialog/swwrtshitem.cxx1
-rw-r--r--sw/source/uibase/envelp/envimg.cxx3
-rw-r--r--sw/source/uibase/globdoc/globdoc.cxx1
-rw-r--r--sw/source/uibase/inc/annotsh.hxx1
-rw-r--r--sw/source/uibase/inc/basesh.hxx1
-rw-r--r--sw/source/uibase/inc/beziersh.hxx1
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx4
-rw-r--r--sw/source/uibase/inc/drawsh.hxx1
-rw-r--r--sw/source/uibase/inc/drformsh.hxx1
-rw-r--r--sw/source/uibase/inc/drwbassh.hxx1
-rw-r--r--sw/source/uibase/inc/drwtxtsh.hxx1
-rw-r--r--sw/source/uibase/inc/envimg.hxx3
-rw-r--r--sw/source/uibase/inc/glshell.hxx2
-rw-r--r--sw/source/uibase/inc/listsh.hxx1
-rw-r--r--sw/source/uibase/inc/pview.hxx1
-rw-r--r--sw/source/uibase/inc/srcview.hxx1
-rw-r--r--sw/source/uibase/inc/swwrtshitem.hxx1
-rw-r--r--sw/source/uibase/inc/tabsh.hxx1
-rw-r--r--sw/source/uibase/inc/textsh.hxx1
-rw-r--r--sw/source/uibase/inc/wformsh.hxx1
-rw-r--r--sw/source/uibase/inc/wfrmsh.hxx1
-rw-r--r--sw/source/uibase/inc/wgrfsh.hxx1
-rw-r--r--sw/source/uibase/inc/wlistsh.hxx1
-rw-r--r--sw/source/uibase/inc/wtabsh.hxx1
-rw-r--r--sw/source/uibase/inc/wtextsh.hxx1
-rw-r--r--sw/source/uibase/inc/wview.hxx1
-rw-r--r--sw/source/uibase/misc/glshell.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx1
-rw-r--r--sw/source/uibase/shells/basesh.cxx1
-rw-r--r--sw/source/uibase/shells/beziersh.cxx1
-rw-r--r--sw/source/uibase/shells/drawsh.cxx1
-rw-r--r--sw/source/uibase/shells/drformsh.cxx1
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx1
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx1
-rw-r--r--sw/source/uibase/shells/listsh.cxx1
-rw-r--r--sw/source/uibase/shells/tabsh.cxx1
-rw-r--r--sw/source/uibase/shells/textsh.cxx1
-rw-r--r--sw/source/uibase/uiview/pview.cxx1
-rw-r--r--sw/source/uibase/uiview/srcview.cxx1
-rw-r--r--sw/source/uibase/uiview/view0.cxx1
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx1
-rw-r--r--sw/source/uibase/web/wdocsh.cxx1
-rw-r--r--sw/source/uibase/web/wformsh.cxx1
-rw-r--r--sw/source/uibase/web/wfrmsh.cxx1
-rw-r--r--sw/source/uibase/web/wgrfsh.cxx1
-rw-r--r--sw/source/uibase/web/wlistsh.cxx1
-rw-r--r--sw/source/uibase/web/wtabsh.cxx1
-rw-r--r--sw/source/uibase/web/wtextsh.cxx1
-rw-r--r--sw/source/uibase/web/wview.cxx1
-rw-r--r--tools/source/ref/errinf.cxx5
-rw-r--r--tools/source/ref/pstm.cxx3
-rw-r--r--tools/source/stream/stream.cxx3
-rw-r--r--vcl/inc/pch/precompiled_vcl.hxx2
-rw-r--r--vcl/inc/vcleventlisteners.hxx1
-rw-r--r--vcl/source/app/vclevent.cxx3
-rw-r--r--vcl/source/edit/textund2.hxx6
-rw-r--r--vcl/source/edit/textundo.cxx6
-rw-r--r--vcl/source/edit/textundo.hxx1
-rw-r--r--vcl/source/gdi/extoutdevdata.cxx2
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx1
-rw-r--r--xmloff/inc/PageMasterImportContext.hxx1
-rw-r--r--xmloff/inc/XMLBackgroundImageContext.hxx1
-rw-r--r--xmloff/inc/XMLChartStyleContext.hxx1
-rw-r--r--xmloff/inc/XMLElementPropertyContext.hxx1
-rw-r--r--xmloff/inc/XMLEmbeddedObjectImportContext.hxx1
-rw-r--r--xmloff/inc/XMLFootnoteConfigurationImportContext.hxx1
-rw-r--r--xmloff/inc/XMLImageMapContext.hxx1
-rw-r--r--xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx1
-rw-r--r--xmloff/inc/XMLLineNumberingImportContext.hxx1
-rw-r--r--xmloff/inc/XMLNumberStylesImport.hxx1
-rw-r--r--xmloff/inc/XMLReplacementImageContext.hxx1
-rw-r--r--xmloff/inc/XMLShapePropertySetContext.hxx1
-rw-r--r--xmloff/inc/XMLStringBufferImportContext.hxx1
-rw-r--r--xmloff/inc/XMLTextColumnsContext.hxx1
-rw-r--r--xmloff/inc/XMLTextHeaderFooterContext.hxx1
-rw-r--r--xmloff/inc/animationimport.hxx1
-rw-r--r--xmloff/inc/animimp.hxx1
-rw-r--r--xmloff/inc/txtfldi.hxx43
-rw-r--r--xmloff/inc/txtvfldi.hxx14
-rw-r--r--xmloff/inc/xmltabi.hxx1
-rw-r--r--xmloff/source/chart/XMLChartPropertyContext.cxx1
-rw-r--r--xmloff/source/chart/XMLChartPropertyContext.hxx1
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx1
-rw-r--r--xmloff/source/chart/XMLLabelSeparatorContext.cxx1
-rw-r--r--xmloff/source/chart/XMLLabelSeparatorContext.hxx1
-rw-r--r--xmloff/source/chart/XMLSymbolImageContext.cxx1
-rw-r--r--xmloff/source/chart/XMLSymbolImageContext.hxx1
-rw-r--r--xmloff/source/chart/contexts.cxx1
-rw-r--r--xmloff/source/chart/contexts.hxx1
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx1
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx3
-rw-r--r--xmloff/source/core/xmlictxt.cxx1
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx1
-rw-r--r--xmloff/source/draw/XMLImageMapContext.cxx9
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx3
-rw-r--r--xmloff/source/draw/XMLReplacementImageContext.cxx1
-rw-r--r--xmloff/source/draw/XMLShapePropertySetContext.cxx1
-rw-r--r--xmloff/source/draw/XMLShapeStyleContext.cxx1
-rw-r--r--xmloff/source/draw/animationimport.cxx1
-rw-r--r--xmloff/source/draw/animimp.cxx5
-rw-r--r--xmloff/source/draw/descriptionimp.cxx1
-rw-r--r--xmloff/source/draw/descriptionimp.hxx1
-rw-r--r--xmloff/source/draw/eventimp.cxx5
-rw-r--r--xmloff/source/draw/eventimp.hxx1
-rw-r--r--xmloff/source/draw/layerimp.cxx1
-rw-r--r--xmloff/source/draw/layerimp.hxx1
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx2
-rw-r--r--xmloff/source/draw/ximp3dobject.cxx6
-rw-r--r--xmloff/source/draw/ximp3dobject.hxx7
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx1
-rw-r--r--xmloff/source/draw/ximp3dscene.hxx2
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx1
-rw-r--r--xmloff/source/draw/ximpcustomshape.hxx1
-rw-r--r--xmloff/source/draw/ximpgrp.cxx1
-rw-r--r--xmloff/source/draw/ximpgrp.hxx2
-rw-r--r--xmloff/source/draw/ximplink.cxx1
-rw-r--r--xmloff/source/draw/ximplink.hxx2
-rw-r--r--xmloff/source/draw/ximppage.cxx1
-rw-r--r--xmloff/source/draw/ximppage.hxx2
-rw-r--r--xmloff/source/draw/ximpshap.cxx22
-rw-r--r--xmloff/source/draw/ximpshap.hxx22
-rw-r--r--xmloff/source/draw/ximpshow.cxx1
-rw-r--r--xmloff/source/draw/ximpshow.hxx1
-rw-r--r--xmloff/source/draw/ximpstyl.cxx10
-rw-r--r--xmloff/source/draw/ximpstyl.hxx6
-rw-r--r--xmloff/source/forms/officeforms.cxx1
-rw-r--r--xmloff/source/forms/officeforms.hxx1
-rw-r--r--xmloff/source/script/XMLEventsImportContext.cxx1
-rw-r--r--xmloff/source/style/FillStyleContext.cxx6
-rw-r--r--xmloff/source/style/FillStyleContext.hxx6
-rw-r--r--xmloff/source/style/PageMasterImportContext.cxx1
-rw-r--r--xmloff/source/style/XMLBackgroundImageContext.cxx1
-rw-r--r--xmloff/source/style/XMLElementPropertyContext.cxx1
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx5
-rw-r--r--xmloff/source/style/XMLFontStylesContext_impl.hxx4
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorImport.cxx1
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorImport.hxx1
-rw-r--r--xmloff/source/style/prstylei.cxx1
-rw-r--r--xmloff/source/style/xmlnumi.cxx1
-rw-r--r--xmloff/source/style/xmlstyle.cxx2
-rw-r--r--xmloff/source/style/xmltabi.cxx3
-rw-r--r--xmloff/source/text/XMLAutoMarkFileContext.cxx1
-rw-r--r--xmloff/source/text/XMLAutoMarkFileContext.hxx1
-rw-r--r--xmloff/source/text/XMLAutoTextContainerEventImport.cxx1
-rw-r--r--xmloff/source/text/XMLAutoTextContainerEventImport.hxx1
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLChangeImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangeImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLChangeInfoContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangeInfoContext.hxx1
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLFootnoteBodyImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLFootnoteBodyImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx3
-rw-r--r--xmloff/source/text/XMLFootnoteImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLFootnoteImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographySourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographySourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexBodyContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexBodyContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexIllustrationSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexIllustrationSourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCStylesContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCStylesContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexTitleTemplateContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTitleTemplateContext.hxx1
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.hxx1
-rw-r--r--xmloff/source/text/XMLLineNumberingImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.cxx1
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.hxx1
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLSectionImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLSectionSourceImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLSectionSourceImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLStringBufferImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx5
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx9
-rw-r--r--xmloff/source/text/XMLTextFrameContext.hxx1
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.hxx1
-rw-r--r--xmloff/source/text/XMLTextHeaderFooterContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.hxx1
-rw-r--r--xmloff/source/text/XMLTextListItemContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextListItemContext.hxx1
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.hxx1
-rw-r--r--xmloff/source/text/XMLTextMasterPageContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextMasterStylesContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextTableContext.cxx1
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.hxx1
-rw-r--r--xmloff/source/text/txtdropi.cxx1
-rw-r--r--xmloff/source/text/txtdropi.hxx1
-rw-r--r--xmloff/source/text/txtfldi.cxx42
-rw-r--r--xmloff/source/text/txtparai.cxx32
-rw-r--r--xmloff/source/text/txtparai.hxx2
-rw-r--r--xmloff/source/text/txtstyli.cxx1
-rw-r--r--xmloff/source/text/txtvfldi.cxx14
-rw-r--r--xmloff/source/transform/TransformerContext.hxx1
1164 files changed, 736 insertions, 2502 deletions
diff --git a/.gitignore b/.gitignore
index 00348ac8c88c..8a27343d6c7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,3 +132,7 @@ DerivedData
# gdb config
/.gdbinit
/.gdb_history
+
+# eclipse
+.project
+.cproject
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 758c334f886c..7a8b9a6c4ccb 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -44,7 +44,7 @@ namespace avmedia
{
// - MediaItem -
-TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
+SfxPoolItem* MediaItem::CreateDefault() { return new MediaItem; }
struct MediaItem::Impl
{
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index b969c27e382f..69d6de815c28 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -32,7 +32,6 @@
namespace basctl
{
-TYPEINIT1(DocShell, SfxObjectShell);
SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SfxObjectShellFlags::STD_NORMAL, "sbasic" )
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 487a5b60bbd5..c31404fc2f01 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -46,7 +46,6 @@ protected:
bool bTemplate = false ) const override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_OBJECTFACTORY();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 222e24b741de..849b9d900f51 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -126,8 +126,6 @@ public:
};
-TYPEINIT1( Shell, SfxViewShell );
-
SFX_IMPL_NAMED_VIEWFACTORY( Shell, "Default" )
{
SFX_VIEW_REGISTRATION( DocShell );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 450d031436a6..adca1ed9e502 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -40,8 +40,6 @@ namespace basctl
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-TYPEINIT1( SbxItem, SfxPoolItem );
-
BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,m_aDocument( rDocument )
diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx
index f2a190970b25..2ce78d7b5952 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -21,7 +21,7 @@
namespace basctl
{
-
+SfxPoolItem* SbxItem::CreateDefault() { DBG_ASSERT(false, "No SbxItem factory available"); return 0; }
SbxItem::SbxItem (
sal_uInt16 nWhichItem,
ScriptDocument const& rDocument,
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 839787a2d941..50c1e5e47f3e 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -23,8 +23,6 @@
namespace basctl
{
-TYPEINIT1(DlgEdModel,SdrModel);
-
DlgEdModel::DlgEdModel()
:SdrModel()
{
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 70e2df693f15..272ed2fe97b7 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::script;
-TYPEINIT1(DlgEdObj, SdrUnoObj);
DlgEditor& DlgEdObj::GetDialogEditor ()
{
@@ -1217,7 +1216,6 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer)
}
}
-TYPEINIT1(DlgEdForm, DlgEdObj);
DlgEdForm::DlgEdForm (DlgEditor& rDlgEditor_) :
rDlgEditor(rDlgEditor_)
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index 8ef9a497fabe..04256268214c 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -25,7 +25,6 @@
namespace basctl
{
-TYPEINIT1( DlgEdPage, SdrPage );
DlgEdPage::DlgEdPage(DlgEdModel& rModel, bool bMasterPage)
: SdrPage(rModel, bMasterPage)
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index 31e8e7cb0884..f5f1f733d255 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -31,7 +31,6 @@
namespace basctl
{
-TYPEINIT1( DlgEdView, SdrView );
DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor) :
SdrView(&rModel, &rOut),
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index ec835be4700f..52446c968ced 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -145,7 +145,6 @@ private:
virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_VIEWSH )
SFX_DECL_VIEWFACTORY(Shell);
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index 52a8868c181a..d3a82d2e2b68 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -38,7 +38,6 @@ private:
void operator=(const DlgEdModel& rSrcModel) = delete;
public:
- TYPEINFO_OVERRIDE();
DlgEdModel();
virtual ~DlgEdModel();
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 712658df7cb1..52a247a09aaa 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -86,7 +86,6 @@ protected:
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
public:
- TYPEINFO_OVERRIDE();
virtual ~DlgEdObj();
virtual void SetPage(SdrPage* pNewPage) override;
@@ -157,7 +156,6 @@ protected:
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
public:
- TYPEINFO_OVERRIDE();
virtual ~DlgEdForm();
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index f839e89a7179..1d2e4672521a 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -40,7 +40,6 @@ private:
DlgEdForm* pDlgEdForm;
public:
- TYPEINFO_OVERRIDE();
explicit DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false );
virtual ~DlgEdPage();
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 20188c2d53a4..72ecc3c52e65 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -38,7 +38,6 @@ private:
DlgEditor& rDlgEditor;
public:
- TYPEINFO_OVERRIDE();
DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor);
virtual ~DlgEdView();
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 174fc1bb4f4e..4e97389906fd 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -44,7 +44,7 @@ class SbxItem : public SfxPoolItem
ItemType m_eType;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType);
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 6a16f3c8e7ec..8d79bddcd842 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -37,7 +37,6 @@ protected:
virtual ~SbObjModule();
public:
- TYPEINFO_OVERRIDE();
SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override;
@@ -61,7 +60,6 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
//protected:
void InitObject();
public:
- TYPEINFO_OVERRIDE();
SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat );
virtual ~SbUserFormModule();
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override;
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx
index 83347e5622aa..09138ae84163 100644
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -37,7 +37,6 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty
virtual ~SbProperty();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICPROP,1);
- TYPEINFO_OVERRIDE();
SbModule* GetModule() { return pMod; }
};
@@ -54,7 +53,6 @@ public:
: SbxProperty( r, t ) // , pMod( p )
, mbSet( false )
{}
- TYPEINFO_OVERRIDE();
bool isSet()
{ return mbSet; }
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 5013434940c4..100657ccf8eb 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -48,7 +48,6 @@ protected:
void PropHeight( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
public:
- TYPEINFO_OVERRIDE();
SbStdPicture();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
@@ -79,7 +78,6 @@ protected:
void PropName( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
public:
- TYPEINFO_OVERRIDE();
SbStdFont();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
@@ -114,7 +112,6 @@ protected:
static void MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool bWrite );
public:
- TYPEINFO_OVERRIDE();
SbStdClipboard();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 34e052cd91b3..2742a2476e02 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -95,7 +95,6 @@ static const char szManagerStream[] = "BasicManager2";
static const char szImbedded[] = "LIBIMBEDDED";
static const char szCryptingKey[] = "CryptedBasic";
-TYPEINIT1( BasicManager, SfxBroadcaster );
const StreamMode eStreamReadMode = StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL;
const StreamMode eStorageReadMode = StreamMode::READ | StreamMode::SHARE_DENYWRITE;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e84bc3a76c06..bfdfcef8c1e4 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -52,7 +52,6 @@
#include <svtools/miscopt.hxx>
using namespace ::com::sun::star::script;
-TYPEINIT1(StarBASIC,SbxObject)
#define RTLNAME "@SBRTL"
// i#i68894#
@@ -628,7 +627,6 @@ SbxObject* createUserTypeImpl( const OUString& rClassName )
}
-TYPEINIT1(SbClassModuleObject,SbModule)
SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
: SbModule( pClassModule->GetName() )
@@ -2047,7 +2045,6 @@ void StarBASIC::DetachAllDocBasicItems()
// #118116 Implementation Collection object
-TYPEINIT1(BasicCollection,SbxObject)
static const char pCountStr[] = "Count";
static const char pAddStr[] = "Add";
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 0a05bbfee05d..316234e0ceee 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -96,14 +96,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::bridge;
using namespace cppu;
-TYPEINIT1(SbUnoMethod,SbxMethod)
-TYPEINIT1(SbUnoProperty,SbxProperty)
-TYPEINIT1(SbUnoObject,SbxObject)
-TYPEINIT1(SbUnoStructRefObject,SbxObject)
-TYPEINIT1(SbUnoClass,SbxObject)
-TYPEINIT1(SbUnoService,SbxObject)
-TYPEINIT1(SbUnoServiceCtor,SbxMethod)
-TYPEINIT1(SbUnoSingleton,SbxObject)
// Identifiers for creating the strings for dbg_Properties
static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
@@ -355,7 +347,6 @@ Any convertAny( const Any& rVal, const Type& aDestType )
// #105565 Special Object to wrap a strongly typed Uno Any
-TYPEINIT1(SbUnoAnyObject,SbxObject)
// TODO: source out later
@@ -2013,7 +2004,6 @@ OUString Impl_DumpMethods(SbUnoObject& rUnoObj)
return aRet.makeStringAndClear();
}
-TYPEINIT1(AutomationNamedArgsSbxArray,SbxArray)
// Implementation SbUnoObject
void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 084db8cd82d7..3809d107114a 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -413,14 +413,6 @@ SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) throw (Runt
return pProperty;
}
-TYPEINIT1(SbModule,SbxObject)
-TYPEINIT1(SbMethod,SbxMethod)
-TYPEINIT1(SbProperty,SbxProperty)
-TYPEINIT1(SbProcedureProperty,SbxProperty)
-TYPEINIT1(SbJScriptModule,SbModule)
-TYPEINIT1(SbJScriptMethod,SbMethod)
-TYPEINIT1(SbObjModule,SbModule)
-TYPEINIT1(SbUserFormModule,SbObjModule)
uno::Reference< frame::XModel > getDocumentModel( StarBASIC* pb )
{
@@ -649,7 +641,6 @@ SbIfaceMapperMethod::~SbIfaceMapperMethod()
{
}
-TYPEINIT1(SbIfaceMapperMethod,SbMethod)
// From the code generator: remove invalid entries
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 59cbabd18812..ffd6c1eff241 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -34,7 +34,6 @@ public:
virtual ~SbJScriptMethod();
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2);
- TYPEINFO_OVERRIDE();
};
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 9ba492efcacd..14cfc096b602 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -32,7 +32,6 @@ class SbJScriptModule : public SbModule
virtual bool StoreData( SvStream& ) const override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
- TYPEINFO_OVERRIDE();
SbJScriptModule( const OUString& ); // hand through
};
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index f601f8ebe08e..4c01fb14a0b4 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -81,7 +81,6 @@ class SbUnoStructRefObject: public SbxObject
OUString Impl_DumpProperties();
OUString getDbgObjectName();
public:
- TYPEINFO_OVERRIDE();
StructRefInfo getStructMember( const OUString& rMember );
StructRefInfo getStructInfo() { return maMemberInfo; }
SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
@@ -119,7 +118,6 @@ class SbUnoObject: public SbxObject
public:
static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
- TYPEINFO_OVERRIDE();
SbUnoObject( const OUString& aName_, const css::uno::Any& aUnoObj_ );
virtual ~SbUnoObject();
@@ -165,7 +163,6 @@ class SbUnoMethod : public SbxMethod
bool mbInvocation; // Method is based on invocation
public:
- TYPEINFO_OVERRIDE();
SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > xUnoMethod_,
bool bInvocation );
@@ -196,7 +193,6 @@ class SbUnoProperty : public SbxProperty
SbUnoProperty& operator = ( const SbUnoProperty&) = delete;
public:
- TYPEINFO_OVERRIDE();
SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType,
const css::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
@@ -220,7 +216,6 @@ class SbUnoClass : public SbxObject
const css::uno::Reference< css::reflection::XIdlClass > m_xClass;
public:
- TYPEINFO_OVERRIDE();
SbUnoClass( const OUString& aName_ )
: SbxObject( aName_ )
{}
@@ -250,7 +245,6 @@ class SbUnoService : public SbxObject
bool m_bNeedsInit;
public:
- TYPEINFO_OVERRIDE();
SbUnoService( const OUString& aName_,
const css::uno::Reference< css::reflection::XServiceTypeDescription2 >& xServiceTypeDesc )
: SbxObject( aName_ )
@@ -278,7 +272,6 @@ class SbUnoServiceCtor : public SbxMethod
SbUnoServiceCtor* pNext;
public:
- TYPEINFO_OVERRIDE();
SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > xServiceCtorDesc );
virtual ~SbUnoServiceCtor();
@@ -295,7 +288,6 @@ class SbUnoSingleton : public SbxObject
const css::uno::Reference< css::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc;
public:
- TYPEINFO_OVERRIDE();
SbUnoSingleton( const OUString& aName_,
const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
@@ -319,7 +311,6 @@ public:
const css::uno::Any& getValue()
{ return mVal; }
- TYPEINFO_OVERRIDE();
};
@@ -330,7 +321,6 @@ class AutomationNamedArgsSbxArray : public SbxArray
{
css::uno::Sequence< OUString > maNameSeq;
public:
- TYPEINFO_OVERRIDE();
AutomationNamedArgsSbxArray( sal_Int32 nSeqSize )
: maNameSeq( nSeqSize )
{}
@@ -377,7 +367,6 @@ class BasicCollection : public SbxObject
void CollRemove( SbxArray* pPar_ );
public:
- TYPEINFO_OVERRIDE();
BasicCollection( const OUString& rClassname );
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
virtual void Clear() override;
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 17c508ef98a2..0ca186716cfe 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -110,7 +110,6 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite )
}
-TYPEINIT1( SbStdPicture, SbxObject );
SbStdPicture::SbStdPicture() :
SbxObject( OUString("Picture"))
@@ -224,7 +223,6 @@ void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite )
}
}
-TYPEINIT1( SbStdFont, SbxObject );
SbStdFont::SbStdFont()
: SbxObject( OUString("Font") )
@@ -392,7 +390,6 @@ void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool )
}
-TYPEINIT1( SbStdClipboard, SbxObject );
SbStdClipboard::SbStdClipboard() :
SbxObject( OUString("Clipboard") )
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index e4c815a0b5d6..9484d9e550dd 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -34,8 +34,6 @@ struct SbxVarEntry
boost::optional<OUString> maAlias;
};
-TYPEINIT1(SbxArray,SbxBase)
-TYPEINIT1(SbxDimArray,SbxArray)
// SbxArray
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 8689b5b379ff..b868238342c0 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -30,7 +30,6 @@
// AppData-Structure for SBX:
-TYPEINIT0(SbxBase)
SbxAppData::SbxAppData()
: eSbxError(ERRCODE_SBX_OK)
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 8918123e0e58..9a91d354a436 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -22,8 +22,6 @@
#include <basic/sbx.hxx>
#include "sbxres.hxx"
-TYPEINIT1(SbxCollection,SbxObject)
-TYPEINIT1(SbxStdCollection,SbxCollection)
static OUString pCount;
static OUString pAdd;
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index c198c7a19b4a..dc20af6e7eb7 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -27,9 +27,6 @@
#include <svl/SfxBroadcaster.hxx>
#include "sbxres.hxx"
-TYPEINIT1(SbxMethod,SbxVariable)
-TYPEINIT1(SbxProperty,SbxVariable)
-TYPEINIT2(SbxObject,SbxVariable,SfxListener)
static OUString pNameProp; // Name-Property
static OUString pParentProp; // Parent-Property
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f5ef66712e95..dc1a1447781d 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -28,7 +28,6 @@
#include "sbxconv.hxx"
#include "runtime.hxx"
-TYPEINIT1(SbxValue,SbxBase)
///////////////////////////// constructors
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 0758a37fca96..548ce03642ac 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -36,7 +36,6 @@ using namespace com::sun::star::uno;
// SbxVariable
-TYPEINIT1(SbxVariable,SbxValue)
// SbxVariableImpl
diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx
index d1d67f605c2f..c2a4fef2bfe9 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -418,13 +418,11 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
return true;
}
- // can't mess with the TYPEINIT macros in include/tools/rtti.hxx or the LINK macros in include/tools/link.hxx
std::string aImmediateMacro = "";
if (compat::isMacroBodyExpansion(compiler, pFunctionDecl->getLocStart()) ) {
StringRef name { Lexer::getImmediateMacroName(
pFunctionDecl->getLocStart(), compiler.getSourceManager(), compiler.getLangOpts()) };
aImmediateMacro = name;
- if (name == "TYPEINIT_FACTORY" || name == "TYPEINFO" || name == "TYPEINFO_OVERRIDE"
|| name.startswith("IMPL_LINK_") )
{
return true;
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 20ff3a0e55b2..352323b26c3c 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -32,30 +32,7 @@ using namespace connectivity::file;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
-TYPEINIT0(OCode);
-TYPEINIT1(OOperand, OCode);
-TYPEINIT1(OOperandRow, OOperand);
-TYPEINIT1(OOperandAttr, OOperandRow);
-TYPEINIT1(OOperandParam, OOperandRow);
-TYPEINIT1(OOperandValue, OOperand);
-TYPEINIT1(OOperandConst, OOperandValue);
-TYPEINIT1(OOperandResult, OOperandValue);
-TYPEINIT1(OStopOperand, OOperandValue);
-
-TYPEINIT1(OOperator, OCode);
-TYPEINIT1(OBoolOperator,OOperator);
-TYPEINIT1(OOp_NOT, OBoolOperator);
-TYPEINIT1(OOp_AND, OBoolOperator);
-TYPEINIT1(OOp_OR, OBoolOperator);
-TYPEINIT1(OOp_ISNULL, OBoolOperator);
-TYPEINIT1(OOp_ISNOTNULL, OOp_ISNULL);
-TYPEINIT1(OOp_LIKE, OBoolOperator);
-TYPEINIT1(OOp_NOTLIKE, OOp_LIKE);
-TYPEINIT1(OOp_COMPARE, OBoolOperator);
-TYPEINIT1(ONumOperator, OOperator);
-TYPEINIT1(ONthOperator, OOperator);
-TYPEINIT1(OBinaryOperator, OOperator);
-TYPEINIT1(OUnaryOperator, OOperator);
+
OCode::OCode()
{
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 8541d4e3c004..766b0cd42883 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -23,7 +23,6 @@
#include <connectivity/sqliterator.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
#include <connectivity/CommonTools.hxx>
-#include <tools/rtti.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <connectivity/FValue.hxx>
@@ -57,7 +56,6 @@ namespace connectivity
inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
- TYPEINFO();
};
@@ -77,7 +75,6 @@ namespace connectivity
sal_Int32 getDBType() const {return m_eDBType;}
inline bool isValid() const;
- TYPEINFO_OVERRIDE();
};
class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand
@@ -92,7 +89,6 @@ namespace connectivity
virtual void setValue(const ORowSetValue& _rVal) override;
void bindValue(const OValueRefRow& _pRow); // Bind to the value that the operand represents
- TYPEINFO_OVERRIDE();
};
// Attributes from a result row
@@ -105,7 +101,6 @@ namespace connectivity
OOperandAttr(sal_uInt16 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
- TYPEINFO_OVERRIDE();
};
// Parameter for a predicate
@@ -113,7 +108,6 @@ namespace connectivity
{
public:
OOperandParam(connectivity::OSQLParseNode* pNode, sal_Int32 _nPos);
- TYPEINFO_OVERRIDE();
};
// Value operands
@@ -134,7 +128,6 @@ namespace connectivity
virtual const ORowSetValue& getValue() const override;
virtual void setValue(const ORowSetValue& _rVal) override;
- TYPEINFO_OVERRIDE();
};
@@ -144,7 +137,6 @@ namespace connectivity
public:
OOperandConst(const connectivity::OSQLParseNode& rColumnRef, const OUString& aStrValue);
- TYPEINFO_OVERRIDE();
};
@@ -159,7 +151,6 @@ namespace connectivity
public:
OOperandResult(const ORowSetValue& _rVar)
:OOperandValue(_rVar, _rVar.getTypeKind()) {}
- TYPEINFO_OVERRIDE();
};
@@ -190,7 +181,6 @@ namespace connectivity
{
public:
OStopOperand(){}
- TYPEINFO_OVERRIDE();
};
// Operators
@@ -198,7 +188,6 @@ namespace connectivity
{
public:
virtual void Exec(OCodeStack&) = 0;
- TYPEINFO_OVERRIDE();
};
@@ -206,7 +195,6 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OBoolOperator : public OOperator
{
public:
- TYPEINFO_OVERRIDE();
virtual void Exec(OCodeStack&) override;
virtual bool operate(const OOperand*, const OOperand*) const;
};
@@ -214,7 +202,6 @@ namespace connectivity
class OOp_NOT : public OBoolOperator
{
public:
- TYPEINFO_OVERRIDE();
protected:
virtual void Exec(OCodeStack&) override;
@@ -224,7 +211,6 @@ namespace connectivity
class OOp_AND : public OBoolOperator
{
public:
- TYPEINFO_OVERRIDE();
protected:
virtual bool operate(const OOperand*, const OOperand*) const override;
@@ -233,7 +219,6 @@ namespace connectivity
class OOp_OR : public OBoolOperator
{
public:
- TYPEINFO_OVERRIDE();
protected:
virtual bool operate(const OOperand*, const OOperand*) const override;
};
@@ -241,7 +226,6 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OOp_ISNULL : public OBoolOperator
{
public:
- TYPEINFO_OVERRIDE();
public:
virtual void Exec(OCodeStack&) override;
virtual bool operate(const OOperand*, const OOperand* = nullptr) const override;
@@ -250,14 +234,12 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OOp_ISNOTNULL : public OOp_ISNULL
{
public:
- TYPEINFO_OVERRIDE();
virtual bool operate(const OOperand*, const OOperand* = nullptr) const override;
};
class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator
{
public:
- TYPEINFO_OVERRIDE();
protected:
const sal_Unicode cEscape;
@@ -270,7 +252,6 @@ namespace connectivity
class OOp_NOTLIKE : public OOp_LIKE
{
public:
- TYPEINFO_OVERRIDE();
public:
OOp_NOTLIKE(const sal_Unicode cEsc = L'\0'):OOp_LIKE(cEsc){};
@@ -282,7 +263,6 @@ namespace connectivity
sal_Int32 aPredicateType;
public:
- TYPEINFO_OVERRIDE();
OOp_COMPARE(sal_Int32 aPType)
:aPredicateType(aPType) {}
@@ -296,7 +276,6 @@ namespace connectivity
public:
virtual void Exec(OCodeStack&) override;
- TYPEINFO_OVERRIDE();
protected:
virtual double operate(const double& fLeft,const double& fRight) const = 0;
@@ -337,7 +316,6 @@ namespace connectivity
public:
virtual void Exec(OCodeStack&) override;
- TYPEINFO_OVERRIDE();
protected:
virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const = 0;
@@ -348,7 +326,6 @@ namespace connectivity
public:
virtual void Exec(OCodeStack&) override;
- TYPEINFO_OVERRIDE();
protected:
virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const = 0;
@@ -360,7 +337,6 @@ namespace connectivity
virtual void Exec(OCodeStack&) override;
virtual ORowSetValue operate(const ORowSetValue& lhs) const = 0;
- TYPEINFO_OVERRIDE();
};
}
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 98943bbafcff..4f81b67f887c 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -536,7 +536,6 @@
#include <svx/sxmbritm.hxx>
#include <svx/sxmfsitm.hxx>
#include <svx/sxmlhitm.hxx>
-#include <svx/sxmsuitm.hxx>
#include <svx/sxmtfitm.hxx>
#include <svx/sxmtpitm.hxx>
#include <svx/sxmtritm.hxx>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 1e37184959b4..727e88bdf32b 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -27,7 +27,6 @@
using namespace com::sun::star;
-TYPEINIT1( SvxChartColorTableItem, SfxPoolItem );
SvxChartColorTable::SvxChartColorTable()
: nNextElementNumber(0)
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 8ef95e307e20..401485f57c6c 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
#define INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
-#include <tools/rtti.hxx>
#include <unotools/configitem.hxx>
#include <svl/poolitem.hxx>
#include <svx/xtable.hxx>
@@ -90,7 +89,6 @@ public:
class SvxChartColorTableItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& );
SvxChartColorTableItem( const SvxChartColorTableItem& );
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index cb42a3a36bdd..17e8a27386cc 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -42,7 +42,6 @@ namespace offapp
{
}
- TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem )
DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings )
:SfxPoolItem(_nId)
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 3aafcae54a9a..8353f45585d0 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -73,7 +73,6 @@ namespace offapp
DriverPoolingSettings m_aSettings;
public:
- TYPEINFO_OVERRIDE();
DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings );
diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index 75f71d57e10d..18a8680518b1 100644
--- a/cui/source/options/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -25,7 +25,6 @@
namespace svx
{
- TYPEINIT1( DatabaseMapItem, SfxPoolItem )
DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations )
:SfxPoolItem( _nId )
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 12172c01a2d2..9c85d9be7edb 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -69,7 +69,6 @@ namespace svx
DatabaseRegistrations m_aRegistrations;
public:
- TYPEINFO_OVERRIDE();
DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations );
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index dfd5abca4620..3c8d08dc2a62 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -39,7 +39,6 @@
#include <svx/sxmbritm.hxx>
#include <svx/sxmfsitm.hxx>
#include <svx/sxmlhitm.hxx>
-#include <svx/sxmsuitm.hxx>
#include <svx/sxmtfitm.hxx>
#include <svx/sxmtpitm.hxx>
#include <svx/sxmtritm.hxx>
@@ -500,7 +499,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
eState = m_pTsbShowUnit->GetState();
if( m_pTsbShowUnit->IsValueChangedFromSaved() )
{
- rAttrs->Put( makeSdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, TRISTATE_TRUE == eState ) );
bModified = true;
}
@@ -729,7 +728,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
{
TriState eState = m_pTsbShowUnit->GetState();
if( eState != TRISTATE_INDET )
- aAttrSet.Put( makeSdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
+ aAttrSet.Put( SdrYesNoItem( SDRATTR_MEASURESHOWUNIT, TRISTATE_TRUE == eState ) );
}
if( p == m_pLbUnit )
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index ef19d1b1953c..a17ddf870019 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -46,8 +46,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace xmloff::token;
-TYPEINIT1( OTableStyleContext, XMLPropStyleContext );
-TYPEINIT1( OTableStylesContext, SvXMLStylesContext );
OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index 7b09a8c73cf2..fbb96256dce2 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -53,7 +53,6 @@ namespace dbaxml
public:
- TYPEINFO_OVERRIDE();
OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -96,7 +95,6 @@ namespace dbaxml
public:
- TYPEINFO_OVERRIDE();
OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx ,
const OUString& rLName ,
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index d295374a4478..91ae31864ed1 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -1095,7 +1095,6 @@ void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSo
}
// DbuTypeCollectionItem
-TYPEINIT1(DbuTypeCollectionItem, SfxPoolItem);
DbuTypeCollectionItem::DbuTypeCollectionItem(sal_Int16 _nWhich, ::dbaccess::ODsnTypeCollection* _pCollection)
:SfxPoolItem(_nWhich)
,m_pCollection(_pCollection)
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index de3f074b0525..4e7dc4b7287b 100644
--- a/dbaccess/source/ui/dlg/dsnItem.hxx
+++ b/dbaccess/source/ui/dlg/dsnItem.hxx
@@ -36,7 +36,6 @@ namespace dbaui
::dbaccess::ODsnTypeCollection* m_pCollection;
public:
- TYPEINFO_OVERRIDE();
DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = nullptr);
DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource);
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx
index bfdc2cfe8923..ef561f12b779 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.cxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx
@@ -23,7 +23,6 @@ namespace dbaui
{
// OptionalBoolItem
- TYPEINIT1( OptionalBoolItem, SfxPoolItem );
OptionalBoolItem::OptionalBoolItem( sal_Int16 _nWhich )
:SfxPoolItem( _nWhich )
,m_aValue()
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx
index 3bb698a7586f..16fb49b3125f 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.hxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx
@@ -33,7 +33,6 @@ namespace dbaui
::boost::optional< bool > m_aValue;
public:
- TYPEINFO_OVERRIDE();
explicit OptionalBoolItem( sal_Int16 nWhich );
OptionalBoolItem( const OptionalBoolItem& _rSource );
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 348911878e03..956d354d3303 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -35,7 +35,6 @@ namespace dbaui
OUString m_strComment; // undo, redo comment
public:
- TYPEINFO_OVERRIDE();
OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); }
virtual OUString GetComment() const override { return m_strComment; }
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 919a7e7d540a..d59bd583c5e9 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -24,7 +24,6 @@
#include <vcl/idle.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/vclptr.hxx>
-#include <tools/rtti.hxx>
#include <svtools/transfer.hxx>
#include "callbacks.hxx"
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 38d4720ac058..130cdd7ce40f 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -22,7 +22,6 @@
#include <vector>
#include <tools/debug.hxx>
#include <vcl/window.hxx>
-#include <tools/rtti.hxx>
#include <com/sun/star/uno/Reference.h>
#include "TableConnectionData.hxx"
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index ca23565d6789..799ab8f12994 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -22,7 +22,6 @@
#include "ConnectionLineData.hxx"
#include "TableWindowData.hxx"
#include <vector>
-#include <tools/rtti.hxx>
#include <memory>
namespace dbaui
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index c41f396dd86f..71aec1282f65 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "TableWindowTitle.hxx"
-#include <tools/rtti.hxx>
#include <rtl/ref.hxx>
#include "TableWindowData.hxx"
#include "TableWindowListBox.hxx"
diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx
index 4584a32c4799..e201d9168538 100644
--- a/dbaccess/source/ui/inc/propertysetitem.hxx
+++ b/dbaccess/source/ui/inc/propertysetitem.hxx
@@ -34,7 +34,6 @@ namespace dbaui
css::uno::Reference< css::beans::XPropertySet > m_xSet;
public:
- TYPEINFO_OVERRIDE();
OPropertySetItem(sal_Int16 nWhich);
OPropertySetItem(sal_Int16 nWhich,
const css::uno::Reference< css::beans::XPropertySet >& _rxSet);
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index e0c7bf7f1325..2500033a56fb 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -36,7 +36,6 @@ class OStringListItem : public SfxPoolItem
css::uno::Sequence< OUString > m_aList;
public:
- TYPEINFO_OVERRIDE();
OStringListItem(sal_Int16 nWhich, const css::uno::Sequence< OUString >& _rList);
OStringListItem(const OStringListItem& _rSource);
diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx
index 92024d2b3954..26e5dabe70aa 100644
--- a/dbaccess/source/ui/misc/propertysetitem.cxx
+++ b/dbaccess/source/ui/misc/propertysetitem.cxx
@@ -26,7 +26,6 @@ namespace dbaui
using namespace ::com::sun::star::beans;
// OPropertySetItem
- TYPEINIT1(OPropertySetItem, SfxPoolItem);
OPropertySetItem::OPropertySetItem(sal_Int16 _nWhich)
:SfxPoolItem(_nWhich)
{
diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx
index 2663db4746c3..5e8ea0a691cb 100644
--- a/dbaccess/source/ui/misc/stringlistitem.cxx
+++ b/dbaccess/source/ui/misc/stringlistitem.cxx
@@ -25,7 +25,6 @@ namespace dbaui
using namespace ::com::sun::star::uno;
// OStringListItem
-TYPEINIT1(OStringListItem, SfxPoolItem);
OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< OUString >& _rList)
:SfxPoolItem(_nWhich)
,m_aList(_rList)
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index a40ca30dd8bc..878455f82190 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -22,7 +22,6 @@
#include "TableConnectionData.hxx"
#include "TableFieldDescription.hxx"
#include "QEnumTypes.hxx"
-#include <tools/rtti.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index 140e55dc5abb..9947905f6794 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -22,7 +22,6 @@
#include "TableWindow.hxx"
#include "QTableWindowData.hxx"
#include "TableFieldDescription.hxx"
-#include <tools/rtti.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index e6f8284eb828..acf5bbd4f584 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -61,7 +61,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdb;
-// TYPEINIT1(OTableEditorCtrl, DBView);
#define HANDLE_ID 0
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index bcb300c76254..bc17886f9e3d 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -30,15 +30,6 @@
using namespace dbaui;
using namespace ::svt;
-TYPEINIT1( OCommentUndoAction, SfxUndoAction );
-TYPEINIT1( OTableDesignUndoAct, OCommentUndoAction );
-TYPEINIT1( OTableEditorUndoAct, OTableDesignUndoAct );
-TYPEINIT1( OTableDesignCellUndoAct, OTableDesignUndoAct );
-TYPEINIT1( OTableEditorTypeSelUndoAct, OTableEditorUndoAct );
-TYPEINIT1( OTableEditorDelUndoAct, OTableEditorUndoAct );
-TYPEINIT1( OTableEditorInsUndoAct, OTableEditorUndoAct );
-TYPEINIT1( OTableEditorInsNewUndoAct, OTableEditorUndoAct );
-TYPEINIT1( OPrimKeyUndoAct, OTableEditorUndoAct );
// class OTableDesignUndoAct
OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID)
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 730e3e60f893..a0b7df224127 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -40,7 +40,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID);
virtual ~OTableDesignUndoAct();
};
@@ -52,7 +51,6 @@ namespace dbaui
VclPtr<OTableEditorCtrl> pTabEdCtrl;
public:
- TYPEINFO_OVERRIDE();
OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID );
virtual ~OTableEditorUndoAct();
};
@@ -68,7 +66,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn );
virtual ~OTableDesignCellUndoAct();
};
@@ -84,7 +81,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType );
virtual ~OTableEditorTypeSelUndoAct();
};
@@ -97,7 +93,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
explicit OTableEditorDelUndoAct( OTableEditorCtrl* pOwner );
virtual ~OTableEditorDelUndoAct();
};
@@ -111,7 +106,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
long nInsertPosition,
const ::std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows);
@@ -127,7 +121,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows );
virtual ~OTableEditorInsNewUndoAct();
};
@@ -142,7 +135,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
- TYPEINFO_OVERRIDE();
OPrimKeyUndoAct( OTableEditorCtrl* pOwner, const MultiSelection& aDeletedKeys, const MultiSelection& aInsertedKeys );
virtual ~OPrimKeyUndoAct();
};
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 4eaf9b2fabb5..2e4ed6d2c4df 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -269,7 +269,6 @@
#include <tools/mapunit.hxx>
#include <tools/poly.hxx>
#include <tools/resid.hxx>
-#include <tools/rtti.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 0b803705354d..2791bf44293c 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -30,7 +30,6 @@
-TYPEINIT1(SvxBulletItem,SfxPoolItem);
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 32bc856b6a4d..70a3a17a5b9e 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -21,7 +21,8 @@
#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
-TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(false, 0));
+
+SfxPoolItem* SvxCharHiddenItem::CreateDefault() { return new SvxCharHiddenItem(false, 0);}
SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId ) :
SfxBoolItem( nId, bHidden )
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 6018d635b7b9..4e252ac616d9 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -220,7 +220,6 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
return nullptr;
}
-TYPEINIT1( SvxFieldItem, SfxPoolItem );
SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase );
@@ -247,7 +246,7 @@ SvxFieldData* SvxFieldData::Clone() const
bool SvxFieldData::operator==( const SvxFieldData& rFld ) const
{
- DBG_ASSERT( Type() == rFld.Type(), "==: Different Types" );
+ DBG_ASSERT( typeid(*this) == typeid(rFld), "==: Different Types" );
(void)rFld;
return true; // Basic class is always the same.
}
@@ -362,7 +361,7 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
return true;
if( pField == nullptr || pOtherFld == nullptr )
return false;
- return ( pField->Type() == pOtherFld->Type() )
+ return ( typeid(*pField) == typeid(*pOtherFld) )
&& ( *pField == *pOtherFld );
}
@@ -401,7 +400,7 @@ SvxFieldData* SvxDateField::Clone() const
bool SvxDateField::operator==( const SvxFieldData& rOther ) const
{
- if ( rOther.Type() != Type() )
+ if ( typeid(rOther) != typeid(*this) )
return false;
const SvxDateField& rOtherFld = static_cast<const SvxDateField&>(rOther);
@@ -539,7 +538,7 @@ SvxFieldData* SvxURLField::Clone() const
bool SvxURLField::operator==( const SvxFieldData& rOther ) const
{
- if ( rOther.Type() != Type() )
+ if ( typeid(rOther) != typeid(*this) )
return false;
const SvxURLField& rOtherFld = static_cast<const SvxURLField&>(rOther);
@@ -628,7 +627,7 @@ SvxFieldData* SvxPageTitleField::Clone() const
bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxPageTitleField) );
+ return ( dynamic_cast< const SvxPageTitleField *>(&rCmp) != nullptr );
}
void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ )
@@ -661,7 +660,7 @@ SvxFieldData* SvxPageField::Clone() const
bool SvxPageField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxPageField) );
+ return ( dynamic_cast< const SvxPageField *>(&rCmp) != nullptr );
}
void SvxPageField::Load( SvPersistStream & /*rStm*/ )
@@ -689,7 +688,7 @@ SvxFieldData* SvxPagesField::Clone() const
bool SvxPagesField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxPagesField) );
+ return ( dynamic_cast< const SvxPagesField *>(&rCmp) != nullptr);
}
void SvxPagesField::Load( SvPersistStream & /*rStm*/ )
@@ -711,7 +710,7 @@ SvxFieldData* SvxTimeField::Clone() const
bool SvxTimeField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxTimeField) );
+ return ( dynamic_cast< const SvxTimeField *>(&rCmp) != nullptr);
}
void SvxTimeField::Load( SvPersistStream & /*rStm*/ )
@@ -738,7 +737,7 @@ SvxFieldData* SvxFileField::Clone() const
bool SvxFileField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxFileField) );
+ return ( dynamic_cast< const SvxFileField *>(&rCmp) != nullptr );
}
void SvxFileField::Load( SvPersistStream & /*rStm*/ )
@@ -768,7 +767,7 @@ SvxFieldData* SvxTableField::Clone() const
bool SvxTableField::operator==( const SvxFieldData& rCmp ) const
{
- if (rCmp.Type() != TYPE(SvxTableField))
+ if (dynamic_cast< const SvxTableField *>(&rCmp) != nullptr)
return false;
return mnTab == static_cast<const SvxTableField&>(rCmp).mnTab;
@@ -817,7 +816,7 @@ SvxFieldData* SvxExtTimeField::Clone() const
bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
{
- if ( rOther.Type() != Type() )
+ if ( typeid(rOther) != typeid(*this) )
return false;
const SvxExtTimeField& rOtherFld = static_cast<const SvxExtTimeField&>(rOther);
@@ -961,7 +960,7 @@ SvxFieldData* SvxExtFileField::Clone() const
bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const
{
- if ( rOther.Type() != Type() )
+ if ( typeid(rOther) != typeid(*this) )
return false;
const SvxExtFileField& rOtherFld = static_cast<const SvxExtFileField&>(rOther);
@@ -1113,7 +1112,7 @@ SvxFieldData* SvxAuthorField::Clone() const
bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const
{
- if ( rOther.Type() != Type() )
+ if ( typeid(rOther) != typeid(*this) )
return false;
const SvxAuthorField& rOtherFld = static_cast<const SvxAuthorField&>(rOther);
@@ -1214,7 +1213,7 @@ SvxFieldData* SvxHeaderField::Clone() const
bool SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxHeaderField) );
+ return ( dynamic_cast< const SvxHeaderField *>(&rCmp) != nullptr );
}
void SvxHeaderField::Load( SvPersistStream & /*rStm*/ )
@@ -1237,7 +1236,7 @@ SvxFieldData* SvxFooterField::Clone() const
bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxFooterField) );
+ return ( dynamic_cast< const SvxFooterField *>(&rCmp) != nullptr );
}
void SvxFooterField::Load( SvPersistStream & /*rStm*/ )
@@ -1259,7 +1258,7 @@ SvxFieldData* SvxDateTimeField::Clone() const
bool SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
{
- return ( rCmp.Type() == TYPE(SvxDateTimeField) );
+ return ( dynamic_cast< const SvxDateTimeField *>(&rCmp) != nullptr );
}
void SvxDateTimeField::Load( SvPersistStream & /*rStm*/ )
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 575bf495066b..7de23be1b6d7 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -138,21 +138,23 @@ namespace
}
}
-TYPEINIT1_FACTORY(SvxPaperBinItem, SfxByteItem, new SvxPaperBinItem(0));
-TYPEINIT1_FACTORY(SvxSizeItem, SfxPoolItem, new SvxSizeItem(0));
-TYPEINIT1_FACTORY(SvxLRSpaceItem, SfxPoolItem, new SvxLRSpaceItem(0));
-TYPEINIT1_FACTORY(SvxULSpaceItem, SfxPoolItem, new SvxULSpaceItem(0));
-TYPEINIT1_FACTORY(SvxPrintItem, SfxBoolItem, new SvxPrintItem(0));
-TYPEINIT1_FACTORY(SvxOpaqueItem, SfxBoolItem, new SvxOpaqueItem(0));
-TYPEINIT1_FACTORY(SvxProtectItem, SfxPoolItem, new SvxProtectItem(0));
-TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0));
-TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
-TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
-TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
-TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0));
-TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0));
-TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
-TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
+
+SfxPoolItem* SvxPaperBinItem::CreateDefault() { return new SvxPaperBinItem(0);}
+SfxPoolItem* SvxSizeItem::CreateDefault() { return new SvxSizeItem(0);}
+SfxPoolItem* SvxLRSpaceItem::CreateDefault() { return new SvxLRSpaceItem(0);}
+SfxPoolItem* SvxULSpaceItem::CreateDefault() { return new SvxULSpaceItem(0);}
+SfxPoolItem* SvxPrintItem::CreateDefault() { return new SvxPrintItem(0);}
+SfxPoolItem* SvxOpaqueItem::CreateDefault() { return new SvxOpaqueItem(0);}
+SfxPoolItem* SvxProtectItem::CreateDefault() { return new SvxProtectItem(0);}
+SfxPoolItem* SvxBrushItem::CreateDefault() { return new SvxBrushItem(0);}
+SfxPoolItem* SvxShadowItem::CreateDefault() { return new SvxShadowItem(0);}
+SfxPoolItem* SvxBoxItem::CreateDefault() { return new SvxBoxItem(0);}
+SfxPoolItem* SvxBoxInfoItem::CreateDefault() { return new SvxBoxInfoItem(0);}
+SfxPoolItem* SvxFormatBreakItem::CreateDefault() { return new SvxFormatBreakItem(SVX_BREAK_NONE, 0);}
+SfxPoolItem* SvxFormatKeepItem::CreateDefault() { return new SvxFormatKeepItem(false, 0);}
+SfxPoolItem* SvxLineItem::CreateDefault() { return new SvxLineItem(0);}
+SfxPoolItem* SvxFrameDirectionItem::CreateDefault() { return new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0);}
+
// class SvxPaperBinItem ------------------------------------------------
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index c8806bd61760..32d50c745723 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -31,8 +31,9 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
-TYPEINIT1_FACTORY( SvxHorJustifyItem, SfxEnumItem, new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) );
-TYPEINIT1_FACTORY( SvxVerJustifyItem, SfxEnumItem, new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) );
+
+SfxPoolItem* SvxHorJustifyItem::CreateDefault() { return new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ;}
+SfxPoolItem* SvxVerJustifyItem::CreateDefault() { return new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ;}
using namespace ::com::sun::star;
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index a11c7984e5c5..54521c2cabc7 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -30,8 +30,6 @@ using namespace ::com::sun::star::linguistic2;
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(SfxSpellCheckItem, SfxPoolItem);
-TYPEINIT1(SfxHyphenRegionItem, SfxPoolItem);
// class SfxSpellCheckItem -----------------------------------------------
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 3c95e3de90d7..061bf02c9eba 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -24,7 +24,6 @@
#include <comphelper/processfactory.hxx>
#include <unotools/syslocale.hxx>
#include <comphelper/types.hxx>
-#include <tools/rtti.hxx>
#include <tools/mapunit.hxx>
#include <svl/itempool.hxx>
#include <svl/memberid.hrc>
@@ -53,20 +52,20 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0));
-TYPEINIT1_FACTORY(SvxAdjustItem, SfxPoolItem, new SvxAdjustItem(SVX_ADJUST_LEFT, 0));
-TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
-TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
-TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
-TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
-TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0));
-TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
-TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
-TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
-TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(false, 0));
-TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0));
-TYPEINIT1_FACTORY(SvxParaGridItem, SfxBoolItem, new SvxParaGridItem(true, 0));
+SfxPoolItem* SvxLineSpacingItem::CreateDefault() { return new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0);}
+SfxPoolItem* SvxAdjustItem::CreateDefault() { return new SvxAdjustItem(SVX_ADJUST_LEFT, 0);}
+SfxPoolItem* SvxWidowsItem::CreateDefault() { return new SvxWidowsItem(0, 0);}
+SfxPoolItem* SvxOrphansItem::CreateDefault() { return new SvxOrphansItem(0, 0);}
+SfxPoolItem* SvxHyphenZoneItem::CreateDefault() { return new SvxHyphenZoneItem(false, 0);}
+SfxPoolItem* SvxTabStopItem::CreateDefault() { return new SvxTabStopItem(0);}
+SfxPoolItem* SvxFormatSplitItem::CreateDefault() { return new SvxFormatSplitItem(false, 0);}
+SfxPoolItem* SvxPageModelItem::CreateDefault() { return new SvxPageModelItem(0);}
+SfxPoolItem* SvxScriptSpaceItem::CreateDefault() { return new SvxScriptSpaceItem(false, 0);}
+SfxPoolItem* SvxHangingPunctuationItem::CreateDefault() { return new SvxHangingPunctuationItem(false, 0);}
+SfxPoolItem* SvxForbiddenRuleItem::CreateDefault() { return new SvxForbiddenRuleItem(false, 0);}
+SfxPoolItem* SvxParaVertAlignItem::CreateDefault() { return new SvxParaVertAlignItem(0, 0);}
+SfxPoolItem* SvxParaGridItem::CreateDefault() { return new SvxParaGridItem(true, 0);}
SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId )
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ad06c25257bb..69a6ca799af2 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -105,43 +105,38 @@ bool SvxFontItem::bEnableStoreUnicodeNames = false;
// STATIC DATA -----------------------------------------------------------
-
-TYPEINIT1(SvxFontListItem, SfxPoolItem);
-TYPEINIT1_FACTORY(SvxFontItem, SfxPoolItem, new SvxFontItem(0));
-TYPEINIT1_FACTORY(SvxPostureItem, SfxEnumItem, new SvxPostureItem(ITALIC_NONE, 0));
-TYPEINIT1_FACTORY(SvxWeightItem, SfxEnumItem, new SvxWeightItem(WEIGHT_NORMAL, 0));
-TYPEINIT1_FACTORY(SvxFontHeightItem, SfxPoolItem, new SvxFontHeightItem(240, 100, 0));
-TYPEINIT1_FACTORY(SvxFontWidthItem, SfxPoolItem, new SvxFontWidthItem(0, 100, 0));
-TYPEINIT1_FACTORY(SvxTextLineItem, SfxEnumItem, new SvxTextLineItem(UNDERLINE_NONE, 0));
-TYPEINIT1_FACTORY(SvxUnderlineItem, SfxEnumItem, new SvxUnderlineItem(UNDERLINE_NONE, 0));
-TYPEINIT1_FACTORY(SvxOverlineItem, SfxEnumItem, new SvxOverlineItem(UNDERLINE_NONE, 0));
-TYPEINIT1_FACTORY(SvxCrossedOutItem, SfxEnumItem, new SvxCrossedOutItem(STRIKEOUT_NONE, 0));
-TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(false, 0));
-TYPEINIT1_FACTORY(SvxAutoKernItem, SfxBoolItem, new SvxAutoKernItem(false, 0));
-TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(false, 0));
-TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0));
-TYPEINIT1_FACTORY(SvxPropSizeItem, SfxUInt16Item, new SvxPropSizeItem(100, 0));
-TYPEINIT1_FACTORY(SvxColorItem, SfxPoolItem, new SvxColorItem(0));
-// XXX: Should 2nd argument of next line SfxColorItem or SfxPoolItem?
-TYPEINIT1_FACTORY(SvxBackgroundColorItem, SvxColorItem, new SvxBackgroundColorItem(0));
-TYPEINIT1_FACTORY(SvxCharSetColorItem, SvxColorItem, new SvxCharSetColorItem(0));
-TYPEINIT1_FACTORY(SvxKerningItem, SfxInt16Item, new SvxKerningItem(0, 0));
-TYPEINIT1_FACTORY(SvxCaseMapItem, SfxEnumItem, new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0));
-TYPEINIT1_FACTORY(SvxEscapementItem, SfxPoolItem, new SvxEscapementItem(0));
-TYPEINIT1_FACTORY(SvxLanguageItem, SfxEnumItem, new SvxLanguageItem(LANGUAGE_GERMAN, 0));
-TYPEINIT1_FACTORY(SvxNoLinebreakItem, SfxBoolItem, new SvxNoLinebreakItem(true, 0));
-TYPEINIT1_FACTORY(SvxNoHyphenItem, SfxBoolItem, new SvxNoHyphenItem(true, 0));
-TYPEINIT1_FACTORY(SvxLineColorItem, SvxColorItem, new SvxLineColorItem(0));
-TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0));
-TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0));
-TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(true, 0, 0, 0));
-TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
-TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0));
-TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0));
-TYPEINIT1_FACTORY(SvxCharReliefItem, SfxEnumItem, new SvxCharReliefItem(RELIEF_NONE, 0));
-TYPEINIT1_FACTORY(SvxRsidItem, SfxUInt32Item, new SvxRsidItem(0, 0));
-
-TYPEINIT1(SvxScriptSetItem, SfxSetItem );
+SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);}
+SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_NONE, 0);}
+SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);}
+SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);}
+SfxPoolItem* SvxFontWidthItem::CreateDefault() {return new SvxFontWidthItem(0, 100, 0);}
+SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(UNDERLINE_NONE, 0);}
+SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(UNDERLINE_NONE, 0);}
+SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(UNDERLINE_NONE, 0);}
+SfxPoolItem* SvxCrossedOutItem::CreateDefault() {return new SvxCrossedOutItem(STRIKEOUT_NONE, 0);}
+SfxPoolItem* SvxShadowedItem::CreateDefault() {return new SvxShadowedItem(false, 0);}
+SfxPoolItem* SvxAutoKernItem::CreateDefault() {return new SvxAutoKernItem(false, 0);}
+SfxPoolItem* SvxWordLineModeItem::CreateDefault() {return new SvxWordLineModeItem(false, 0);}
+SfxPoolItem* SvxContourItem::CreateDefault() {return new SvxContourItem(false, 0);}
+SfxPoolItem* SvxPropSizeItem::CreateDefault() {return new SvxPropSizeItem(100, 0);}
+SfxPoolItem* SvxColorItem::CreateDefault() {return new SvxColorItem(0);}
+SfxPoolItem* SvxBackgroundColorItem::CreateDefault() {return new SvxBackgroundColorItem(0);}
+SfxPoolItem* SvxCharSetColorItem::CreateDefault() {return new SvxCharSetColorItem(0);}
+SfxPoolItem* SvxKerningItem::CreateDefault() {return new SvxKerningItem(0, 0);}
+SfxPoolItem* SvxCaseMapItem::CreateDefault() {return new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0);}
+SfxPoolItem* SvxEscapementItem::CreateDefault() {return new SvxEscapementItem(0);}
+SfxPoolItem* SvxLanguageItem::CreateDefault() {return new SvxLanguageItem(LANGUAGE_GERMAN, 0);}
+SfxPoolItem* SvxNoLinebreakItem::CreateDefault() {return new SvxNoLinebreakItem(true, 0);}
+SfxPoolItem* SvxNoHyphenItem::CreateDefault() {return new SvxNoHyphenItem(true, 0);}
+SfxPoolItem* SvxLineColorItem::CreateDefault() {return new SvxLineColorItem(0);}
+SfxPoolItem* SvxBlinkItem::CreateDefault() {return new SvxBlinkItem(false, 0);}
+SfxPoolItem* SvxEmphasisMarkItem::CreateDefault() {return new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0);}
+SfxPoolItem* SvxTwoLinesItem::CreateDefault() {return new SvxTwoLinesItem(true, 0, 0, 0);}
+SfxPoolItem* SvxScriptTypeItem::CreateDefault() {return new SvxScriptTypeItem();}
+SfxPoolItem* SvxCharRotateItem::CreateDefault() {return new SvxCharRotateItem(0, false, 0);}
+SfxPoolItem* SvxCharScaleWidthItem::CreateDefault() {return new SvxCharScaleWidthItem(100, 0);}
+SfxPoolItem* SvxCharReliefItem::CreateDefault() {return new SvxCharReliefItem(RELIEF_NONE, 0);}
+SfxPoolItem* SvxRsidItem::CreateDefault() {return new SvxRsidItem(0, 0);}
// class SvxFontListItem -------------------------------------------------
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 50449a0b34cf..a5c271326f23 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -25,7 +25,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
-TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0));
+
+SfxPoolItem* SvxWritingModeItem::CreateDefault() { return new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0);}
SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich )
: SfxUInt16Item( _nWhich, (sal_uInt16)eValue )
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 6906e5ed2648..1b100b55dde7 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::xml;
-TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem);
SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich )
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 4fd69d7cdb4f..1d6c70a103e3 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -100,7 +100,6 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
public:
- TYPEINFO_OVERRIDE();
SvMetaObject();
static void WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
@@ -147,7 +146,6 @@ class SvMetaReference : public SvMetaObject
protected:
tools::SvRef<SvMetaReference> aRef;
public:
- TYPEINFO_OVERRIDE();
SvMetaReference();
const SvString & GetName() const override
@@ -199,7 +197,6 @@ class SvMetaExtern : public SvMetaReference
bool bReadUUId;
bool bReadVersion;
public:
- TYPEINFO_OVERRIDE();
SvMetaExtern();
SvMetaModule * GetModule() const;
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 3855699c5f50..12b4b4af17b4 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -52,7 +52,6 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
public:
- TYPEINFO_OVERRIDE();
virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ) override;
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 1ba006635121..28502888da6f 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -46,7 +46,6 @@ class SvClassElement : public SvRttiBase
OString aPrefix;
SvMetaClassRef xClass;
public:
- TYPEINFO_OVERRIDE();
SvClassElement();
void SetPrefix( const OString& rPrefix )
@@ -98,7 +97,6 @@ protected:
virtual void ReadContextSvIdl( SvIdlDataBase &,
SvTokenStream & rInStm ) override;
public:
- TYPEINFO_OVERRIDE();
SvMetaClass();
void FillClasses( SvMetaClassList & rList );
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index e24f937a770c..8ed5d398d2bf 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -146,7 +146,6 @@ protected:
}
public:
- TYPEINFO_OVERRIDE();
SvMetaObject * MakeClone() const;
SvMetaSlot *Clone() const { return static_cast<SvMetaSlot *>(MakeClone()); }
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 869a45f97e23..fee2a5a8df55 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -48,7 +48,6 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) override;
public:
- TYPEINFO_OVERRIDE();
SvMetaAttribute();
SvMetaAttribute( SvMetaType * );
@@ -113,7 +112,6 @@ protected:
bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
public:
- TYPEINFO_OVERRIDE();
SvMetaType();
SvMetaType( const OString& rTypeName, char cParserChar,
const OString& rCName );
@@ -176,7 +174,6 @@ class SvMetaTypeMemberList : public SvRefMemberList<SvMetaType *> {};
class SvMetaTypeString : public SvMetaType
{
public:
- TYPEINFO_OVERRIDE();
SvMetaTypeString();
};
@@ -185,7 +182,6 @@ class SvMetaTypeStringMemberList : public SvRefMemberList<SvMetaTypeString *> {}
class SvMetaEnumValue : public SvMetaObject
{
public:
- TYPEINFO_OVERRIDE();
SvMetaEnumValue();
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
@@ -200,7 +196,6 @@ class SvMetaTypeEnum : public SvMetaType
protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
public:
- TYPEINFO_OVERRIDE();
SvMetaTypeEnum();
sal_uLong Count() const { return aEnumValueList.size(); }
@@ -216,7 +211,6 @@ class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
class SvMetaTypevoid : public SvMetaType
{
public:
- TYPEINFO_OVERRIDE();
SvMetaTypevoid();
};
class SvMetaTypevoidMemberList : public SvRefMemberList<SvMetaTypevoid *> {};
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 332341da3a2e..4af4327f3e8e 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -62,7 +62,6 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
rOutStm.Seek( nPos );
}
-TYPEINIT1( SvMetaObject, SvRttiBase );
SvMetaObject::SvMetaObject()
{
}
@@ -158,13 +157,11 @@ bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
return bOk;
}
-TYPEINIT1( SvMetaReference, SvMetaObject );
SvMetaReference::SvMetaReference()
{
}
-TYPEINIT1( SvMetaExtern, SvMetaReference );
SvMetaExtern::SvMetaExtern()
: pModule( nullptr )
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index f78390eab8df..0109211adec9 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -27,7 +27,6 @@
#include <tools/debug.hxx>
#include <osl/file.hxx>
-TYPEINIT1( SvMetaModule, SvMetaExtern );
SvMetaModule::SvMetaModule( bool bImp )
: bImported( bImp ), bIsModified( false )
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 218504f18487..3172e86e5b39 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -28,13 +28,11 @@
#include <globals.hxx>
#include <database.hxx>
-TYPEINIT1( SvClassElement, SvPersistBase );
SvClassElement::SvClassElement()
{
};
-TYPEINIT1( SvMetaClass, SvMetaType );
SvMetaClass::SvMetaClass()
: aAutomation( true, false )
{
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index f0176db98b63..6d8157b2506a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -27,7 +27,6 @@
#include <globals.hxx>
#include <database.hxx>
-TYPEINIT1( SvMetaSlot, SvMetaAttribute );
SvMetaObject *SvMetaSlot::MakeClone() const
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index fd7b0806fd2d..f683458790d9 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -27,7 +27,6 @@
#include <globals.hxx>
#include <database.hxx>
-TYPEINIT1( SvMetaAttribute, SvMetaReference );
SvMetaAttribute::SvMetaAttribute()
: aAutomation( true, false )
, aExport( true, false )
@@ -220,7 +219,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&
{
}
-TYPEINIT1( SvMetaType, SvMetaExtern );
#define CTOR \
: aCall0( CALL_VALUE, false ) \
, aCall1( CALL_VALUE, false ) \
@@ -592,8 +590,10 @@ void SvMetaType::WriteSfxItem(
rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() )
.WriteCharPtr( " = " ) << endl;
rOutStm.WriteChar( '{' ) << endl;
- rOutStm.WriteCharPtr( "\tTYPE(" ).WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " )
- .WriteCharPtr( aAttrCount.getStr() );
+
+ rOutStm.WriteCharPtr( "\tcreateSfxPoolItem<" ).WriteCharPtr( rItemName.getStr() )
+ .WriteCharPtr(">, &typeid(").WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " );
+ rOutStm.WriteCharPtr( aAttrCount.getStr() );
if( nAttrCount )
{
rOutStm.WriteCharPtr( ", { " );
@@ -658,13 +658,11 @@ OString SvMetaType::GetParserString() const
return aPStr;
}
-TYPEINIT1( SvMetaTypeString, SvMetaType );
SvMetaTypeString::SvMetaTypeString()
: SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" )
{
}
-TYPEINIT1( SvMetaEnumValue, SvMetaObject );
SvMetaEnumValue::SvMetaEnumValue()
{
}
@@ -677,7 +675,6 @@ bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
return true;
}
-TYPEINIT1( SvMetaTypeEnum, SvMetaType );
SvMetaTypeEnum::SvMetaTypeEnum()
{
SetBasicName("Integer");
@@ -737,7 +734,6 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
return false;
}
-TYPEINIT1( SvMetaTypevoid, SvMetaType );
SvMetaTypevoid::SvMetaTypevoid()
: SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" )
{
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index de54de2cb078..f18edb6062c6 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_AVMEDIA_MEDIAITEM_HXX
#define INCLUDED_AVMEDIA_MEDIAITEM_HXX
-#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -64,7 +63,7 @@ enum class MediaState
class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit MediaItem( sal_uInt16 i_nWhich = 0,
AVMediaSetMask nMaskSet = AVMediaSetMask::NONE );
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 11eb3f526818..8900f096bfa3 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -134,7 +134,6 @@ protected:
virtual ~BasicManager();
public:
- TYPEINFO_OVERRIDE();
BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString* pLibPath = nullptr, bool bDocMgr = false );
BasicManager( StarBASIC* pStdLib, OUString* pLibPath = nullptr, bool bDocMgr = false );
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index e780057681b2..c09c79cf9519 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -52,7 +52,6 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
- TYPEINFO_OVERRIDE();
virtual SbxInfo* GetInfo() override;
SbxArray* GetStatics();
void ClearStatics();
@@ -75,7 +74,6 @@ class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod
SbMethodRef mxImplMeth;
public:
- TYPEINFO_OVERRIDE();
SbIfaceMapperMethod( const OUString& rName, SbMethod* pImplMeth )
: SbMethod( rName, pImplMeth->GetType(), nullptr )
, mxImplMeth( pImplMeth )
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index 5fd7e02f2e1a..5dfe5f0e0c4b 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -95,7 +95,6 @@ protected:
virtual ~SbModule();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
- TYPEINFO_OVERRIDE();
SbModule( const OUString&, bool bCompat = false );
virtual void SetParent( SbxObject* ) override;
virtual void Clear() override;
@@ -145,7 +144,6 @@ class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule
bool mbInitializeEventDone;
public:
- TYPEINFO_OVERRIDE();
SbClassModuleObject( SbModule* pClassModule );
virtual ~SbClassModuleObject();
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 3a7090361110..2232efb47a37 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -86,7 +86,6 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
- TYPEINFO_OVERRIDE();
StarBASIC( StarBASIC* pParent = nullptr, bool bIsDocBasic = false );
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index cca67eaa3ede..90d2b72ebd01 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -137,7 +137,6 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
- TYPEINFO_OVERRIDE();
SbxArray( SbxDataType=SbxVARIANT );
SbxArray( const SbxArray& );
SbxArray& operator=( const SbxArray& );
@@ -186,7 +185,6 @@ protected:
virtual ~SbxDimArray();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
- TYPEINFO_OVERRIDE();
SbxDimArray( SbxDataType=SbxVARIANT );
SbxDimArray( const SbxDimArray& );
SbxDimArray& operator=( const SbxDimArray& );
@@ -229,7 +227,6 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_COLLECTION,1);
- TYPEINFO_OVERRIDE();
SbxCollection( const OUString& rClassname );
SbxCollection( const SbxCollection& );
SbxCollection& operator=( const SbxCollection& );
@@ -250,7 +247,6 @@ protected:
virtual void CollRemove( SbxArray* pPar ) override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
- TYPEINFO_OVERRIDE();
SbxStdCollection( const OUString& rClassname, const OUString& rElemClass, bool=true );
SbxStdCollection( const SbxStdCollection& );
SbxStdCollection& operator=( const SbxStdCollection& );
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 17ef7566b764..260d04558535 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -24,7 +24,6 @@
#include <basic/sbxdef.hxx>
#include <rtl/ustring.hxx>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
class SvStream;
@@ -62,7 +61,6 @@ protected:
virtual sal_uInt16 GetSbxId() const { return 0; }
public:
- TYPEINFO();
inline void SetFlags( SbxFlagBits n );
inline SbxFlagBits GetFlags() const;
inline void SetFlag( SbxFlagBits n );
diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx
index 903f346ff694..9ce9e0373fdf 100644
--- a/include/basic/sbxmeth.hxx
+++ b/include/basic/sbxmeth.hxx
@@ -29,7 +29,6 @@ class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
SbxDataType mbRuntimeFunctionReturnType;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
- TYPEINFO_OVERRIDE();
SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false );
SbxMethod( const SbxMethod& r );
virtual ~SbxMethod();
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 2b07be4621ae..f80c0fc4967f 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -43,7 +43,6 @@ protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_OBJECT,1);
- TYPEINFO_OVERRIDE();
SbxObject( const OUString& rClassname );
SbxObject( const SbxObject& );
SbxObject& operator=( const SbxObject& );
diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx
index 38ab51869cb9..cea8c7ab0346 100644
--- a/include/basic/sbxprop.hxx
+++ b/include/basic/sbxprop.hxx
@@ -27,7 +27,6 @@ class BASIC_DLLPUBLIC SbxProperty : public SbxVariable
{
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1);
- TYPEINFO_OVERRIDE();
SbxProperty( const OUString& r, SbxDataType t );
SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {}
virtual ~SbxProperty();
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index d2b5f066f712..8a517eac90a5 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -103,7 +103,6 @@ protected:
virtual bool StoreData( SvStream& ) const override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
- TYPEINFO_OVERRIDE();
SbxValue();
SbxValue( SbxDataType, void* = nullptr );
SbxValue( const SbxValue& );
@@ -292,7 +291,6 @@ protected:
virtual bool StoreData( SvStream& ) const override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
- TYPEINFO_OVERRIDE();
SbxVariable();
SbxVariable( SbxDataType, void* = nullptr );
SbxVariable( const SbxVariable& );
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index d7e46488cbac..b55e52af21dc 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -47,7 +47,7 @@ class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
bool bLastBlock : 1;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
const sal_uInt16 nId );
diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index 67830a704d26..26231e7b58a2 100644
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxAutoKernItem( const bool bAutoKern /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index 8bd272377ded..2df566fa293f 100644
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId );
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 763ed0899745..7b1efd8de332 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -62,7 +62,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
nRightDist;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxBoxItem( const sal_uInt16 nId );
SvxBoxItem( const SvxBoxItem &rCpy );
@@ -174,7 +174,7 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
sal_uInt16 nDefDist; // The default or minimum distance.
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxBoxInfoItem( const sal_uInt16 nId );
SvxBoxInfoItem( const SvxBoxInfoItem &rCpy );
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index a6909f546cc2..85ca68af1f56 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -58,7 +58,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
sal_uInt16 nVersion, sal_uInt16 nWhich );
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxBrushItem( sal_uInt16 nWhich );
SvxBrushItem( const Color& rColor, sal_uInt16 nWhich );
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 79929d402c40..31abbc91e2fb 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -56,7 +56,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
void SetDefaults_Impl();
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxBulletItem( sal_uInt16 nWhich = 0 );
explicit SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 );
diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx
index a735aea3641a..728c0faf20aa 100644
--- a/include/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
@@ -32,7 +32,7 @@
class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId );
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index 34f39caa4f65..6a01f71326bb 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -34,7 +34,7 @@
class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/,
const sal_uInt16 nId );
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 74a90b50dae5..eaea31871891 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
{
bool bFitToLine;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxCharRotateItem( sal_uInt16 nValue /*= 0*/,
bool bFitIntoLine /*= false*/,
diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx
index 289d4d63ed4e..1cbaf684862a 100644
--- a/include/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
@@ -35,7 +35,7 @@
class EDITENG_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/,
const sal_uInt16 nId );
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index ebb8994378b4..f949c1324830 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
{
rtl_TextEncoding eFrom;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxCharSetColorItem( const sal_uInt16 nId );
SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom,
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index 942cb2586c9a..3d8087419524 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/,
const sal_uInt16 nId );
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 828c58ea589b..c91429ea49b1 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -35,7 +35,7 @@ private:
Color mColor;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxColorItem(const sal_uInt16 nId);
SvxColorItem(const Color& aColor, const sal_uInt16 nId);
@@ -74,7 +74,7 @@ public:
class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public SvxColorItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxBackgroundColorItem(const sal_uInt16 nId);
SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId);
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 4837c7023251..6ea0d5cc9d98 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -31,7 +31,7 @@
class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxContourItem( const bool bContoured /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index fc1737932acf..07ab74ce65d5 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/,
const sal_uInt16 nId );
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index f60f826a19d5..11e120317576 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -34,7 +34,6 @@
#include <tools/lineend.hxx>
#include <tools/link.hxx>
-#include <tools/rtti.hxx>
#include <editeng/eedata.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx
index da936d7def91..2384aa4e688d 100644
--- a/include/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/,
const sal_uInt16 nId );
diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index 767af0af05c5..291a63d42e48 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -43,7 +43,7 @@ class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
short nEsc;
sal_uInt8 nProp;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxEscapementItem( const sal_uInt16 nId );
SvxEscapementItem( const SvxEscapement eEscape,
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 7325fa02a156..cbd2a5fa0b09 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -42,7 +42,7 @@ class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
sal_uInt16 nProp; // default 100%
SfxMapUnit ePropUnit; // Percent, Twip, ...
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/,
const sal_uInt16 nId );
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 25a59321176a..2dcaa0631043 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -73,7 +73,7 @@ private:
EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const sal_uInt16 nId );
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId );
SvxFieldItem( const SvxFieldItem& rItem );
diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index 6afb9aaba87c..f651e9bbb960 100644
--- a/include/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
@@ -42,7 +42,7 @@ private:
css::uno::Sequence< OUString > aFontNameSeq;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxFontListItem( const FontList* pFontLst,
const sal_uInt16 nId );
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index e12c2b3d83ee..173a7b7747ac 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
static bool bEnableStoreUnicodeNames;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxFontItem(const sal_uInt16 nId);
SvxFontItem(const FontFamily eFam, const OUString& rFamilyName,
diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx
index 9dedc00be0c0..00596ca2d06a 100644
--- a/include/editeng/forbiddenruleitem.hxx
+++ b/include/editeng/forbiddenruleitem.hxx
@@ -32,7 +32,7 @@
class EDITENG_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxForbiddenRuleItem( bool bOn /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index b8ca73d63185..23f412c7b021 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -36,7 +36,7 @@
class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
const sal_uInt16 nWhich );
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index a4917b31d079..c9a0d61848bb 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -35,7 +35,7 @@
class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/,
sal_uInt16 nWhich );
diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
index 494662ae55ec..24525a869382 100644
--- a/include/editeng/fwdtitem.hxx
+++ b/include/editeng/fwdtitem.hxx
@@ -35,7 +35,7 @@ class SvxFontWidthItem : public SfxPoolItem
sal_uInt16 nWidth; // 0 = default
sal_uInt16 nProp; // default 100%
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxFontWidthItem( const sal_uInt16 nSz /*= 0*/,
const sal_uInt16 nPropWidth /*= 100*/,
diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index c03a29a4cd5c..608c4641723d 100644
--- a/include/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
@@ -32,7 +32,7 @@
class EDITENG_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId );
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 7f968f72a2e0..3be73a7cc3e4 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -41,7 +41,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
sal_uInt8 nMaxHyphens;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxHyphenZoneItem( const bool bHyph /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 484df51ca67e..bbb5a702f633 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -28,7 +28,7 @@
class EDITENG_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxHorJustifyItem( const sal_uInt16 nId );
@@ -61,7 +61,7 @@ public:
class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxVerJustifyItem( const sal_uInt16 nId );
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index cdba89bc3523..257bfdd7b543 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -33,7 +33,7 @@
class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
inline SvxFormatKeepItem( const bool bKeep /*= false*/,
const sal_uInt16 _nWhich );
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index e11cb7db8ab2..46581c67c2d3 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -37,7 +37,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId );
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 192639be8581..61645937881d 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/,
const sal_uInt16 nId );
diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx
index e331e91ca7c7..968b85d070f0 100644
--- a/include/editeng/lcolitem.hxx
+++ b/include/editeng/lcolitem.hxx
@@ -30,7 +30,7 @@
class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxLineColorItem( const sal_uInt16 nId );
SvxLineColorItem( const SvxLineColorItem& rCopy );
diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index 84b32282d436..70ebf75515fb 100644
--- a/include/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
@@ -39,7 +39,7 @@ namespace editeng {
class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxLineItem( const sal_uInt16 nId );
SvxLineItem( const SvxLineItem& rCpy );
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 0d39a7ef25ee..6dd5cc0d53b7 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -64,7 +64,7 @@ class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxLRSpaceItem( const sal_uInt16 nId );
SvxLRSpaceItem( const long nLeft, const long nRight,
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index dc09423254dd..da1fb3df6dc1 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -41,7 +41,7 @@ class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
SvxInterLineSpace eInterLineSpace;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
// The writer relies on a default height of 200! Actually, I would
// initialize all values to 0, but who can ignore the consequences in
diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx
index 5172c65e5b0e..ba67dcdc9a1a 100644
--- a/include/editeng/nhypitem.hxx
+++ b/include/editeng/nhypitem.hxx
@@ -26,7 +26,7 @@
class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxNoHyphenItem( const bool bHyphen /*= true*/,
const sal_uInt16 nId );
diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx
index 769df9863803..749874010c77 100644
--- a/include/editeng/nlbkitem.hxx
+++ b/include/editeng/nlbkitem.hxx
@@ -26,7 +26,7 @@
class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxNoLinebreakItem( const bool bBreak /*= true*/,
const sal_uInt16 nId );
diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx
index a8b2de3ea2a0..986c77652dd6 100644
--- a/include/editeng/opaqitem.hxx
+++ b/include/editeng/opaqitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true );
inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy );
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 81a74bea7f8b..480b7782b9eb 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -35,7 +35,6 @@ namespace linguistic2{
class EDITENG_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
SfxSpellCheckItem( css::uno::Reference<
css::linguistic2::XSpellChecker1 > &xChecker,
@@ -66,7 +65,6 @@ class EDITENG_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem
sal_uInt8 nMinTrail;
public:
- TYPEINFO_OVERRIDE();
SfxHyphenRegionItem( const sal_uInt16 nId );
SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem );
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index 0642a47722d6..ed6b0541f177 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 632f60d46309..19ae9178d2e4 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -38,7 +38,6 @@
#include <svtools/grfmgr.hxx>
-#include <tools/rtti.hxx>
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
#include <vector>
diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index f66dfeb3a982..2a8b25cdbbde 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
{
public:
enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM };
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/,
const sal_uInt16 nId );
diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx
index 79a4105693fa..b439c99b5441 100644
--- a/include/editeng/pbinitem.hxx
+++ b/include/editeng/pbinitem.hxx
@@ -36,7 +36,7 @@
class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit inline SvxPaperBinItem( const sal_uInt16 nId ,
const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS );
diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx
index 34089de2625f..4080532bab00 100644
--- a/include/editeng/pgrditem.hxx
+++ b/include/editeng/pgrditem.hxx
@@ -33,7 +33,7 @@
class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxParaGridItem( const bool bSnapToGrid /*= true*/,
const sal_uInt16 nId );
diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx
index 458ce78c09db..4a0e4ee69c80 100644
--- a/include/editeng/pmdlitem.hxx
+++ b/include/editeng/pmdlitem.hxx
@@ -35,7 +35,7 @@ private:
bool bAuto;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit inline SvxPageModelItem( sal_uInt16 nWh );
inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/,
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 758df3b9a949..065aed5617f8 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/,
const sal_uInt16 nId );
diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx
index 9bd45c0b55c6..3e5447e111cd 100644
--- a/include/editeng/prntitem.hxx
+++ b/include/editeng/prntitem.hxx
@@ -36,7 +36,7 @@
class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true );
inline SvxPrintItem &operator=( const SvxPrintItem &rCpy );
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 7ce0b1c77aa0..da2772cce8f2 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem
bool bPos :1; // Position protected
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit inline SvxProtectItem( const sal_uInt16 nId );
inline SvxProtectItem &operator=( const SvxProtectItem &rCpy );
diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx
index d825d5b40c94..c0a16f1bdd90 100644
--- a/include/editeng/prszitem.hxx
+++ b/include/editeng/prszitem.hxx
@@ -32,7 +32,7 @@
class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPropSizeItem( const sal_uInt16 nPercent /*= 100*/,
const sal_uInt16 nID );
diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx
index 67f09aceab4b..ee21b7e9cd4f 100644
--- a/include/editeng/rsiditem.hxx
+++ b/include/editeng/rsiditem.hxx
@@ -19,7 +19,7 @@
class EDITENG_DLLPUBLIC SvxRsidItem : public SfxUInt32Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {}
SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {}
diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx
index 21264ec5216d..0b6b6e00bc69 100644
--- a/include/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
@@ -33,7 +33,7 @@
class EDITENG_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxScriptSpaceItem( bool bOn /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx
index 5e2bfcf7a0ae..c9e72a7efe0f 100644
--- a/include/editeng/scripttypeitem.hxx
+++ b/include/editeng/scripttypeitem.hxx
@@ -34,7 +34,7 @@
class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxScriptTypeItem( SvtScriptType nType = SvtScriptType::LATIN );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -44,7 +44,7 @@ public:
class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool );
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 1fde4bb53f8d..a4b6ff363960 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
sal_uInt16 nWidth;
SvxShadowLocation eLocation;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxShadowItem( const sal_uInt16 nId ,
const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/,
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index 01c649f756b1..b0ab85ec2ea7 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxShadowedItem( const bool bShadowed /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index d4b4a0a17c85..1cd8a328660c 100644
--- a/include/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
@@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
Size aSize;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxSizeItem( const sal_uInt16 nId );
SvxSizeItem( const sal_uInt16 nId, const Size& rSize);
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index 8726207bf418..02779c37e0d0 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
virtual ~SvxFormatSplitItem();
inline SvxFormatSplitItem( const bool bSplit /*= true*/,
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 1a43725de8e0..9b0f05fe69c6 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -24,7 +24,6 @@
#include <o3tl/sorted_vector.hxx>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/time.hxx>
#include <tools/date.hxx>
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index ad87a3d5eb27..d11b20f59ab6 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -101,7 +101,7 @@ class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem
SvxTabStopArr maTabStops;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxTabStopItem( sal_uInt16 nWhich );
SvxTabStopItem( const sal_uInt16 nTabs,
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index a5ebd4b2a823..d0a3ebfacdb8 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
sal_Unicode cStartBracket, cEndBracket;
bool bOn;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxTwoLinesItem( bool bOn /*= true*/,
sal_Unicode nStartBracket /*= 0*/,
sal_Unicode nEndBracket /*= 0*/,
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 87e602517b72..9306aba7635c 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
{
Color mColor;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxTextLineItem( const FontUnderline eSt,
const sal_uInt16 nId );
@@ -87,7 +87,7 @@ public:
class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxUnderlineItem( const FontUnderline eSt,
const sal_uInt16 nId );
@@ -104,7 +104,7 @@ public:
class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxOverlineItem( const FontUnderline eSt,
const sal_uInt16 nId );
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index e3573073cfea..40f5b7eeb924 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
bool bContext; // Contextual spacing?
sal_uInt16 nPropUpper, nPropLower; // relative or absolute (=100%)
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxULSpaceItem( const sal_uInt16 nId );
SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 51a347c3bbcb..2426051d8a5b 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxWeightItem( const FontWeight eWght /*= WEIGHT_NORMAL*/,
const sal_uInt16 nId );
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index ed1fedcfad9a..1708c9c5a394 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx
index 7f5aabc58ede..28bbf44e77e9 100644
--- a/include/editeng/writingmodeitem.hxx
+++ b/include/editeng/writingmodeitem.hxx
@@ -28,7 +28,7 @@
class EDITENG_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxWritingModeItem( css::text::WritingMode eValue /*= css::text::WritingMode_LR_TB*/,
sal_uInt16 nWhich /*= SDRATTR_TEXTDIRECTION*/ );
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index 68e4dac20feb..22f403f1c788 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxWordLineModeItem( const bool bWordLineMode /*= false*/,
const sal_uInt16 nId );
diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index f1c5bac5a275..14b6e3c65e88 100644
--- a/include/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
@@ -34,7 +34,6 @@ class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
SvXMLAttrContainerData *pImpl;
public:
- TYPEINFO_OVERRIDE();
SvXMLAttrContainerItem( sal_uInt16 nWhich = 0 );
SvXMLAttrContainerItem( const SvXMLAttrContainerItem& );
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 0b6c89806935..8db9229f3fe1 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -124,7 +124,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
void Deinitialize();
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP)
private:
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index faf6494bd920..4aefe3b478bb 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -86,7 +86,7 @@ private:
css::uno::Sequence< css::document::CmisProperty > m_aCmisProperties;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxDocumentInfoItem();
SfxDocumentInfoItem( const OUString &rFileName,
const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps,
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 3170b86f9adb..138fe6d7e35d 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
-#include <tools/rtti.hxx>
// SFX_IMPL_MODULE_LIB
#include <osl/module.hxx>
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 88398a4ef7cc..7b4af17d661c 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
-#include <tools/rtti.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <sfx2/event.hxx>
@@ -72,7 +71,6 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
SfxEventNamesList aEventsList;
public:
- TYPEINFO_OVERRIDE();
SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {}
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index af408d2f19b3..82a7a0cf9a29 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -215,7 +215,6 @@ class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem
SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame = wFrame; }
public:
- TYPEINFO_OVERRIDE();
SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame *p );
SfxFrameItem( SfxFrame *p=nullptr );
@@ -235,7 +234,7 @@ class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem
{
css::uno::Any aValue;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxUsrAnyItem( sal_uInt16 nWhich, const css::uno::Any& rAny );
css::uno::Any GetValue() const
{ return aValue; }
@@ -251,7 +250,7 @@ class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
m_xFrame;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxUnoFrameItem();
SfxUnoFrameItem( sal_uInt16 nWhich, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
const css::uno::Reference< css::frame::XFrame >&
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 7b56f1cf6491..eafbf4e9123e 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -190,7 +190,6 @@ class SfxFrameDescriptorItem : public SfxPoolItem
{
SfxFrameProperties aProperties;
public:
- TYPEINFO_OVERRIDE();
SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
: SfxPoolItem( nId )
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index ea7a71c13ddb..4af9f0b8968c 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -24,7 +24,6 @@
#include <tools/link.hxx>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
#include <com/sun/star/io/XInputStream.hpp>
namespace com { namespace sun { namespace star { namespace uno
@@ -56,7 +55,6 @@ private:
SvLinkSource_Impl* pImpl; // compatible area
public:
- TYPEINFO();
SvLinkSource();
virtual ~SvLinkSource();
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 438327d47fd7..d2e7b16a314a 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -108,7 +108,6 @@ protected:
}
public:
- TYPEINFO();
virtual void Closed();
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index f0b0541ddf4f..3356911e2e2f 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -35,7 +35,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
OUString aCommentText;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxMacroInfoItem( sal_uInt16 nWhich,
const BasicManager* pMgr,
const OUString &rLibName,
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 3d76b44e8635..7afaec06c3a8 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -87,11 +87,11 @@ typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindin
struct SfxMenuCtrlFactory
{
SfxMenuControlCtor pCtor;
- TypeId nTypeId;
+ const std::type_info& nTypeId;
sal_uInt16 nSlotId;
SfxMenuCtrlFactory( SfxMenuControlCtor pTheCtor,
- TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
+ const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
pCtor(pTheCtor),
nTypeId(nTheTypeId),
nSlotId(nTheSlotId)
@@ -117,7 +117,7 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
{ return new Class(nId, rMenu, rBindings); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
- Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
+ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); }
#endif
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 8254c6d25ea2..6d257b19a276 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -62,7 +62,6 @@ private:
SAL_DLLPRIVATE void Construct_Impl();
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE)
private:
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index d9e2c12d650e..25fdbcdd0905 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -19,13 +19,13 @@
#ifndef INCLUDED_SFX2_MSG_HXX
#define INCLUDED_SFX2_MSG_HXX
-#include <tools/rtti.hxx>
#include <sfx2/shell.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <sfx2/dllapi.h>
#include <svl/itemset.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <functional>
enum class SfxSlotMode {
NONE = 0x0000L, // exclusiv to VOLATILE, default
@@ -107,31 +107,34 @@ struct SfxTypeAttrib
sal_uInt16 nAID;
const char* pName;
};
-
+class SfxPoolItem;
+template<class T> SfxPoolItem* createSfxPoolItem()
+{
+ return T::CreateDefault();
+}
struct SfxType
{
- TypeId aTypeId;
+ std::function<SfxPoolItem* ()> createSfxPoolItemFunc;
+ const std::type_info* pType;
sal_uInt16 nAttribs;
SfxTypeAttrib aAttrib[1]; // variable length
- const TypeId& Type() const
- { return aTypeId; }
+ const std::type_info* Type() const{return pType;}
SfxPoolItem* CreateItem() const
- { return static_cast<SfxPoolItem*>(aTypeId()); }
+ { return static_cast<SfxPoolItem*>(createSfxPoolItemFunc()); }
};
struct SfxType0
{
- TypeId aTypeId;
+ std::function<SfxPoolItem* ()> createSfxPoolItemFunc;
+ const std::type_info* pType;
sal_uInt16 nAttribs;
-
- const TypeId& Type() const
- { return aTypeId; }
+ const std::type_info* Type() const { return pType;}
};
-
#define SFX_DECL_TYPE(n) struct SfxType##n \
{ \
- TypeId aTypeId; \
+ std::function<SfxPoolItem* ()> createSfxPoolItemFunc; \
+ const std::type_info* pType; \
sal_uInt16 nAttribs; \
SfxTypeAttrib aAttrib[n]; \
}
@@ -198,7 +201,7 @@ SFX_DECL_TYPE(22); // for SvxSearchItem
0, 0, DisableFlags, UnoName \
}
-class SfxPoolItem;
+//class SfxPoolItem;
struct SfxFormalArgument
{
@@ -206,10 +209,10 @@ struct SfxFormalArgument
const char* pName; // Name of the sParameters
sal_uInt16 nSlotId; // Slot-Id for identification of the Parameters
- const TypeId& Type() const
- { return pType->aTypeId; }
+// const TypeId& Type() const
+// { return pType->aTypeId; }
SfxPoolItem* CreateItem() const
- { return static_cast<SfxPoolItem*>(pType->aTypeId()); }
+ { return pType->createSfxPoolItemFunc(); }
};
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 2b75d9503440..4308418ac1b2 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -61,7 +61,7 @@ public:
const SfxSlot* NextSlot();
const SfxSlot* GetSlot( sal_uInt16 nId );
const SfxSlot* GetUnoSlot( const OUString& rUnoName );
- TypeId GetSlotType( sal_uInt16 nSlotId ) const;
+ const std::type_info* GetSlotType( sal_uInt16 nSlotId ) const;
};
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index d2ce6c080ebd..db4139285f44 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -32,7 +32,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
SfxShell* _pSh;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr );
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index fed9399ed8a3..a26617109adc 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -244,7 +244,6 @@ protected:
void AddToRecentlyUsedList();
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
private:
@@ -823,7 +822,8 @@ class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
SfxObjectShell* pObjSh;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SfxObjectShellItem() :
SfxPoolItem( 0 ),
pObjSh( nullptr )
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 8ec29fdfcd46..07dd9a3359f3 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -26,7 +26,6 @@
#include <sfx2/dllapi.h>
#include <sfx2/sfxuno.hxx>
#include <svl/SfxBroadcaster.hxx>
-#include <tools/rtti.hxx>
class ResMgr;
namespace vcl { class Window; }
@@ -165,7 +164,6 @@ protected:
static void HandleOpenXmlFilterSettings(SfxRequest &);
public:
- TYPEINFO_OVERRIDE();
/**
The connection to a possible corresponding SbxObject is dissolved.
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index a4b890d2541b..97cc515cac93 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -40,11 +40,11 @@ typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal
struct SfxStbCtrlFactory
{
SfxStatusBarControlCtor pCtor;
- TypeId nTypeId;
+ const std::type_info& nTypeId;
sal_uInt16 nSlotId;
SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
- TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
+ const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
pCtor(pTheCtor),
nTypeId(nTheTypeId),
nSlotId(nTheSlotId)
@@ -130,7 +130,7 @@ public:
{ return new Class( nSlotId, nId, rStb ); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \
- Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
+ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); }
#endif
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index a02076495215..f1dc53cd0f1e 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -49,7 +49,6 @@ struct TabDlg_Impl;
class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem
{
public:
- TYPEINFO_OVERRIDE();
SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=nullptr);
virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const override;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 20dc0120af54..b0fdb60140d3 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -48,11 +48,11 @@ typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uIn
struct SfxTbxCtrlFactory
{
SfxToolBoxControlCtor pCtor;
- TypeId nTypeId;
+ const std::type_info& nTypeId;
sal_uInt16 nSlotId;
SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor,
- TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
+ const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
pCtor(pTheCtor),
nTypeId(nTheTypeId),
nSlotId(nTheSlotId)
@@ -232,14 +232,14 @@ public:
{ return new Class( nSlotId, nId, rTbx ); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
- Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
+ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); }
#define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \
SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx, Arg); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
- Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
+ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); }
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 490013493e9b..17c4a5295819 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -24,13 +24,12 @@
#include <sfx2/dllapi.h>
#include <svl/flagitem.hxx>
#include <svl/style.hrc>
-#include <tools/rtti.hxx>
class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
{
OUString aStyle;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxTemplateItem();
SfxTemplateItem( sal_uInt16 nWhich,
const OUString &rStyle,
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 7626770bc7d3..cbb06866d100 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -86,7 +86,6 @@ protected:
public:
SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc = nullptr );
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM)
private:
@@ -280,7 +279,6 @@ class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem
SfxViewFrame* pFrame;
public:
- TYPEINFO_OVERRIDE();
SfxViewFrameItem( SfxViewFrame *pViewFrame ):
SfxPoolItem( 0 ),
pFrame( pViewFrame)
@@ -302,7 +300,6 @@ class SfxVerbListItem : public SfxPoolItem
css::uno::Sequence < css::embed::VerbDescriptor > aVerbs;
public:
- TYPEINFO_OVERRIDE();
SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) :
SfxPoolItem( nWhichId )
{}
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 669e9a5bbe38..86323a9ce1c5 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -181,7 +181,6 @@ public:
static SfxViewShell* Get( const css::uno::Reference< css::frame::XController>& i_rController );
// Initialize Constructors/Destructors
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
private:
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index 9e9205950f7c..d595b7ec24d9 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -58,7 +58,7 @@ class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item
SvxZoomType eType;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxZoomItem( SvxZoomType eZoomType = SvxZoomType::PERCENT,
sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM );
diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx
index 0c8d75485151..3fe2fcad0954 100644
--- a/include/sot/factory.hxx
+++ b/include/sot/factory.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SOT_FACTORY_HXX
#include <tools/globname.hxx>
-#include <tools/rtti.hxx>
#include <sot/sotdllapi.h>
#include <vector>
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 9ce5cddfffb2..90cf9be52cac 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/embed/XStorage.hpp>
-#include <tools/rtti.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/globname.hxx>
@@ -54,7 +53,6 @@ protected:
StorageBase();
virtual ~StorageBase();
public:
- TYPEINFO();
virtual bool Validate( bool=false ) const = 0;
virtual bool ValidateMode( StreamMode ) const = 0;
void ResetError() const;
@@ -69,7 +67,6 @@ public:
class BaseStorageStream : public StorageBase
{
public:
- TYPEINFO_OVERRIDE();
virtual sal_uLong Read( void * pData, sal_uLong nSize ) = 0;
virtual sal_uLong Write( const void* pData, sal_uLong nSize ) = 0;
virtual sal_uInt64 Seek( sal_uInt64 nPos ) = 0;
@@ -87,7 +84,6 @@ enum class SotClipboardFormatId : sal_uLong;
class BaseStorage : public StorageBase
{
public:
- TYPEINFO_OVERRIDE();
virtual const OUString& GetName() const = 0;
virtual bool IsRoot() const = 0;
virtual void SetClassId( const ClsId& ) = 0;
@@ -143,7 +139,6 @@ class StorageStream : public BaseStorageStream, public OLEStorageBase
protected:
virtual ~StorageStream();
public:
- TYPEINFO_OVERRIDE();
StorageStream( StgIo*, StgDirEntry*, StreamMode );
virtual sal_uLong Read( void * pData, sal_uLong nSize ) override;
virtual sal_uLong Write( const void* pData, sal_uLong nSize ) override;
@@ -170,7 +165,6 @@ class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase
protected:
virtual ~Storage();
public:
- TYPEINFO_OVERRIDE();
Storage( const OUString &, StreamMode = STREAM_STD_READWRITE, bool bDirect = true );
Storage( SvStream& rStrm, bool bDirect = true );
Storage( UCBStorageStream& rStrm, bool bDirect = true );
@@ -227,7 +221,6 @@ friend class UCBStorage;
protected:
virtual ~UCBStorageStream();
public:
- TYPEINFO_OVERRIDE();
UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > xProgress );
UCBStorageStream( UCBStorageStream_Impl* );
@@ -282,7 +275,6 @@ public:
UCBStorage( UCBStorage_Impl* );
UCBStorage( SvStream& rStrm, bool bDirect = true );
- TYPEINFO_OVERRIDE();
virtual const OUString& GetName() const override;
virtual bool IsRoot() const override;
virtual void SetClassId( const ClsId& ) override;
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index c44e96ded1b4..97afa702c224 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVL_BRDCST_HXX
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
class SfxListener;
class SfxHint;
@@ -40,7 +39,6 @@ protected:
void Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
public:
- TYPEINFO();
SfxBroadcaster();
SfxBroadcaster( const SfxBroadcaster &rBC );
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 3dce3b88429f..715d7419d40c 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -35,7 +35,8 @@ protected:
sal_uInt16 _GetPosByValue( sal_uInt16 nValue ) const;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SfxAllEnumItem();
explicit SfxAllEnumItem( sal_uInt16 nWhich);
SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal );
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index ad9ce1867629..6a027b3132c5 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -32,7 +32,6 @@ protected:
SfxPoolItem(rItem) {}
public:
- TYPEINFO_OVERRIDE();
virtual bool operator ==(const SfxPoolItem & rItem) const override;
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index a6861141fe3e..5f23dd12116c 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -29,7 +29,6 @@ class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem
sal_uInt8 m_nValue;
public:
- TYPEINFO_OVERRIDE();
CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue) {}
@@ -76,7 +75,6 @@ class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem
sal_uInt16 m_nValue;
public:
- TYPEINFO_OVERRIDE();
CntUInt16Item(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
@@ -126,7 +124,6 @@ class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem
sal_Int32 m_nValue;
public:
- TYPEINFO_OVERRIDE();
CntInt32Item(sal_uInt16 which = 0, sal_Int32 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
@@ -176,7 +173,6 @@ class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem
sal_uInt32 m_nValue;
public:
- TYPEINFO_OVERRIDE();
CntUInt32Item(sal_uInt16 which = 0, sal_uInt32 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index a9fb8e1aa771..8d1e04bdb267 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -21,7 +21,6 @@
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
@@ -35,7 +34,6 @@ private:
sal_uInt16 _nStyle;
public:
- TYPEINFO_OVERRIDE();
CntWallpaperItem( sal_uInt16 nWhich );
CntWallpaperItem( sal_uInt16 nWhich, SvStream& rStream, sal_uInt16 nVersion );
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 64beb5fe4181..52cd22e1891b 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -31,7 +31,6 @@ private:
OUString _aPresentation;
public:
- TYPEINFO_OVERRIDE();
CntContentTypeItem();
CntContentTypeItem( sal_uInt16 nWhich, const OUString& rType );
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 142c4c33c344..aa6d220b381d 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -29,7 +29,6 @@ class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem
OUString m_aValue;
public:
- TYPEINFO_OVERRIDE();
CntUnencodedStringItem(sal_uInt16 which = 0): SfxPoolItem(which)
{}
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 84d9f4270ae4..b4f6f083c052 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -44,7 +44,6 @@ protected:
SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream);
public:
- TYPEINFO_OVERRIDE();
sal_uInt16 GetValue() const { return m_nValue; }
@@ -67,7 +66,7 @@ class SVL_DLLPUBLIC SfxBoolItem
bool m_bValue;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxBoolItem(sal_uInt16 const nWhich = 0, bool const bValue = false)
: SfxPoolItem(nWhich)
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 3b78d7ed6cd9..f43d3d05b9aa 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -21,7 +21,6 @@
#include <svl/poolitem.hxx>
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
class SvStream;
@@ -30,7 +29,6 @@ class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
sal_uInt16 nVal;
public:
- TYPEINFO_OVERRIDE();
explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
SfxFlagItem( const SfxFlagItem& );
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 7128cda41350..94011d088583 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVL_GLOBALNAMEITEM_HXX
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
#include <tools/globname.hxx>
#include <svl/poolitem.hxx>
@@ -29,7 +28,8 @@ class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
SvGlobalName m_aName;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SfxGlobalNameItem();
SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& );
virtual ~SfxGlobalNameItem();
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 95bcf11b7ba8..5f459e894990 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -12,7 +12,6 @@
#include <map>
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Any.hxx>
@@ -23,7 +22,6 @@ private:
std::map<OUString, css::uno::Any> m_aMap;
public:
- TYPEINFO_OVERRIDE();
SfxGrabBagItem();
SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, css::uno::Any>* pMap = nullptr);
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index e3f2bc56f216..bbcbe44c4f6d 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -30,8 +30,7 @@ class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem
css::uno::Sequence < sal_Int32 > m_aList;
public:
- TYPEINFO_OVERRIDE();
-
+ static SfxPoolItem* CreateDefault();
SfxIntegerListItem();
SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList );
SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList );
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 662eed5dc7ff..570c7453a5d8 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -28,7 +28,7 @@ class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item
{
SfxImageItem_Impl* pImp;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
SfxImageItem( const SfxImageItem& );
virtual ~SfxImageItem();
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index ff5e7af020aa..8eceede33e21 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -27,7 +27,7 @@
class SVL_DLLPUBLIC SfxByteItem: public CntByteItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0):
CntByteItem(which, nValue) {}
@@ -43,7 +43,7 @@ class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem
sal_Int16 m_nValue;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
@@ -92,7 +92,7 @@ inline void SfxInt16Item::SetValue(sal_Int16 nTheValue)
class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0):
CntUInt16Item(which, nValue) {}
@@ -113,7 +113,7 @@ public:
class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0):
CntInt32Item(which, nValue) {}
@@ -133,7 +133,7 @@ public:
class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0):
CntUInt32Item(which, nValue) {}
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 3c2cba1e0e7d..ef8956f8b8b4 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -23,7 +23,6 @@
#include <cstdarg>
#include <svl/poolitem.hxx>
-#include <tools/rtti.hxx>
class SfxItemPool;
class SfxPoolItem;
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 589bcff52078..64d5ff0c36d8 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -21,7 +21,6 @@
#include <svl/poolitem.hxx>
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
@@ -29,7 +28,7 @@ class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
SvLockBytesRef _xVal;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxLockBytesItem();
SfxLockBytesItem( sal_uInt16 nWhich, SvStream & );
SfxLockBytesItem( const SfxLockBytesItem& );
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index e3ce43ff9cf0..bfa2330805ed 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVL_LSTNER_HXX
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
class SfxBroadcaster;
class SfxHint;
@@ -34,7 +33,6 @@ private:
const SfxListener& operator=(const SfxListener &) = delete;
public:
- TYPEINFO();
SfxListener();
SfxListener( const SfxListener &rCopy );
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 43e9a394048f..38babec730ef 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -24,7 +24,6 @@
#include <rtl/ustring.hxx>
#include <svl/svldllapi.h>
#include <svl/poolitem.hxx>
-#include <tools/rtti.hxx>
#include <map>
class SvStream;
@@ -120,7 +119,7 @@ This item describes a Macro table.
class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit inline SvxMacroItem ( const sal_uInt16 nId );
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index d594e523d168..39ce85159159 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -25,7 +25,6 @@
class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
{
public:
- TYPEINFO_OVERRIDE();
explicit SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 );
SfxMetricItem( sal_uInt16 nWhich, SvStream & );
SfxMetricItem( const SfxMetricItem& );
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index ff83ea32df8b..6f143bb88f88 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -28,7 +28,7 @@
#include <svl/hint.hxx>
#include <svl/svldllapi.h>
#include <tools/debug.hxx>
-#include <tools/rtti.hxx>
+#include <tools/solar.h>
class IntlWrapper;
class SvStream;
@@ -161,7 +161,6 @@ protected:
SfxPoolItem( const SfxPoolItem& );
public:
- TYPEINFO();
virtual ~SfxPoolItem();
void SetWhich( sal_uInt16 nId ) { m_nWhich = nId; }
@@ -252,7 +251,7 @@ class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem
{
SfxVoidItem & operator=( const SfxVoidItem& ) = delete;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SfxVoidItem( sal_uInt16 nWhich );
SfxVoidItem( sal_uInt16 nWhich, SvStream & );
SfxVoidItem( const SfxVoidItem& );
@@ -277,7 +276,6 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
SfxSetItem & operator=( const SfxSetItem& ) = delete;
public:
- TYPEINFO_OVERRIDE();
SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet );
SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet );
SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = nullptr );
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 4e5e51dddf85..ad863ea5c284 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -30,7 +30,7 @@ class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
Point aVal;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxPointItem();
SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
SfxPointItem( const SfxPointItem& );
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index c6bab73dc38c..3d94941f3a4a 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
Rectangle aVal;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxRectangleItem();
SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal );
SfxRectangleItem( const SfxRectangleItem& );
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 8739be11e4e5..3170df70b5c1 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -33,7 +33,6 @@ private:
sal_uInt16 nFrom;
sal_uInt16 nTo;
public:
- TYPEINFO_OVERRIDE();
SfxRangeItem();
SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
SfxRangeItem( const SfxRangeItem& rItem );
@@ -57,7 +56,6 @@ private:
sal_uInt16* _pRanges;
public:
- TYPEINFO_OVERRIDE();
SfxUShortRangesItem();
SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream );
SfxUShortRangesItem( const SfxUShortRangesItem& rItem );
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 57bc2e34eaea..51662456e94c 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -22,7 +22,6 @@
#include <vector>
#include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Sequence.h>
@@ -34,7 +33,7 @@ protected:
SfxImpStringList* pImp;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxStringListItem();
SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=nullptr );
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index acca4911fbcb..a2f3d79bfda6 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -92,7 +92,7 @@ class SVL_DLLPUBLIC SvxSearchItem :
virtual void ImplCommit() override;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit SvxSearchItem( const sal_uInt16 nId );
SvxSearchItem( const SvxSearchItem& rItem );
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index ca20acc142f5..3d5a2c1a0eda 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -27,7 +27,7 @@
class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxStringItem(sal_uInt16 which = 0): CntUnencodedStringItem(which) {}
@@ -43,6 +43,7 @@ public:
virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override;
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+
};
#endif // INCLUDED_SVL_STRITEM_HXX
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index c1d9a8209b7a..174986e7300c 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -98,7 +98,6 @@ protected:
virtual void Store( SvStream& );
public:
- TYPEINFO();
// returns the internal name of this style
virtual const OUString& GetName() const;
@@ -267,7 +266,6 @@ class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
public SfxListener, public SfxBroadcaster, public svl::StyleSheetUser
{
public:
- TYPEINFO_OVERRIDE();
SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 );
SfxStyleSheet( const SfxStyleSheet& );
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index f9d3d1248fae..621f7c9c44bc 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -31,7 +31,6 @@ private:
Size aVal;
public:
- TYPEINFO_OVERRIDE();
SfxSizeItem();
SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
SfxSizeItem( const SfxSizeItem& );
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 96c77cb600f1..d5bb705efbc6 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -21,7 +21,6 @@
#include <svl/svldllapi.h>
#include <rtl/ustring.hxx>
-#include <tools/rtti.hxx>
#include <limits>
#include <memory>
@@ -31,7 +30,6 @@ struct MarkedUndoAction;
class SVL_DLLPUBLIC SfxRepeatTarget
{
public:
- TYPEINFO();
virtual ~SfxRepeatTarget() = 0;
};
@@ -52,7 +50,6 @@ private:
SfxLinkUndoAction* mpSfxLinkUndoAction;
public:
- TYPEINFO();
SfxUndoAction();
virtual ~SfxUndoAction();
@@ -139,7 +136,6 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
Impl* mpImpl;
public:
- TYPEINFO_OVERRIDE();
SfxListUndoAction(
const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, SfxUndoArray *pFather );
@@ -424,7 +420,6 @@ private:
void LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate);
public:
- TYPEINFO_OVERRIDE();
SfxLinkUndoAction(::svl::IUndoManager *pManager);
virtual ~SfxLinkUndoAction();
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 0819d35f28e5..9479f2c737ba 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -29,7 +29,6 @@ class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem
css::frame::status::Visibility m_nValue;
public:
- TYPEINFO_OVERRIDE();
explicit SfxVisibilityItem(sal_uInt16 which = 0, bool bVisible = true):
SfxPoolItem(which)
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index baa82f7ab54b..00af59b1abd2 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -23,7 +23,6 @@
#include <svtools/svtdllapi.h>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
#include <vcl/window.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
@@ -90,7 +89,6 @@ namespace svt
bool bSuspended; // <true> if the window is hidden and disabled
public:
- TYPEINFO();
CellController(Control* pW);
virtual ~CellController();
@@ -237,7 +235,6 @@ namespace svt
bool m_bOwnImplementation; // did we create m_pEditImplementation?
public:
- TYPEINFO_OVERRIDE();
EditCellController( Edit* _pEdit );
EditCellController( IEditImplementation* _pImplementation );
virtual ~EditCellController( );
@@ -261,7 +258,6 @@ namespace svt
class SVT_DLLPUBLIC SpinCellController : public CellController
{
public:
- TYPEINFO_OVERRIDE();
SpinCellController(SpinField* pSpinField);
const SpinField& GetSpinWindow() const { return static_cast<const SpinField &>(GetWindow()); }
SpinField& GetSpinWindow() { return static_cast<SpinField &>(GetWindow()); }
@@ -315,7 +311,6 @@ namespace svt
class SVT_DLLPUBLIC CheckBoxCellController : public CellController
{
public:
- TYPEINFO_OVERRIDE();
CheckBoxCellController(CheckBoxControl* pWin);
CheckBox& GetCheckBox() const;
@@ -349,7 +344,6 @@ namespace svt
class SVT_DLLPUBLIC ComboBoxCellController : public CellController
{
public:
- TYPEINFO_OVERRIDE();
ComboBoxCellController(ComboBoxControl* pParent);
ComboBoxControl& GetComboBox() const { return static_cast<ComboBoxControl &>(GetWindow()); }
@@ -383,7 +377,6 @@ namespace svt
class SVT_DLLPUBLIC ListBoxCellController : public CellController
{
public:
- TYPEINFO_OVERRIDE();
ListBoxCellController(ListBoxControl* pParent);
const ListBoxControl& GetListBox() const { return static_cast<const ListBoxControl &>(GetWindow()); }
@@ -404,7 +397,6 @@ namespace svt
class SVT_DLLPUBLIC FormattedFieldCellController : public EditCellController
{
public:
- TYPEINFO_OVERRIDE();
FormattedFieldCellController( FormattedField* _pFormatted );
virtual void CommitModifications() override;
diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index 1326b7814074..e9b7ab2af541 100644
--- a/include/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
@@ -38,7 +38,6 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
XWindowItem & operator = ( const XWindowItem & ) = delete;
public:
- TYPEINFO_OVERRIDE();
XWindowItem();
XWindowItem( const XWindowItem &rItem );
virtual ~XWindowItem();
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index 3381acd18ac2..ff8617c0a1dc 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -29,7 +29,6 @@ private:
css::geometry::AffineMatrix2D maMatrix;
public:
- TYPEINFO_OVERRIDE();
AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix = nullptr);
AffineMatrixItem(SvStream& rIn);
AffineMatrixItem(const AffineMatrixItem&);
diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 6b0c78564a92..63292ff50972 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem
const OUString maRangeText;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxSmartTagItem( const sal_uInt16 nId,
const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index a550f6a852d7..00431635dd89 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -30,7 +30,7 @@ class SvStream;
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxOrientationItem: public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxOrientationItem(
const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/,
@@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxMarginItem: public SfxPoolItem
sal_Int16 nRightMargin;
sal_Int16 nBottomMargin;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxMarginItem( const sal_uInt16 nId );
SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 28734b791f93..3ffbc4be9a01 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -165,7 +165,6 @@ enum SvxChartRegress
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartStyleItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
sal_uInt16 nId );
SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId );
@@ -180,7 +179,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartRegressItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
sal_uInt16 nId );
SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId );
@@ -197,7 +195,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartDataDescrItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartDataDescrItem(SvStream& rIn,
sal_uInt16 nId );
@@ -210,7 +207,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrderItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
sal_uInt16 nId );
SvxChartTextOrderItem(SvStream& rIn,
@@ -230,7 +226,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrientItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartTextOrientItem(SvStream& rIn,
sal_uInt16 nId );
@@ -243,7 +238,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartKindErrorItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
sal_uInt16 nId );
SvxChartKindErrorItem(SvStream& rIn,
@@ -262,7 +256,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartIndicateItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
sal_uInt16 nId );
SvxChartIndicateItem(SvStream& rIn,
@@ -283,7 +276,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDoubleItem : public SfxPoolItem
double fVal;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
SvxDoubleItem(const SvxDoubleItem& rItem);
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 91a353adefa0..b37a9785cbb8 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -35,7 +35,7 @@ protected:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxClipboardFormatItem( sal_uInt16 nId = 0 );
SvxClipboardFormatItem( const SvxClipboardFormatItem& );
virtual ~SvxClipboardFormatItem();
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index c40cfd436232..62d0354dcd5d 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -57,7 +57,6 @@ protected:
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
public:
- TYPEINFO_OVERRIDE();
E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize);
E3dCubeObj();
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index db33d5bbdf5e..c8fa8c87d6c4 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -30,7 +30,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxColorListItem: public SfxPoolItem
XColorListRef pColorList;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SvxColorListItem();
SvxColorListItem( XColorListRef pTable,
sal_uInt16 nWhich );
@@ -54,7 +55,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxGradientListItem : public SfxPoolItem
XGradientListRef pGradientList;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SvxGradientListItem();
SvxGradientListItem( XGradientListRef pList,
sal_uInt16 nWhich );
@@ -78,7 +80,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxHatchListItem : public SfxPoolItem
XHatchListRef pHatchList;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxHatchListItem();
SvxHatchListItem( XHatchListRef pList,
sal_uInt16 nWhich );
@@ -102,7 +104,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBitmapListItem : public SfxPoolItem
XBitmapListRef pBitmapList;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SvxBitmapListItem();
SvxBitmapListItem( XBitmapListRef pBL,
sal_uInt16 nWhich );
@@ -126,7 +129,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDashListItem : public SfxPoolItem
XDashListRef pDashList;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SvxDashListItem();
SvxDashListItem( XDashListRef pList,
sal_uInt16 nWhich );
@@ -150,7 +154,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxLineEndListItem : public SfxPoolItem
XLineEndListRef pLineEndList;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
SvxLineEndListItem();
SvxLineEndListItem( XLineEndListRef pList,
sal_uInt16 nWhich );
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 643438edd1f7..9dc5ed3cd339 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxB3DVectorItem : public SfxPoolItem
basegfx::B3DVector aVal;
public:
- TYPEINFO_OVERRIDE();
SvxB3DVectorItem();
SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
SvxB3DVectorItem( const SvxB3DVectorItem& );
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 4bf65c9bc6cb..52ab60e86caa 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -36,7 +36,6 @@ class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction
E3dObject *pMy3DObj;
public:
- TYPEINFO_OVERRIDE();
E3dUndoAction (SdrModel *pModel,
E3dObject *p3DObj) :
SdrUndoAction (*pModel),
@@ -60,7 +59,6 @@ class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction
basegfx::B3DHomMatrix aMyNewRotation;
public:
- TYPEINFO_OVERRIDE();
E3dRotateUndoAction (SdrModel *pModel,
E3dObject *p3DObj,
const basegfx::B3DHomMatrix &aOldRotation,
@@ -93,7 +91,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dAttributesUndoAction : public SdrUndoActi
const SfxItemSet aOldSet;
public:
- TYPEINFO_OVERRIDE();
E3dAttributesUndoAction( SdrModel &rModel,
E3dObject* pInObject,
const SfxItemSet& rNewSet,
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 2a01b16114aa..06b5b6eafc42 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -44,7 +44,6 @@ protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
public:
- TYPEINFO_OVERRIDE();
E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth);
E3dExtrudeObj();
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 9a42d6c631f6..afd8de097e31 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -38,7 +38,6 @@ SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyEx
class SVX_DLLPUBLIC SAL_WARN_UNUSED ExtrusionBar : public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR)
private:
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 06a21fb35a5e..cdc0e7f57b95 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -46,7 +46,6 @@ private:
void operator=(const FmFormModel& rSrcModel) = delete;
public:
- TYPEINFO_OVERRIDE();
FmFormModel(SfxItemPool* pPool=nullptr, SfxObjectShell* pPers=nullptr );
FmFormModel(const OUString& rPath, SfxItemPool* pPool=nullptr,
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 03139b02e1db..044665d3b44c 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -47,7 +47,6 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
OUString m_sPageName;
public:
- TYPEINFO_OVERRIDE();
explicit FmFormPage(FmFormModel& rModel, bool bMasterPage=false);
virtual ~FmFormPage();
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 7250ea1bf3aa..0549cbd31d2d 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -99,7 +99,6 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
public:
SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 1549cecda66e..536eedd89e20 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -61,7 +61,6 @@ class SVX_DLLPUBLIC FmFormView : public E3dView
void Init();
public:
- TYPEINFO_OVERRIDE();
FmFormView(FmFormModel* pModel, OutputDevice* pOut = nullptr);
virtual ~FmFormView();
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 2b2ee1952438..67ed03c7c52d 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -38,7 +38,6 @@ bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nChe
class SVX_DLLPUBLIC SAL_WARN_UNUSED FontworkBar : public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR)
private:
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 59fe41463285..ecfe03f57a0c 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem
css::uno::Reference< css::graphic::XGraphic > m_xGraphic;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxGalleryItem();
SvxGalleryItem( const SvxGalleryItem& );
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index e5d590bea879..df22c2060061 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -32,7 +32,6 @@
class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index b65f553a61fb..24d79c9df7eb 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -50,7 +50,7 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem
sal_uInt16 nMacroEvents;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ):
SfxPoolItem(_nWhich), pMacroTable(nullptr) { eType = HLINK_DEFAULT; nMacroEvents=0; };
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index ec999b516582..1899949cb4a6 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -46,7 +46,6 @@ private:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
public:
- TYPEINFO_OVERRIDE();
E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D);
E3dLatheObj();
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 7e5b49d76891..cbc76bc3eee8 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -34,7 +34,6 @@ This item is used as a transport medium for a number formatter
class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
SvxNumberInfoItem( const sal_uInt16 nId );
SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index cce441b9af8b..036663222b9e 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -81,7 +81,6 @@ class E3dObjList : public SdrObjList
E3dObjList &operator=(const E3dObjList& rSrcList) = delete;
public:
- TYPEINFO_OVERRIDE();
E3dObjList(SdrModel* pNewModel = nullptr, SdrPage* pNewPage = nullptr, E3dObjList* pNewUpList = nullptr);
SVX_DLLPUBLIC virtual ~E3dObjList();
@@ -142,7 +141,6 @@ protected:
E3dObject(bool bIsFromChart);
public:
- TYPEINFO_OVERRIDE();
virtual void RecalcSnapRect() override;
virtual void SetRectsDirty(bool bNotMyself = false) override;
@@ -244,7 +242,6 @@ protected:
basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate);
public:
- TYPEINFO_OVERRIDE();
E3dCompoundObject();
E3dCompoundObject(E3dDefaultAttributes& rDefault);
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 5c5be296c234..0a2b0c3f4257 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -68,7 +68,7 @@ private:
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPageItem( const sal_uInt16 nId );
SvxPageItem( const SvxPageItem& rItem );
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index 5196cb3eeade..e94931389711 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -43,7 +43,6 @@ public:
void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
- TYPEINFO_OVERRIDE();
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx
index d50c5a49ab0b..4526bca338e1 100644
--- a/include/svx/polysc3d.hxx
+++ b/include/svx/polysc3d.hxx
@@ -32,7 +32,6 @@
class SVX_DLLPUBLIC E3dPolyScene : public E3dScene
{
public:
- TYPEINFO_OVERRIDE();
E3dPolyScene();
E3dPolyScene(E3dDefaultAttributes& rDefault);
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 7d4f8bef0137..edcf0c0d0f7c 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -33,7 +33,7 @@ The author shorthand symbol of a note
class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPostItAuthorItem( sal_uInt16 nWhich );
@@ -64,7 +64,7 @@ The date of a note
class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPostItDateItem( sal_uInt16 nWhich );
@@ -95,7 +95,7 @@ The text of a note
class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPostItTextItem( sal_uInt16 nWhich );
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index 174291bbad18..9604b4a54e8a 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -37,7 +37,7 @@ enum SvxRotateMode
class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0);
SvxRotateModeItem( const SvxRotateModeItem& rItem );
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 4e5f4cdc3bbb..70dade511030 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -46,7 +46,7 @@ private:
const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId);
SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
SvxLongLRSpaceItem();
@@ -79,7 +79,7 @@ private:
const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId);
SvxLongULSpaceItem(const SvxLongULSpaceItem &);
SvxLongULSpaceItem();
@@ -110,7 +110,7 @@ protected:
private:
const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight);
SvxPagePosSizeItem(const SvxPagePosSizeItem &);
SvxPagePosSizeItem();
@@ -179,7 +179,7 @@ protected:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
// right edge of the surrounding frame
// nLeft, nRight each the distance to the surrounding frame
SvxColumnItem(sal_uInt16 nAct = 0);
@@ -237,7 +237,7 @@ private:
const SvxObjectItem &operator=(const SvxObjectItem &) = delete;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxObjectItem(long nStartX, long nEndX,
long nStartY, long nEndY,
bool bLimits = false);
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 7c61e7e89cc4..f8642e02b540 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -88,7 +88,6 @@ protected:
void ImpCleanup3DDepthMapper();
public:
- TYPEINFO_OVERRIDE();
E3dScene();
E3dScene(E3dDefaultAttributes& rDefault);
virtual ~E3dScene();
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 709e71d1ed01..d0920f85bfe9 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -28,7 +28,6 @@
class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
public:
- TYPEINFO_OVERRIDE();
SdrAngleItem(): SfxInt32Item() {}
SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {}
SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx
index 40126247bee1..2dea1c4e2030 100644
--- a/include/svx/sdasaitm.hxx
+++ b/include/svx/sdasaitm.hxx
@@ -31,16 +31,15 @@ class SdrCustomShapeAdjustmentValue
friend class SdrCustomShapeAdjustmentItem;
};
-class SdrCustomShapeAdjustmentItem : public SfxPoolItem
+class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem
{
std::vector<SdrCustomShapeAdjustmentValue> aAdjustmentValueList;
public:
- TYPEINFO_OVERRIDE();
- SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem();
+ SdrCustomShapeAdjustmentItem();
SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion );
- SVX_DLLPUBLIC virtual ~SdrCustomShapeAdjustmentItem();
+ virtual ~SdrCustomShapeAdjustmentItem();
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation(SfxItemPresentation ePresentation,
@@ -55,8 +54,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); };
- SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const;
- SVX_DLLPUBLIC void SetValue( sal_uInt32 nIndex,
+ const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const;
+ void SetValue( sal_uInt32 nIndex,
const SdrCustomShapeAdjustmentValue& rVal );
};
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 1fb2a997ac96..6712a3aeb690 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -51,7 +51,6 @@ private:
public:
- TYPEINFO_OVERRIDE();
SdrCustomShapeGeometryItem();
SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& );
@@ -85,10 +84,12 @@ private:
void ClearPropertyValue( const OUString& rPropertyName );
};
-class SdrCustomShapeReplacementURLItem : public SfxStringItem
+class SVX_DLLPUBLIC SdrCustomShapeReplacementURLItem : public SfxStringItem
{
public:
SdrCustomShapeReplacementURLItem();
+ virtual ~SdrCustomShapeReplacementURLItem();
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override;
};
inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) {
diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx
index bf4d64bcd856..39de80213726 100644
--- a/include/svx/sdgcoitm.hxx
+++ b/include/svx/sdgcoitm.hxx
@@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {}
SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {}
@@ -49,7 +48,6 @@ class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {}
SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {}
@@ -66,7 +64,6 @@ class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {}
SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {}
diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx
index ad7e6623b5c6..ccdaa9388242 100644
--- a/include/svx/sdgcpitm.hxx
+++ b/include/svx/sdgcpitm.hxx
@@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0,
sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0,
diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx
index 637ddc8c14ab..6dcb04186848 100644
--- a/include/svx/sdggaitm.hxx
+++ b/include/svx/sdggaitm.hxx
@@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {}
diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx
index 4c56571f0ae1..ace78b684115 100644
--- a/include/svx/sdginitm.hxx
+++ b/include/svx/sdginitm.hxx
@@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {}
diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx
index d5e1dda99185..f935edf5b5c4 100644
--- a/include/svx/sdgluitm.hxx
+++ b/include/svx/sdgluitm.hxx
@@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {}
SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {}
@@ -49,7 +48,6 @@ class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {}
SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {}
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 50ec71cbfaf9..3722511c17bc 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -33,7 +33,6 @@ class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {}
SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {}
diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
index 8d10226e3520..9b24c0329faf 100644
--- a/include/svx/sdgtritm.hxx
+++ b/include/svx/sdgtritm.hxx
@@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
{
public:
- TYPEINFO_OVERRIDE();
SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {}
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index 26221899b632..2ec9ba0c33aa 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -30,7 +30,6 @@
class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
- TYPEINFO_OVERRIDE();
SdrMetricItem(): SfxInt32Item() {}
SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {}
SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index da42ef403359..426bb5245a2b 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -30,7 +30,6 @@
class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
public:
- TYPEINFO_OVERRIDE();
SdrOnOffItem(): SfxBoolItem() {}
SdrOnOffItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {}
SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index c25179edab07..1a66630e4ddc 100644
--- a/include/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
@@ -31,7 +31,6 @@
class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
SdrPercentItem(): SfxUInt16Item() {}
SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {}
SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {}
@@ -49,7 +48,6 @@ public:
class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
{
public:
- TYPEINFO_OVERRIDE();
SdrSignedPercentItem(): SfxInt16Item() {}
SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx
index 18c4a88b3238..ed4a40ad6136 100644
--- a/include/svx/sdtaaitm.hxx
+++ b/include/svx/sdtaaitm.hxx
@@ -25,7 +25,6 @@
class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item {
public:
- TYPEINFO_OVERRIDE();
SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index eb2daff1fbe3..57bba8f13333 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -34,7 +34,6 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT,
class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {}
SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index 31b84ee7a070..03db38dc214f 100644
--- a/include/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
@@ -22,16 +22,20 @@
#include <svx/sdynitm.hxx>
#include <svx/svddef.hxx>
-class SdrTextAniStartInsideItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrTextAniStartInsideItem: public SdrYesNoItem {
public:
SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {}
+ virtual ~SdrTextAniStartInsideItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
-class SdrTextAniStopInsideItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrTextAniStopInsideItem: public SdrYesNoItem {
public:
SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {}
+ virtual ~SdrTextAniStopInsideItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
#endif
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 65079f9a9d8d..590df23ce2ce 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -35,7 +35,6 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally
class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {}
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich,(sal_uInt16)eAdj) {}
SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {}
@@ -63,7 +62,6 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted
class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {}
SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 0ffb06114462..b181dea967b7 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -78,7 +78,6 @@ enum SdrTextAniKind {
class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {}
SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx
index 3bf6f6705a06..ee583952fef1 100644
--- a/include/svx/sdtayitm.hxx
+++ b/include/svx/sdtayitm.hxx
@@ -25,7 +25,6 @@
class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item {
public:
- TYPEINFO_OVERRIDE();
SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 47faebebde22..e4cb5e2594fe 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -25,7 +25,6 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false );
SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index ec6230f5202c..0b64a01049bc 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -44,7 +44,7 @@ enum SdrFitToSizeType {
class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {}
SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index a7f1b56a5d00..ff3bb995bfa8 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -30,7 +30,6 @@
//-------------------------------------------------- ----------
class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
public:
- TYPEINFO_OVERRIDE();
SdrYesNoItem(): SfxBoolItem() {}
SdrYesNoItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {}
SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index b1c7a07d4ab7..c0ba4bbf8ceb 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -39,7 +39,6 @@ protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
public:
- TYPEINFO_OVERRIDE();
E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize);
// FG: This constructor is only called from MakeObject from the 3d-Objectfactory
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 2d4a5864813a..2820436a33f4 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -180,7 +180,6 @@ protected:
drawinglayer::primitive2d::Primitive2DSequence AddConnectorOverlays();
public:
- TYPEINFO();
void resetSdrDragEntries();
basegfx::B2DRange getCurrentRange() const;
@@ -238,7 +237,6 @@ protected:
virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) override;
public:
- TYPEINFO_OVERRIDE();
SdrDragMove(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -261,7 +259,6 @@ protected:
Fraction aYFact;
public:
- TYPEINFO_OVERRIDE();
SdrDragResize(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -290,7 +287,6 @@ protected:
virtual void createSdrDragEntries() override;
public:
- TYPEINFO_OVERRIDE();
SdrDragObjOwn(SdrDragView& rNewView);
virtual ~SdrDragObjOwn();
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index ab42395a664e..8f80c02fa697 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -279,7 +279,6 @@ private:
public:
bool IsPasteResize() const { return bPasteResize; }
void SetPasteResize(bool bOn) { bPasteResize=bOn; }
- TYPEINFO_OVERRIDE();
// If a custom Pool is put here, the class will call methods
// on it (Put(), Remove()). On disposal of SdrModel the pool
// will be deleted with delete.
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 96c133c02d17..c7628fb06c2c 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -161,7 +161,6 @@ public:
double GetObjectRotation() const { return fObjectRotation;}
double GetExtraTextRotation( const bool bPreRotation = false ) const;
- TYPEINFO_OVERRIDE();
SdrObjCustomShape();
virtual ~SdrObjCustomShape();
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index 857069cb2f66..c2b86d842da3 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -63,7 +63,6 @@ protected:
virtual ~SdrAttrObj();
public:
- TYPEINFO_OVERRIDE();
// Detects if bFilledObj && Fill != FillNone
bool HasFill() const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 401ce8782866..e14d1d306c2f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -159,7 +159,6 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // only moved, size unchange
class SVX_DLLPUBLIC SdrObjUserCall
{
public:
- TYPEINFO();
virtual ~SdrObjUserCall();
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect);
};
@@ -408,7 +407,6 @@ protected:
virtual ~SdrObject();
public:
- TYPEINFO_OVERRIDE();
SdrObject();
// frees the SdrObject pointed to by the argument
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 4374c2b047b0..2cbe7445271a 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -74,7 +74,6 @@ private:
SVX_DLLPRIVATE void ImpRecalcTail();
public:
- TYPEINFO_OVERRIDE();
SdrCaptionObj();
SdrCaptionObj(const Rectangle& rRect, const Point& rTail);
virtual ~SdrCaptionObj();
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 3823dcfd25f9..0245fdca7cfc 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -68,7 +68,6 @@ protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
public:
- TYPEINFO_OVERRIDE();
SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect or CCut
SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect);
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index c27ca02f3dfe..c4d901f84642 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -208,7 +208,6 @@ protected:
void ImpSetEdgeInfoToAttr(); // Werte vom aEdgeInfo in den Pool kopieren
public:
- TYPEINFO_OVERRIDE();
SdrEdgeObj();
virtual ~SdrEdgeObj();
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index d4bf3df574d7..d596d22a256e 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -115,7 +115,6 @@ private:
void onGraphicChanged();
public:
- TYPEINFO_OVERRIDE();
SdrGrafObj();
SdrGrafObj(const Graphic& rGrf);
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 76b5c5b998ca..d8e16d5612af 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -47,7 +47,6 @@ protected:
bool bRefPoint; // Ist ein RefPoint gesetzt?
public:
- TYPEINFO_OVERRIDE();
SdrObjGroup();
virtual ~SdrObjGroup();
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index ad8edf9a18c3..2a079e49ed6f 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -85,7 +85,6 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
public:
- TYPEINFO_OVERRIDE();
SdrMeasureObj();
SdrMeasureObj(const Point& rPt1, const Point& rPt2);
virtual ~SdrMeasureObj();
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 59bfe442a49d..307c4d0b3fdf 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -38,7 +38,6 @@ class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj
public:
- TYPEINFO_OVERRIDE();
SdrMediaObj();
SdrMediaObj( const Rectangle& rRect );
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 56ebce724092..2d0b49d6da46 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -65,7 +65,6 @@ protected:
public:
OUString GetStyleString();
- TYPEINFO_OVERRIDE();
SdrOle2Obj( bool bFrame_ = false );
SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false );
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index c7cbe19daa87..fa3ba75e4110 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -41,7 +41,6 @@ protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
public:
- TYPEINFO_OVERRIDE();
SdrPageObj(SdrPage* pNewPage = nullptr);
SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = nullptr);
virtual ~SdrPageObj();
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 56ee423c44ed..b1af6fb3f013 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -69,7 +69,6 @@ public:
virtual void SetRectsDirty(bool bNotMyself = false) override;
double GetBrightness() { return mdBrightness; }
- TYPEINFO_OVERRIDE();
SdrPathObj(SdrObjKind eNewKind);
SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness = 1.0);
virtual ~SdrPathObj();
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index 0b99911e3bee..1fc0a5a32663 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -64,7 +64,6 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
public:
- TYPEINFO_OVERRIDE();
// Der Eckenradius-Parameter fliegt irgendwann raus. Der Eckenradius
// ist dann (spaeter) ueber SfxItems einzustellen (SetAttributes()).
// Konstruktion eines Rechteck-Zeichenobjekts
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 6befde2a9125..78a7e53c4133 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -109,7 +109,6 @@ public:
SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows);
virtual ~SdrTableObj();
- TYPEINFO_OVERRIDE();
// table stuff
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index e40435c6213e..149963c4cdef 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -332,7 +332,6 @@ protected:
virtual ~SdrTextObj();
public:
- TYPEINFO_OVERRIDE();
bool IsInEditMode() const { return mbInEditMode; }
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index 46e14b45be18..3ffe9698d431 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -64,7 +64,6 @@ private:
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac );
public:
- TYPEINFO_OVERRIDE();
explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true);
SdrUnoObj(const OUString& rModelName,
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index e94b055eab95..3a23e73e381a 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -53,7 +53,6 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
public:
- TYPEINFO_OVERRIDE();
SdrVirtObj(SdrObject& rNewObj);
virtual ~SdrVirtObj();
SdrObject& ReferencedObj();
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 373eb6e37ee1..b459773b87b9 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -104,7 +104,6 @@ private:
/// simple ActionChildInserted forwarder to have it on a central place
static void impChildInserted(SdrObject& rChild);
public:
- TYPEINFO();
SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList=nullptr);
virtual ~SdrObjList();
@@ -457,7 +456,6 @@ protected:
void lateInit(const SdrPage& rSrcPage, SdrModel* pNewModel = nullptr);
public:
- TYPEINFO_OVERRIDE();
explicit SdrPage(SdrModel& rNewModel, bool bMasterPage=false);
virtual ~SdrPage();
virtual SdrPage* Clone() const override;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 8dfcc6572e60..9f94e60abc52 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -269,7 +269,6 @@ protected:
virtual ~SdrPaintView();
public:
- TYPEINFO_OVERRIDE();
virtual void ClearPageView();
SdrModel* GetModel() const { return mpModel; }
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 4e4ebf0e0138..d90345c35561 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -60,7 +60,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE();
virtual ~SdrUndoAction();
virtual bool CanRepeat(SfxRepeatTarget& rView) const override;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 198a7c577b5b..5414581e48af 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -166,7 +166,6 @@ protected:
SvtAccessibilityOptions maAccessibilityOptions;
public:
- TYPEINFO_OVERRIDE();
explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = nullptr);
virtual ~SdrView();
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index fc70dc2a3aad..79e174aa52ce 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -273,7 +273,6 @@ class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory,
public:
static SvxAbstractDialogFactory* Create();
- // define dtor as this will create typeinfo and in svx library and export vtable
virtual ~SvxAbstractDialogFactory();
virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent,
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index beebb7bf4194..00e2f0d1c089 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
@@ -30,7 +30,6 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
Graphic aGraphic;
public:
- TYPEINFO_OVERRIDE();
SvxGraphicItem();
SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic);
SvxGraphicItem( const SvxGraphicItem& );
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index f018c3e1cec9..e2a5e9a5ebdd 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -32,7 +32,6 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST
class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {}
SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
@@ -50,10 +49,12 @@ public:
// sal_True=Linienaustrittsposition relativ
// sal_False=Linienaustrittsposition absolut
-class SdrCaptionEscIsRelItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem {
public:
SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {}
+ virtual ~SdrCaptionEscIsRelItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
@@ -63,10 +64,12 @@ public:
// 10000 = 100.00% = rechts bzw. unten
// nur wenn SdrCaptionEscIsRelItem=TRUE
-class SdrCaptionEscRelItem: public SfxInt32Item {
+class SVX_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item {
public:
SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {}
SdrCaptionEscRelItem(SvStream& rIn) : SfxInt32Item(SDRATTR_CAPTIONESCREL,rIn) {}
+ virtual ~SdrCaptionEscRelItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx
index 159758e72e66..b343a10771f6 100644
--- a/include/svx/sxcllitm.hxx
+++ b/include/svx/sxcllitm.hxx
@@ -29,10 +29,12 @@
// Nur bei Type3 und Type4
// Nur relevant, wenn SdrCaptionFitLineLenItem=FALSE
-class SdrCaptionLineLenItem: public SdrMetricItem {
+class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem {
public:
SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {}
SdrCaptionLineLenItem(SvStream& rIn) : SdrMetricItem(SDRATTR_CAPTIONLINELEN,rIn) {}
+ virtual ~SdrCaptionLineLenItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
@@ -41,10 +43,12 @@ public:
// Vorgabe (SdrCaptionLineLenItem) verwenden.
// Nur bei Type3 und Type4
-class SdrCaptionFitLineLenItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem {
public:
SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
SdrCaptionFitLineLenItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn) {}
+ virtual ~SdrCaptionFitLineLenItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
#endif
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index 82ea0c593daa..223ac93cbc2d 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -30,7 +30,6 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4};
class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index eef809ff9e8f..a87ee4d8672e 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -34,7 +34,6 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES,
class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx
index d352c5860ff9..7e6e742ce4e7 100644
--- a/include/svx/sxfiitm.hxx
+++ b/include/svx/sxfiitm.hxx
@@ -29,7 +29,6 @@
class SdrFractionItem: public SfxPoolItem {
Fraction nValue;
public:
- TYPEINFO_VISIBILITY_OVERRIDE( SVX_DLLPUBLIC );
SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {}
SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx
index 5566d9215ccf..aff84cd8da1a 100644
--- a/include/svx/sxmbritm.hxx
+++ b/include/svx/sxmbritm.hxx
@@ -29,10 +29,12 @@
// TextUpsideDown, but easily operated)
// laesst sich auch draggen, indem man den Masslinienabstand
// (SdrMeasureLineDistItem) ueber die Bezugskante hinwegdraggt
-class SdrMeasureBelowRefEdgeItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem {
public:
SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {}
SdrMeasureBelowRefEdgeItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,rIn) {}
+ virtual ~SdrMeasureBelowRefEdgeItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
#endif
diff --git a/include/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx
deleted file mode 100644
index 9859ebf48de2..000000000000
--- a/include/svx/sxmspitm.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_SXMSPITM_HXX
-#define INCLUDED_SVX_SXMSPITM_HXX
-
-#include <svx/svddef.hxx>
-#include <svx/sdynitm.hxx>
-
-inline SdrYesNoItem makeSdrObjMoveProtectItem(bool bOn) {
- return SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, bOn);
-}
-
-inline SdrYesNoItem makeSdrObjSizeProtectItem(bool bOn) {
- return SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, bOn);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sxmsuitm.hxx b/include/svx/sxmsuitm.hxx
deleted file mode 100644
index 9238913b8874..000000000000
--- a/include/svx/sxmsuitm.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_SXMSUITM_HXX
-#define INCLUDED_SVX_SXMSUITM_HXX
-
-#include <svx/svddef.hxx>