summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-11-07 14:43:19 +0100
committerOliver Specht <oliver.specht@cib.de>2015-11-11 10:49:30 +0000
commitfa91dd31f39a24329d288d4e1cda28db3a16af0d (patch)
tree603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f
parentc21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (diff)
5th step to remove tools/rtti.hxx
tools/rtti.hxx removed completed the interface of some Sdr.* Items and removed pseudo items Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a Reviewed-on: https://gerrit.libreoffice.org/19837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
-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>
-#include <svx/sdynitm.hxx>
-
-inline SdrYesNoItem makeSdrMeasureShowUnitItem(bool bOn) {
- return SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, bOn);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index b8c788ecce0b..2d156a5bdbf6 100644
--- a/include/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
@@ -27,24 +27,30 @@
// Nail text down to a fix angle.
// The text angle is independet of the dimension line.
// Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.)
-class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem {
public:
SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {}
SdrMeasureTextIsFixedAngleItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,rIn) {}
+ virtual ~SdrMeasureTextIsFixedAngleItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
//Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.)
-class SdrMeasureTextFixedAngleItem: public SdrAngleItem {
+class SVX_DLLPUBLIC SdrMeasureTextFixedAngleItem: public SdrAngleItem {
public:
SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {}
SdrMeasureTextFixedAngleItem(SvStream& rIn): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,rIn) {}
+ virtual ~SdrMeasureTextFixedAngleItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
// The decimal places used for the measure value
-class SdrMeasureDecimalPlacesItem: public SfxInt16Item {
+class SVX_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item {
public:
SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {}
SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {}
+ virtual ~SdrMeasureDecimalPlacesItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
#endif
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index f1e9a8e9d24e..1df4cbc274de 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -31,7 +31,6 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR
class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
@@ -51,7 +50,6 @@ public:
class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx
index b03234452e42..226dbb747c3f 100644
--- a/include/svx/sxmtritm.hxx
+++ b/include/svx/sxmtritm.hxx
@@ -23,18 +23,22 @@
#include <svx/sdynitm.hxx>
// text across the dimension line (90deg counter-clockwise rotation)
-class SdrMeasureTextRota90Item: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem {
public:
SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {}
SdrMeasureTextRota90Item(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,rIn) {}
+ virtual ~SdrMeasureTextRota90Item();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
// Turn the calculated TextRect through 180 deg
// Text is also switched to the other side of the dimension line, if not Rota90
-class SdrMeasureTextUpsideDownItem: public SdrYesNoItem {
+class SVX_DLLPUBLIC SdrMeasureTextUpsideDownItem: public SdrYesNoItem {
public:
SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {}
SdrMeasureTextUpsideDownItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,rIn) {}
+ virtual ~SdrMeasureTextUpsideDownItem();
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
};
#endif
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index a736124d66bd..bd333ffb55dd 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -28,7 +28,6 @@
// (based on the facts of the MapUnit of the model). This unity is displayed if necessary.
class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx
index 4b78bd0f23f6..0627c4eebb77 100644
--- a/include/svx/sxsiitm.hxx
+++ b/include/svx/sxsiitm.hxx
@@ -23,7 +23,6 @@
class SdrScaleItem: public SdrFractionItem {
public:
- TYPEINFO_OVERRIDE();
SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index f0daf24904b6..63da66059f72 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -77,7 +77,6 @@ protected:
void BreakSingle3DObj(E3dObject* pObj);
public:
- TYPEINFO_OVERRIDE();
E3dView(SdrModel* pModel, OutputDevice* pOut = nullptr);
virtual ~E3dView();
diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx
index 02b91b2b243d..7324bdd129a9 100644
--- a/include/svx/viewlayoutitem.hxx
+++ b/include/svx/viewlayoutitem.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item
bool mbBookMode;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT );
SvxViewLayoutItem( const SvxViewLayoutItem& );
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 5d7930da0310..5dd2d2c0b327 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -42,7 +42,7 @@ private:
GraphicObject maGraphicObject;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {}
XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject);
XFillBitmapItem(SfxItemPool* pPool, const GraphicObject& rGraphicObject);
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 9ff93511668c..bb229b0806f8 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex
Color aColor;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XColorItem() {}
XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor);
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 12f632bd09c7..9604f97057a8 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -34,7 +34,8 @@
class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID);
XFillStyleItem(SvStream& rIn);
diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx
index ae84f2e2761f..0f308fb3d635 100644
--- a/include/svx/xflasit.hxx
+++ b/include/svx/xflasit.hxx
@@ -27,7 +27,6 @@
class SVX_DLLPUBLIC XFillAttrSetItem : public SfxSetItem
{
public:
- TYPEINFO_OVERRIDE();
XFillAttrSetItem(SfxItemSet* pItemSet );
XFillAttrSetItem(SfxItemPool* pItemPool);
XFillAttrSetItem(const XFillAttrSetItem& rAttr);
diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx
index a3d7872f73df..2cc31a82b8fc 100644
--- a/include/svx/xflbckit.hxx
+++ b/include/svx/xflbckit.hxx
@@ -32,8 +32,7 @@
class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
-
+ static SfxPoolItem* CreateDefault();
XFillBackgroundItem( bool bFill = false );
SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index ef5c2ffb9089..b59053569a75 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -27,7 +27,7 @@
class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpPosItem( RECT_POINT eRP = RP_MM );
SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx
index a8e9182f5228..687f084d5841 100644
--- a/include/svx/xflbmsli.hxx
+++ b/include/svx/xflbmsli.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpSizeLogItem( bool bLog = true );
SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx
index 4286b205eda0..ce5a91d36795 100644
--- a/include/svx/xflbmsxy.hxx
+++ b/include/svx/xflbmsxy.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpSizeXItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpSizeXItem( long nSizeX = 0 );
SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
@@ -45,7 +45,7 @@ public:
class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpSizeYItem( long nSizeY = 0 );
SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index df3bd498de04..c218578e8cfe 100644
--- a/include/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpTileItem( bool bTile = true );
XFillBmpTileItem( SvStream& rIn );
diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx
index 61c01eb24b45..c8a01426bdd7 100644
--- a/include/svx/xflboxy.hxx
+++ b/include/svx/xflboxy.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 );
SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
@@ -42,7 +42,7 @@ public:
class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 );
SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index 3fd4bd34653a..3b33a7231aac 100644
--- a/include/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpStretchItem( bool bStretch = true );
XFillBmpStretchItem( SvStream& rIn );
diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx
index b83fd8614686..8eb851fe5d89 100644
--- a/include/svx/xflbtoxy.hxx
+++ b/include/svx/xflbtoxy.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 );
SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
@@ -42,7 +42,7 @@ public:
class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 );
SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index 7e8b948833a5..3087d528b159 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XFillColorItem : public XColorItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillColorItem() {}
XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XFillColorItem(const OUString& rName, const Color& rTheColor);
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index c7428ee87ad9..27ef1c068383 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -34,8 +34,8 @@ private:
bool bEnabled;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillFloatTransparenceItem();
XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true );
XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, bool bEnable = true );
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index f7cfaccfb1f3..b1fc72461745 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex
XGradient aGradient;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
XFillGradientItem(sal_uInt16 nWhich_) : NameOrIndex(nWhich_, -1) {}
XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index e594a56aa4be..20cb18b399fd 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
XHatch aHatch;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
XFillHatchItem(const OUString& rName, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 26abe70db3d8..696127cb4466 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFillTransparenceItem(sal_uInt16 nFillTransparence = 0);
XFillTransparenceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx
index 19bd92c9cc15..6d2e5fbcdb9f 100644
--- a/include/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
@@ -32,7 +32,8 @@
class SVX_DLLPUBLIC XFormTextAdjustItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER);
XFormTextAdjustItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx
index 62c95a829698..7c6816622e35 100644
--- a/include/svx/xftdiit.hxx
+++ b/include/svx/xftdiit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextDistanceItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFormTextDistanceItem(long nDist = 0);
XFormTextDistanceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx
index b63ec7092a4f..15edc6bba6a8 100644
--- a/include/svx/xftmrit.hxx
+++ b/include/svx/xftmrit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFormTextMirrorItem(bool bMirror = false);
XFormTextMirrorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx
index cce332ecbe17..d214a3deb58d 100644
--- a/include/svx/xftouit.hxx
+++ b/include/svx/xftouit.hxx
@@ -32,7 +32,8 @@
class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFormTextOutlineItem(bool bOutline = false);
XFormTextOutlineItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx
index 2b07b54fa964..3077a9aa2899 100644
--- a/include/svx/xftshcit.hxx
+++ b/include/svx/xftshcit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFormTextShadowColorItem() {}
XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx
index 2ee8e0eac04f..ddd255607943 100644
--- a/include/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
@@ -33,7 +33,8 @@
class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE);
XFormTextShadowItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx
index f68c153659a7..1922e026ea29 100644
--- a/include/svx/xftshtit.hxx
+++ b/include/svx/xftshtit.hxx
@@ -31,7 +31,8 @@
class XFormTextShadowTranspItem: public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0);
XFormTextShadowTranspItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx
index 88e277071d01..12a1e68e0146 100644
--- a/include/svx/xftshxy.hxx
+++ b/include/svx/xftshxy.hxx
@@ -32,7 +32,8 @@
class SVX_DLLPUBLIC XFormTextShadowXValItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFormTextShadowXValItem(long nVal = 0);
XFormTextShadowXValItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
@@ -48,7 +49,7 @@ public:
class SVX_DLLPUBLIC XFormTextShadowYValItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFormTextShadowYValItem(long nVal = 0);
XFormTextShadowYValItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx
index d44cfe07d3f7..fdabc457640c 100644
--- a/include/svx/xftstit.hxx
+++ b/include/svx/xftstit.hxx
@@ -32,7 +32,8 @@
class SVX_DLLPUBLIC XFormTextStartItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
+
XFormTextStartItem(long nStart = 0);
XFormTextStartItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx
index 5b8c276ad830..d880e1591afb 100644
--- a/include/svx/xgrscit.hxx
+++ b/include/svx/xgrscit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XGradientStepCountItem( sal_uInt16 nStepCount = 0 );
XGradientStepCountItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 174067107071..170368f6ebb1 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -43,7 +43,6 @@ protected:
void Detach() { nPalIndex = -1; }
public:
- TYPEINFO_OVERRIDE();
NameOrIndex() { nPalIndex = -1; }
NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
NameOrIndex(sal_uInt16 nWhich,
diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index 21048c5eb495..2986dcfdb9e5 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -31,7 +31,7 @@
class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineStyleItem(css::drawing::LineStyle = css::drawing::LineStyle_SOLID);
XLineStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index 2065fb20c6f0..cd0b4918a3aa 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND );
XLineJointItem( SvStream& rIn );
diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx
index e490c7afa8c4..1254d9b91686 100644
--- a/include/svx/xlnasit.hxx
+++ b/include/svx/xlnasit.hxx
@@ -28,7 +28,6 @@
class SVX_DLLPUBLIC XLineAttrSetItem : public SfxSetItem
{
public:
- TYPEINFO_OVERRIDE();
XLineAttrSetItem(SfxItemSet* pItemSet );
XLineAttrSetItem(SfxItemPool* pItemPool);
XLineAttrSetItem(const XLineAttrSetItem& rAttr);
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 2b3536440476..12e5750bc6f9 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineCapItem(css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT);
XLineCapItem(SvStream& rIn);
diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx
index 22e2663da0a8..85591c429d9f 100644
--- a/include/svx/xlnclit.hxx
+++ b/include/svx/xlnclit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineColorItem : public XColorItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineColorItem() {}
XLineColorItem(sal_Int32 nIndex, const Color& rTheColor);
XLineColorItem(const OUString& rName, const Color& rTheColor);
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 98e7e93f8d4c..8868558b4835 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
XDash aDash;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
XLineDashItem(const OUString& rName, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index 3fee06bf1a51..c912b37a732c 100644
--- a/include/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineEndCenterItem(bool bEndCenter = false);
XLineEndCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index 760e4e3ddac3..930408b5b45c 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex
basegfx::B2DPolyPolygon maPolyPolygon;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineEndItem(sal_Int32 nIndex = -1);
XLineEndItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx
index e86074614327..5a3286d1d022 100644
--- a/include/svx/xlnedwit.hxx
+++ b/include/svx/xlnedwit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineEndWidthItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT);
XLineEndWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index dba0b29baf6b..bef563ee00a4 100644
--- a/include/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineStartCenterItem(bool bStartCenter = false);
XLineStartCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 1a142bd04b8a..58b9200a59f2 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex
basegfx::B2DPolyPolygon maPolyPolygon;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineStartItem(sal_Int32 nIndex = -1);
XLineStartItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx
index 02038de75c47..ecd29aed3afc 100644
--- a/include/svx/xlnstwit.hxx
+++ b/include/svx/xlnstwit.hxx
@@ -31,7 +31,7 @@
class SVX_DLLPUBLIC XLineStartWidthItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT);
XLineStartWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx
index 3fa23537879e..aac2a2934410 100644
--- a/include/svx/xlntrit.hxx
+++ b/include/svx/xlntrit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineTransparenceItem(sal_uInt16 nLineTransparence = 0);
XLineTransparenceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx
index 0a46ddc8cc08..fa46c5ece9ee 100644
--- a/include/svx/xlnwtit.hxx
+++ b/include/svx/xlnwtit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineWidthItem : public SfxMetricItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XLineWidthItem(long nWidth = 0);
XLineWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx
index 86622f93ace5..7d064643c39d 100644
--- a/include/svx/xsflclit.hxx
+++ b/include/svx/xsflclit.hxx
@@ -28,7 +28,7 @@
class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SVX_DLLPRIVATE XSecondaryFillColorItem() {}
XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor);
SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx
index 8cd42a476517..dc9885ccba9d 100644
--- a/include/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XFormTextStyleItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFormTextStyleItem(XFormTextStyle = XFT_NONE);
XFormTextStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
@@ -54,7 +54,7 @@ public:
class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
XFormTextHideFormItem(bool bHide = false);
XFormTextHideFormItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx
index 48619f242bc0..24a7d72270b7 100644
--- a/include/svx/zoomslideritem.hxx
+++ b/include/svx/zoomslideritem.hxx
@@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item
sal_uInt16 mnMaxZoom;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
SvxZoomSliderItem( const SvxZoomSliderItem& );
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index ea188e43b210..950a65ec5ea9 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -24,7 +24,6 @@
#include <limits.h>
#include <rtl/ustring.hxx>
-#include <tools/rtti.hxx>
#include <tools/errcode.hxx>
#include <tools/toolsdllapi.h>
@@ -40,7 +39,6 @@ private:
sal_uIntPtr lUserId;
public:
- TYPEINFO();
ErrorInfo( sal_uIntPtr lArgUserId ) :
lUserId( lArgUserId ){}
@@ -59,7 +57,6 @@ private:
EDcr_Impl* pImpl;
public:
- TYPEINFO_OVERRIDE();
DynamicErrorInfo(sal_uIntPtr lUserId, sal_uInt16 nMask);
virtual ~DynamicErrorInfo();
@@ -74,7 +71,6 @@ private:
OUString aString;
public:
- TYPEINFO_OVERRIDE();
StringErrorInfo( sal_uIntPtr lUserId,
const OUString& aStringP,
@@ -89,7 +85,6 @@ private:
OUString aArg2;
public:
- TYPEINFO_OVERRIDE();
TwoStringErrorInfo(sal_uIntPtr nUserID, const OUString & rTheArg1,
const OUString & rTheArg2, sal_uInt16 nFlags = 0):
@@ -104,7 +99,6 @@ public:
class TOOLS_DLLPUBLIC MessageInfo : public DynamicErrorInfo
{
public:
- TYPEINFO_OVERRIDE();
MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) :
DynamicErrorInfo(UserId, nFlags) {}
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index 402a0c9e0635..e1e584334bc7 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -22,7 +22,6 @@
#include <tools/toolsdllapi.h>
#include <tools/unqidx.hxx>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <map>
#include <unordered_map>
@@ -49,11 +48,9 @@ public:
class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase
{
public:
- TYPEINFO();
};
#define SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \
- TYPEINFO_OVERRIDE(); \
static sal_Int32 StaticClassId() { return CLASS_ID; } \
static void * CreateInstance( SvPersistBase ** ppBase ); \
friend SvPersistStream& operator >> ( SvPersistStream & rStm, \
@@ -80,7 +77,6 @@ public:
}
#define SV_IMPL_PERSIST1( Class, Super1 ) \
- TYPEINIT1( Class, Super1 ) \
PRV_SV_IMPL_PERSIST( Class )
class SvPersistStream;
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 8c68a211fe56..6e0ecb8d073c 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -25,7 +25,6 @@
#include <tools/lineend.hxx>
#include <tools/errinf.hxx>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
#include <rtl/string.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -112,7 +111,6 @@ protected:
void close();
public:
- TYPEINFO();
SvLockBytes() : m_pStream(nullptr), m_bOwner(false), m_bSync(false) {}
@@ -145,7 +143,6 @@ typedef tools::SvRef<SvLockBytes> SvLockBytesRef;
class TOOLS_DLLPUBLIC SvOpenLockBytes: public SvLockBytes
{
public:
- TYPEINFO_OVERRIDE();
SvOpenLockBytes() : SvLockBytes(nullptr, false) {}
SvOpenLockBytes(SvStream * pStream, bool bOwner):
@@ -164,7 +161,6 @@ class SvAsyncLockBytes: public SvOpenLockBytes
bool m_bTerminated;
public:
- TYPEINFO_OVERRIDE();
SvAsyncLockBytes(SvStream * pStream, bool bOwner):
SvOpenLockBytes(pStream, bOwner), m_nSize(0), m_bTerminated(false) {}
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx
index adc1b88f6d52..9fd7a1a586ad 100644
--- a/include/vcl/apptypes.hxx
+++ b/include/vcl/apptypes.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_APPTYPES_HXX
#include <vcl/dllapi.h>
-#include <tools/rtti.hxx>
#include <o3tl/typed_flags_set.hxx>
#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100)
diff --git a/include/vcl/extoutdevdata.hxx b/include/vcl/extoutdevdata.hxx
index 6442821ba3da..5db49cddb08d 100644
--- a/include/vcl/extoutdevdata.hxx
+++ b/include/vcl/extoutdevdata.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_EXTOUTDEVDATA_HXX
#define INCLUDED_VCL_EXTOUTDEVDATA_HXX
-#include <tools/rtti.hxx>
#include <vcl/dllapi.h>
namespace vcl
@@ -30,7 +29,6 @@ class VCL_DLLPUBLIC ExtOutDevData
{
public:
- TYPEINFO();
virtual ~ExtOutDevData();
};
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 268e6198273a..477f66816851 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -26,7 +26,6 @@
#include <vcl/extoutdevdata.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/mapmod.hxx>
-#include <tools/rtti.hxx>
#include <vector>
#include <deque>
@@ -96,7 +95,6 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData
public:
- TYPEINFO_OVERRIDE();
PDFExtOutDevData( const OutputDevice& rOutDev );
virtual ~PDFExtOutDevData();
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 5730999701a9..c7f59dba9aee 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_VCLEVENT_HXX
#include <tools/link.hxx>
-#include <tools/rtti.hxx>
#include <vcl/dllapi.h>
#include <vcl/impdel.hxx>
#include <vcl/vclptr.hxx>
@@ -203,7 +202,6 @@ private:
public:
VclSimpleEvent( sal_uLong n ) { nId = n; }
virtual ~VclSimpleEvent() {}
- TYPEINFO();
sal_uLong GetId() const { return nId; }
};
@@ -217,7 +215,6 @@ private:
public:
VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = nullptr );
virtual ~VclWindowEvent();
- TYPEINFO_OVERRIDE();
vcl::Window* GetWindow() const { return pWindow; }
void* GetData() const { return pData; }
@@ -232,7 +229,6 @@ private:
public:
VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; }
virtual ~VclMenuEvent() {}
- TYPEINFO_OVERRIDE();
Menu* GetMenu() const { return pMenu; }
sal_uInt16 GetItemPos() const { return mnPos; }
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index 435dead747e2..5a6145da6f77 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -34,7 +34,6 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext
OUString sBase64CharsLeft;
public:
- TYPEINFO_OVERRIDE();
XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 415c5730923c..86dd4ebfdc51 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -33,7 +33,6 @@ protected:
sal_Unicode m_c;
public:
- TYPEINFO_OVERRIDE();
XMLCharContext(
SvXMLImport& rImport,
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index 2e8b1fbc0534..97bec1eb9d40 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -62,7 +62,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLEventsImportContext(
SvXMLImport& rImport,
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx
index 62755475553e..e00a3866df20 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -52,7 +52,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index b1a6d806e806..dce6f4b30afb 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace container
class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext
{
public:
- TYPEINFO_OVERRIDE();
XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index 0047d99e0b48..8c93fe90582f 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -42,7 +42,6 @@ protected:
const OUString& rLocalName,
const OUString& rValue ) override;
public:
- TYPEINFO_OVERRIDE();
XMLShapeStyleContext(
SvXMLImport& rImport,
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index 1a8e2c94530e..56d099eec9c1 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -56,7 +56,6 @@ protected:
css::uno::Reference< css::style::XStyle > GetStyle() { return xStyle; }
public:
- TYPEINFO_OVERRIDE();
XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx
index a922bf91baab..0e7b2fcaf9c0 100644
--- a/include/xmloff/XMLTextMasterStylesContext.hxx
+++ b/include/xmloff/XMLTextMasterStylesContext.hxx
@@ -39,7 +39,6 @@ protected:
virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
public:
- TYPEINFO_OVERRIDE();
XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index e140c1ff5be4..cb86f79c0c50 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -39,7 +39,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx
index ec05f28a4daa..559b30db7e9e 100644
--- a/include/xmloff/XMLTextTableContext.hxx
+++ b/include/xmloff/XMLTextTableContext.hxx
@@ -34,7 +34,6 @@ class XMLOFF_DLLPUBLIC XMLTextTableContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextTableContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index f0c36af90a3c..bab878a81425 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -96,7 +96,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index c8dff3c350fe..9ced9eb2c293 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -254,7 +254,6 @@ public:
SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
const OUString& rLName, bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
- TYPEINFO_OVERRIDE();
const css::uno::Reference< css::drawing::XShape >& getShape() const { return mxShape; }
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index c3b990fb0789..8a1ec1fad72d 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -63,7 +63,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index fa31930b6b77..325457c16918 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <tools/ref.hxx>
#include <rtl/ustring.hxx>
-#include <tools/rtti.hxx>
#include <cppuhelper/implbase1.hxx>
class SvXMLNamespaceMap;
@@ -55,7 +54,6 @@ protected:
const SvXMLImport& GetImport() const { return mrImport; }
public:
- TYPEINFO();
sal_uInt16 GetPrefix() const { return mnPrefix; }
const OUString& GetLocalName() const { return maLocalName; }
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 33a0cdbbf55a..1b5983e2eb71 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -57,7 +57,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SvxXMLListStyleContext(
SvXMLImport& rImport,
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index f3aa917fb5b9..658cce3d9607 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -25,7 +25,6 @@
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rsc/rscsfx.hxx>
-#include <tools/rtti.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlictxt.hxx>
@@ -90,7 +89,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -201,7 +199,6 @@ protected:
virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const;
public:
- TYPEINFO_OVERRIDE();
SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 2d65adc5ec15..b37ed16fdec3 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -53,7 +53,6 @@ private:
void operator=(const OReportModel& rSrcModel) = delete;
public:
- TYPEINFO_OVERRIDE();
OReportModel(::reportdesign::OReportDefinition* _pReportDefinition);
virtual ~OReportModel();
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 6c2fcb332fea..4333721dd15a 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -148,7 +148,6 @@ protected:
virtual SdrPage* GetImplPage() const override;
public:
- TYPEINFO_OVERRIDE();
virtual ~OCustomShape();
@@ -193,7 +192,6 @@ protected:
virtual SdrPage* GetImplPage() const override;
public:
- TYPEINFO_OVERRIDE();
virtual ~OOle2Obj();
@@ -239,7 +237,6 @@ protected:
virtual SdrPage* GetImplPage() const override;
public:
- TYPEINFO_OVERRIDE();
virtual void _propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException) override;
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 7dc4dee86e30..4b34eb3321d2 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -52,7 +52,6 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
protected:
virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
public:
- TYPEINFO_OVERRIDE();
OReportPage( OReportModel& rModel
,const css::uno::Reference< css::report::XSection >& _xSection
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index f19eed0124b9..4317b50a0255 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -155,7 +155,6 @@ namespace rptui
::dbaui::IController* m_pController;
public:
- TYPEINFO_OVERRIDE();
OCommentUndoAction( SdrModel& rMod
,sal_uInt16 nCommentID);
virtual ~OCommentUndoAction();
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 2a653e195e30..797441b6945c 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -43,7 +43,6 @@ namespace rptui
{
using namespace reportdesign;
using namespace com::sun::star;
-TYPEINIT1(OReportModel,SdrModel);
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 02ad7f276122..629c73151ff9 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -459,7 +459,6 @@ uno::Reference< uno::XInterface > OObjectBase::getUnoShapeOf( SdrObject& _rSdrOb
}
-TYPEINIT1(OCustomShape, SdrObjCustomShape);
OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xComponent
)
:SdrObjCustomShape()
@@ -578,7 +577,6 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx
-TYPEINIT1(OUnoObject, SdrUnoObj);
OUnoObject::OUnoObject(const OUString& _sComponentName
,const OUString& rModelName
@@ -901,7 +899,6 @@ OUnoObject* OUnoObject::Clone() const
// OOle2Obj
-TYPEINIT1(OOle2Obj, SdrOle2Obj);
OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,sal_uInt16 _nType)
:SdrOle2Obj()
,OObjectBase(_xComponent)
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 3dff18e62d73..c374cb30aef3 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -27,7 +27,6 @@
namespace rptui
{
using namespace ::com::sun::star;
-TYPEINIT1( OReportPage, SdrPage );
OReportPage::OReportPage( OReportModel& _rModel
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 84727f79021d..90bfc195c1c2 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -82,7 +82,6 @@ namespace rptui
}
-TYPEINIT1( OCommentUndoAction, SdrUndoAction );
OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID)
:SdrUndoAction(_rMod)
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 9567b023f764..2edc59fb7cc8 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -68,8 +68,6 @@ public:
}
};
-TYPEINIT1( OControlStyleContext, XMLPropStyleContext );
-TYPEINIT1( OReportStylesContext, SvXMLStylesContext );
OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 6d419ac70344..74de6bf96a92 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -57,7 +57,6 @@ namespace rptxml
public:
- TYPEINFO_OVERRIDE();
OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -116,7 +115,6 @@ namespace rptxml
public:
- TYPEINFO_OVERRIDE();
OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx ,
const OUString& rLName ,
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index a0d680b4c6db..50eb48c1b077 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -89,7 +89,6 @@ class RptMLMasterStylesContext_Impl:
public:
- TYPEINFO_OVERRIDE();
RptMLMasterStylesContext_Impl(
ORptFilter& rImport, sal_uInt16 nPrfx,
@@ -99,7 +98,6 @@ public:
virtual void EndElement() override;
};
-TYPEINIT1( RptMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
ORptFilter& rImport, sal_uInt16 nPrfx,
const OUString& rLName ,
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index 0f1c4cf980bb..6b49fb62dfb1 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -51,7 +51,6 @@ namespace rptui
void collectControls(const css::uno::Reference< css::report::XSection >& _xSection);
public:
- TYPEINFO_OVERRIDE();
OSectionUndo( OReportModel& rMod
,sal_uInt16 _nSlot
,Action _eAction
@@ -75,7 +74,6 @@ namespace rptui
OReportSectionUndo(const OReportSectionUndo&) = delete;
void operator =(const OReportSectionUndo&) = delete;
public:
- TYPEINFO_OVERRIDE();
//OReportSectionUndo( const css::uno::Reference< css::report::XSection >& _xSection
OReportSectionUndo( OReportModel& rMod
,sal_uInt16 _nSlot
@@ -102,7 +100,6 @@ namespace rptui
OGroupSectionUndo(const OGroupSectionUndo&) = delete;
void operator =(const OGroupSectionUndo&) = delete;
public:
- TYPEINFO_OVERRIDE();
//OGroupSectionUndo( const css::uno::Reference< css::report::XSection >& _xSection
OGroupSectionUndo( OReportModel& rMod
,sal_uInt16 _nSlot
@@ -128,7 +125,6 @@ namespace rptui
void implReInsert( );
void implReRemove( );
public:
- TYPEINFO_OVERRIDE();
OGroupUndo(OReportModel& rMod
,sal_uInt16 nCommentID
,Action _eAction
diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx
index ebb7835ef129..2a4e4fde518f 100644
--- a/reportdesign/source/ui/inc/SectionView.hxx
+++ b/reportdesign/source/ui/inc/SectionView.hxx
@@ -41,7 +41,6 @@ private:
OSectionView(const OSectionView&) = delete;
void operator =(const OSectionView&) = delete;
public:
- TYPEINFO_OVERRIDE();
OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, OReportWindow* pEditor );
virtual ~OSectionView();
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index c7f134d220da..70a7b4328e73 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -110,7 +110,6 @@ namespace
}
}
-TYPEINIT1( OSectionUndo, OCommentUndoAction );
OSectionUndo::OSectionUndo(OReportModel& _rMod
,sal_uInt16 _nSlot
@@ -216,7 +215,6 @@ void OSectionUndo::Redo()
}
}
-TYPEINIT1( OReportSectionUndo, OSectionUndo );
OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -255,7 +253,6 @@ void OReportSectionUndo::implReRemove( )
m_bInserted = false;
}
-TYPEINIT1( OGroupSectionUndo, OSectionUndo );
OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -326,7 +323,6 @@ void OGroupSectionUndo::implReRemove( )
m_bInserted = false;
}
-TYPEINIT1( OGroupUndo, OCommentUndoAction );
OGroupUndo::OGroupUndo(OReportModel& _rMod
,sal_uInt16 nCommentID
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index 1694085eb704..810db1386e8b 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -33,7 +33,6 @@
namespace rptui
{
using namespace ::com::sun::star;
-TYPEINIT1( OSectionView, SdrView );
OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, OReportWindow* pEditor )
diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx
index d50ce849698c..7e753d3a6f43 100644
--- a/salhelper/test/rtti/rttitest.cxx
+++ b/salhelper/test/rtti/rttitest.cxx
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <typeinfo>
-#include "samplelibrtti.hxx"
int main()
{
diff --git a/salhelper/test/rtti/samplelibrtti.cxx b/salhelper/test/rtti/samplelibrtti.cxx
index 1905371243b2..c148eb69b389 100644
--- a/salhelper/test/rtti/samplelibrtti.cxx
+++ b/salhelper/test/rtti/samplelibrtti.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "samplelibrtti.hxx"
#include <stdio.h>
// MyClassA =============================================================
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index f1a7d06ee181..c014e34ba2f5 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -45,7 +45,6 @@ private:
static bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName );
public:
- TYPEINFO_OVERRIDE();
ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
const OUString& rFilter, const OUString& rOpt,
const OUString& rArea, const ScRange& rDest, sal_uLong nRefresh );
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 5c9070b84933..0b403d663989 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -50,7 +50,7 @@ class SC_DLLPUBLIC ScMergeAttr: public SfxPoolItem
SCsCOL nColMerge;
SCsROW nRowMerge;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScMergeAttr();
ScMergeAttr( SCsCOL nCol, SCsROW nRow = 0);
ScMergeAttr( const ScMergeAttr& );
@@ -101,7 +101,7 @@ class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem
bool bHideCell; ///< hide cell
bool bHidePrint; ///< don't print cell
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScProtectionAttr();
ScProtectionAttr( bool bProtect,
bool bHFormula = false,
@@ -150,7 +150,7 @@ public:
class ScRangeItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
inline ScRangeItem( const sal_uInt16 nWhich );
inline ScRangeItem( const sal_uInt16 nWhich,
@@ -201,7 +201,7 @@ inline ScRangeItem& ScRangeItem::operator=( const ScRangeItem &rCpy )
class ScTableListItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
inline ScTableListItem( const sal_uInt16 nWhich );
ScTableListItem( const ScTableListItem& rCpy );
@@ -240,7 +240,6 @@ class SC_DLLPUBLIC ScPageHFItem : public SfxPoolItem
EditTextObject* pRightArea;
public:
- TYPEINFO_OVERRIDE();
ScPageHFItem( sal_uInt16 nWhich );
ScPageHFItem( const ScPageHFItem& rItem );
virtual ~ScPageHFItem();
@@ -270,7 +269,7 @@ public:
class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScViewObjectModeItem( sal_uInt16 nWhich );
ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode );
@@ -290,7 +289,7 @@ public:
class ScDoubleItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScDoubleItem( sal_uInt16 nWhich, double nVal=0 );
ScDoubleItem( const ScDoubleItem& rItem );
virtual ~ScDoubleItem();
@@ -313,7 +312,7 @@ const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT = 2;
class SC_DLLPUBLIC ScPageScaleToItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
/** Default c'tor sets the width and height to 0. */
explicit ScPageScaleToItem();
@@ -351,7 +350,7 @@ private:
class ScCondFormatItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
explicit ScCondFormatItem();
explicit ScCondFormatItem(const std::vector<sal_uInt32>& nIndex);
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index 7157db86c80b..466503fbfd7a 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -45,7 +45,6 @@ public:
class SC_DLLPUBLIC ScTpDefaultsItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScTpDefaultsItem( sal_uInt16 nWhich,
const ScDefaultsOptions& rOpt );
ScTpDefaultsItem( const ScTpDefaultsItem& rItem );
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 995fc26736fe..4b179352ee3f 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -150,7 +150,7 @@ inline bool ScDocOptions::operator!=( const ScDocOptions& rOpt ) const
class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScTpCalcItem( sal_uInt16 nWhich,
const ScDocOptions& rOpt );
ScTpCalcItem( const ScTpCalcItem& rItem );
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 6cd50464a313..0cab4c6e87a5 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -85,7 +85,6 @@ public:
class SC_DLLPUBLIC ScTpFormulaItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScTpFormulaItem( sal_uInt16 nWhich,
const ScFormulaOptions& rOpt );
ScTpFormulaItem( const ScTpFormulaItem& rItem );
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 2759e075ecd5..4a02554536b8 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -875,7 +875,6 @@
#include <tools/rcid.h>
#include <tools/resary.hxx>
#include <tools/resid.hxx>
-#include <tools/rtti.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 5eb13baa217b..468b070dcd96 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -483,7 +483,6 @@
#include <svx/svdpage.hxx>
#include <svx/svdpool.hxx>
#include <svx/svdxcgv.hxx>
-#include <svx/sxmspitm.hxx>
#include <svx/unoapi.hxx>
#include <svx/unomid.hxx>
#include <svx/xbitmap.hxx>
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 0cc93968cdf5..7c363a8cd209 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -55,7 +55,7 @@ public:
class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScTpPrintItem( sal_uInt16 nWhich,
const ScPrintOptions& rOpt );
ScTpPrintItem( const ScTpPrintItem& rItem );
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index a5de26142118..6c7f8abcdef1 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -45,7 +45,6 @@ private:
mutable ScStyleSheet::Usage eUsage;
public:
- TYPEINFO_OVERRIDE();
ScStyleSheet( const ScStyleSheet& rStyle );
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 9a7ba8da2766..147f3d2bd8a0 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -42,7 +42,6 @@ private:
bool bDoPaint:1;
public:
- TYPEINFO_OVERRIDE();
ScTableLink( ScDocShell* pDocSh, const OUString& rFile,
const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh );
ScTableLink( SfxObjectShell* pShell, const OUString& rFile,
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index c4398c3e0cfb..dd1d1681ed14 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -115,7 +115,7 @@ private:
class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt );
ScTpViewItem( const ScTpViewItem& rItem );
virtual ~ScTpViewItem();
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 9e4c1029efe8..87e38d715031 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -41,15 +41,9 @@
using namespace com::sun::star;
-TYPEINIT1(ScMergeAttr, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(ScProtectionAttr, SfxPoolItem);
-TYPEINIT1(ScRangeItem, SfxPoolItem);
-TYPEINIT1(ScTableListItem, SfxPoolItem);
-TYPEINIT1(ScPageHFItem, SfxPoolItem);
-TYPEINIT1(ScViewObjectModeItem, SfxEnumItem);
-TYPEINIT1(ScDoubleItem, SfxPoolItem);
-TYPEINIT1(ScPageScaleToItem, SfxPoolItem);
-TYPEINIT1(ScCondFormatItem, SfxPoolItem);
+
+SfxPoolItem* ScProtectionAttr::CreateDefault() { return new ScProtectionAttr; }
+SfxPoolItem* ScDoubleItem::CreateDefault() { DBG_ASSERT(false, "No ScDoubleItem factory available"); return 0; }
/**
* General Help Function
@@ -112,7 +106,7 @@ ScMergeAttr::~ScMergeAttr()
bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const
{
- OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" );
+ OSL_ENSURE( Which() != rItem.Which() || typeid(*this) == typeid(rItem), "which ==, type !=" );
return (Which() == rItem.Which())
&& (nColMerge == static_cast<const ScMergeAttr&>(rItem).nColMerge)
&& (nRowMerge == static_cast<const ScMergeAttr&>(rItem).nRowMerge);
@@ -331,7 +325,7 @@ bool ScProtectionAttr::GetPresentation
bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const
{
- OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" );
+ OSL_ENSURE( Which() != rItem.Which() || typeid(*this) == typeid(rItem), "which ==, type !=" );
return (Which() == rItem.Which())
&& (bProtection == static_cast<const ScProtectionAttr&>(rItem).bProtection)
&& (bHideFormula == static_cast<const ScProtectionAttr&>(rItem).bHideFormula)
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index b06ab871d5c1..8259b8602068 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -41,7 +41,6 @@
#include "globstr.hrc"
#include "sc.hrc"
-TYPEINIT1(ScStyleSheet, SfxStyleSheet);
#define TWO_CM 1134
#define HFDIST_CM 142
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 02c591608b37..2a56174af83f 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -47,7 +47,6 @@ static bool bIsInUpdate;
ScMatrixRef pResult;
public:
- TYPEINFO_OVERRIDE();
ScDdeLink( ScDocument* pD,
const OUString& rA, const OUString& rT, const OUString& rI,
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index b8fec5928e7c..ced7be732aab 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -35,7 +35,6 @@
#include "refupdatecontext.hxx"
#include <refupdat.hxx>
-#include <tools/rtti.hxx>
#include <svl/zforlist.hxx>
#include <svl/itemset.hxx>
#include <svl/isethint.hxx>
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 783757ef79ee..22f05e4e672a 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -34,7 +34,6 @@
#include "sc.hrc"
#include "hints.hxx"
-TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster);
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index a9b6e39d81a4..1e8c981a4e91 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -19,7 +19,6 @@
using namespace utl;
using namespace com::sun::star::uno;
-TYPEINIT1(ScTpDefaultsItem, SfxPoolItem);
ScDefaultsOptions::ScDefaultsOptions()
{
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 3aceb5ffbfee..11810e3cb018 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -742,7 +742,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
while (pObject)
{
if ( pObject->GetLayer() == SC_LAYER_INTERN &&
- pObject->Type() == TYPE(SdrRectObj) )
+ dynamic_cast< const SdrRectObj* >(pObject) != nullptr )
{
aObjRect = static_cast<SdrRectObj*>(pObject)->GetLogicRect();
aObjRect.Justify();
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index d153640f2d4c..e68875293471 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -35,7 +35,6 @@
using namespace utl;
using namespace com::sun::star::uno;
-TYPEINIT1(ScTpCalcItem, SfxPoolItem);
using sc::HMMToTwips;
using sc::TwipsToHMM;
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 665a7fc7c0aa..240b39ca9143 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -25,7 +25,6 @@ using namespace com::sun::star::uno;
namespace lang = ::com::sun::star::lang;
using ::com::sun::star::i18n::LocaleDataItem;
-TYPEINIT1(ScTpFormulaItem, SfxPoolItem);
ScFormulaOptions::ScFormulaOptions()
{
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index cb201e595b8a..54d880ec8cef 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -27,7 +27,6 @@
using namespace utl;
using namespace com::sun::star::uno;
-TYPEINIT1(ScTpPrintItem, SfxPoolItem);
ScPrintOptions::ScPrintOptions()
{
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 017949f2a31b..9ce779585220 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -34,7 +34,6 @@
using namespace utl;
using namespace com::sun::star::uno;
-TYPEINIT1(ScTpViewItem, SfxPoolItem);
// class ScGridOptions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 6c78cc2bfe05..cbaf7c254916 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -72,7 +72,6 @@
#include <svx/xflclit.hxx>
#include <svx/xlnstwit.hxx>
#include <svx/xlnstit.hxx>
-#include <svx/sxmspitm.hxx>
#include <oox/token/tokens.hxx>
#include <oox/export/drawingml.hxx>
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index d14e39bb8f8d..ba0e16e98104 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::beans;
using namespace xmloff::token;
-TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext );
XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -196,7 +195,6 @@ void XMLTableHeaderFooterContext::EndElement()
}
}
-TYPEINIT1( XMLHeaderFooterRegionContext, SvXMLImportContext );
XMLHeaderFooterRegionContext::XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index fa747e4e3435..91794cfe8da7 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -48,7 +48,6 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext
bool bContainsCenter;
public:
- TYPEINFO_OVERRIDE();
XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -73,7 +72,6 @@ private:
css::uno::Reference< css::text::XTextCursor > xOldTextCursor;
public:
- TYPEINFO_OVERRIDE();
XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index f1aae904e0af..a0956de1799e 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -435,7 +435,6 @@ void XMLTableStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
}
-TYPEINIT1( XMLTableStyleContext, XMLPropStyleContext );
XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -924,7 +923,6 @@ sal_Int32 XMLTableStylesContext::GetIndex(const sal_Int16 nContextID)
return -1;
}
-TYPEINIT1( ScXMLMasterStylesContext, SvXMLStylesContext );
bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const
{
@@ -976,7 +974,6 @@ void ScXMLMasterStylesContext::EndElement()
FinishStyles(true);
}
-TYPEINIT1( ScMasterPageContext, XMLTextMasterPageContext );
ScMasterPageContext::ScMasterPageContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index c2531750b471..b76a5f5a379a 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -89,7 +89,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -192,7 +191,6 @@ protected:
virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
public:
- TYPEINFO_OVERRIDE();
ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -215,7 +213,6 @@ class ScMasterPageContext : public XMLTextMasterPageContext
void ClearContent(const OUString& rContent);
public:
- TYPEINFO_OVERRIDE();
ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 6327a373fb94..8a376e7da751 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -229,7 +229,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while ( pObjSh )
{
- if ( pObjSh->Type() == TYPE(ScDocShell) )
+ if ( dynamic_cast<const ScDocShell * >(pObjSh) != nullptr )
{
ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh);
if ( bArrows )
@@ -272,7 +272,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while ( pObjSh )
{
- if ( pObjSh->Type() == TYPE(ScDocShell) )
+ if ( dynamic_cast<const ScDocShell *>(pObjSh) != nullptr )
{
ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh);
OutputDevice* pPrinter = pDocSh->GetPrinter();
@@ -1327,7 +1327,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while ( pObjSh )
{
- if ( pObjSh->Type() == TYPE(ScDocShell) )
+ if ( dynamic_cast<const ScDocShell *>(pObjSh) != nullptr )
{
ScDocShell* pOneDocSh = static_cast<ScDocShell*>(pObjSh);
pOneDocSh->CalcOutputFactor();
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 0ffeb65b9061..2e6cb51aa655 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -28,15 +28,6 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScInputStatusItem, SfxPoolItem);
-TYPEINIT1(ScSortItem, SfxPoolItem);
-TYPEINIT1(ScQueryItem, SfxPoolItem);
-TYPEINIT1(ScSubTotalItem, SfxPoolItem);
-TYPEINIT1(ScUserListItem, SfxPoolItem);
-TYPEINIT1(ScConsolidateItem, SfxPoolItem);
-TYPEINIT1(ScPivotItem, SfxPoolItem);
-TYPEINIT1(ScSolveItem, SfxPoolItem);
-TYPEINIT1(ScTabOpItem, SfxPoolItem);
/**
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index d6d5d4dd44bd..533deb7c4e5e 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -54,7 +54,6 @@ struct AreaLink_Impl
AreaLink_Impl() : m_pDocSh( nullptr ), m_pDialog( nullptr ) {}
};
-TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink);
ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
const OUString& rFilter, const OUString& rOpt,
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 62a489a8920a..99a6f5178964 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -175,7 +175,6 @@ void ScDocShell::InitInterface_Impl()
// GlobalName of the current version:
SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SfxObjectShellFlags::STD_NORMAL, "scalc" )
-TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: No TypeInfo?
void ScDocShell::FillClass( SvGlobalName* pClassName,
SotClipboardFormatId* pFormat,
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index e729d1e46231..d35f4f835d66 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2264,7 +2264,7 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static
while ( pShell && !pFound )
{
- if ( pShell->Type() == TYPE(ScDocShell) )
+ if ( dynamic_cast<const ScDocShell*>(pShell) != nullptr )
{
if ( nShellCnt == nDocNo )
pFound = static_cast<ScDocShell*>(pShell);
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index b6f7883cfba3..d5e211415f20 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -54,7 +54,6 @@ struct TableLink_Impl
TableLink_Impl() : m_pDocSh( nullptr ), m_pOldParent( nullptr ) {}
};
-TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink);
ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile,
const OUString& rFilter, const OUString& rOpt,
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 5b9bd95d1716..47482cf0ff29 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -55,7 +55,6 @@ void ScChartShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CHART));
}
-TYPEINIT1( ScChartShell, ScDrawShell );
ScChartShell::ScChartShell(ScViewData* pData) :
ScDrawShell(pData)
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 49069086436e..d9c5c331a00e 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -60,7 +60,6 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <memory>
-TYPEINIT1( ScDrawShell, SfxShell );
SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 231a69873f43..1054f6811204 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -50,7 +50,6 @@ void ScDrawFormShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWFORM));
}
-TYPEINIT1( ScDrawFormShell, ScDrawShell );
ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
ScDrawShell(pData)
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index a6b69ebde95e..35184b74ebff 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -95,7 +95,6 @@ void ScDrawTextObjectBar::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(ScGetFontWorkId());
}
-TYPEINIT1( ScDrawTextObjectBar, SfxShell );
// abschalten der nicht erwuenschten Acceleratoren:
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 6f28525abc73..fef6ec8d22fb 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -51,7 +51,6 @@ void ScGraphicShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_GRAPHIC));
}
-TYPEINIT1( ScGraphicShell, ScDrawShell );
ScGraphicShell::ScGraphicShell(ScViewData* pData) :
ScDrawShell(pData)
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index d04cd4eb1c17..db0f5e7dd3c2 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -44,7 +44,6 @@ void ScMediaShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_MEDIA));
}
-TYPEINIT1( ScMediaShell, ScDrawShell );
ScMediaShell::ScMediaShell(ScViewData* pData) :
ScDrawShell(pData)
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 900eb417a3fb..120fa65878ed 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -50,7 +50,6 @@ void ScOleObjectShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_OLE));
}
-TYPEINIT1( ScOleObjectShell, ScDrawShell );
ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
ScDrawShell(pData)
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index 9081f7df0ebe..b6fe48c73295 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -34,7 +34,6 @@ private:
sal_uInt16 nFunction;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_AUDITING_SHELL)
private:
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 3208f8502cf9..ff2db0c1fdaa 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -69,7 +69,6 @@ private:
RotateTransliteration m_aRotateCase;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_CELL_SHELL)
private:
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index 4dde7d0b353f..5c02eb606852 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -31,7 +31,6 @@ class ScViewData;
class ScChartShell: public ScDrawShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_CHART_SHELL)
private:
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 0a465cbcf2d5..1d1edfd3dfd5 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -162,7 +162,6 @@ protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_DOC_SHELL)
SFX_DECL_OBJECTFACTORY();
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 1e183b8080b7..f13781ec2337 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -48,7 +48,6 @@ protected:
ScViewData* GetViewData() { return pViewData; }
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_DRAW_SHELL)
private:
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 63c898e6ae76..bd061e1ff154 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -32,7 +32,6 @@ class ScViewData;
class ScDrawFormShell: public ScDrawShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_FORM_SHELL)
private:
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index aadf7296d433..09c1d94d4bfa 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -41,7 +41,6 @@ class ScDrawTextObjectBar : public SfxShell
DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void );
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL)
private:
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index 5474ed174db5..85d5fdfc1ccf 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -49,7 +49,6 @@ private:
DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void );
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_EDIT_SHELL)
private:
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index eada0622bc30..ac7123c60b34 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -36,7 +36,6 @@ protected:
const ScViewData* GetViewData() const {return pViewData;}
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_FORMAT_SHELL)
private:
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index 531451411e98..902820c5ff9f 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -33,7 +33,6 @@ class ScViewData;
class ScGraphicShell: public ScDrawShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL)
private:
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index 9bb00ff38eb8..e22e020986ee 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -32,7 +32,6 @@ class ScViewData;
class ScMediaShell: public ScDrawShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_MEDIA_SHELL)
private:
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index 2262cd9ffd11..54283233eb7e 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -32,7 +32,6 @@ class ScViewData;
class ScOleObjectShell: public ScDrawShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL)
private:
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index fdef766ac21a..0df7f76a7346 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -30,7 +30,6 @@ class ScTabViewShell;
class ScPageBreakShell : public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_PAGEBREAK_SHELL)
private:
diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index 7d80511679fa..cd69774d457d 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -31,7 +31,6 @@ class ScDPObject;
class ScPivotShell : public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_PIVOT_SHELL)
private:
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index e242d9396630..841b2565ef8a 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -75,7 +75,6 @@ protected:
virtual void ReadUserDataSequence (const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScPreviewShell);
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index dc1d8350e5a0..24c9c83fd20e 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -219,7 +219,6 @@ protected:
virtual SdrView* GetDrawView() const override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScTabViewShell);
diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx
index 82efe633e302..fabda431756a 100644
--- a/sc/source/ui/inc/target.hxx
+++ b/sc/source/ui/inc/target.hxx
@@ -30,7 +30,6 @@ private:
ScTabViewShell* pViewShell;
public:
- TYPEINFO_OVERRIDE();
ScTabViewTarget( ScTabViewShell* pShell ) : pViewShell( pShell ) {}
virtual ~ScTabViewTarget();
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 440234c8fe76..21cb4a5331d9 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -52,7 +52,6 @@ class ScInputStatusItem : public SfxPoolItem
const std::vector<editeng::MisspellRanges>* mpMisspellRanges;
public:
- TYPEINFO_OVERRIDE();
ScInputStatusItem( sal_uInt16 nWhich,
const ScAddress& rCurPos,
@@ -134,7 +133,6 @@ public:
class SC_DLLPUBLIC ScSortItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScSortItem( sal_uInt16 nWhich,
ScViewData* ptrViewData,
const ScSortParam* pSortData );
@@ -158,7 +156,6 @@ private:
class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScQueryItem( sal_uInt16 nWhich,
ScViewData* ptrViewData,
const ScQueryParam* pQueryData );
@@ -186,7 +183,6 @@ private:
class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScSubTotalItem( sal_uInt16 nWhich,
ScViewData* ptrViewData,
const ScSubTotalParam* pSubTotalData );
@@ -210,7 +206,6 @@ private:
class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScUserListItem( sal_uInt16 nWhich );
ScUserListItem( const ScUserListItem& rItem );
virtual ~ScUserListItem();
@@ -228,7 +223,6 @@ private:
class ScConsolidateItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScConsolidateItem( sal_uInt16 nWhich,
const ScConsolidateParam* pParam );
ScConsolidateItem( const ScConsolidateItem& rItem );
@@ -246,7 +240,6 @@ private:
class ScPivotItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScPivotItem( sal_uInt16 nWhich, const ScDPSaveData* pData,
const ScRange* pRange, bool bNew );
ScPivotItem( const ScPivotItem& rItem );
@@ -268,7 +261,6 @@ private:
class ScSolveItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScSolveItem( sal_uInt16 nWhich,
const ScSolveParam* pParam );
ScSolveItem( const ScSolveItem& rItem );
@@ -286,7 +278,6 @@ private:
class ScTabOpItem : public SfxPoolItem
{
public:
- TYPEINFO_OVERRIDE();
ScTabOpItem( sal_uInt16 nWhich,
const ScTabOpParam* pParam );
ScTabOpItem( const ScTabOpItem& rItem );
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index bd9440d13a0a..f501f5b305b5 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -41,7 +41,6 @@ class ScSimpleUndo: public SfxUndoAction
public:
typedef boost::ptr_map<SCTAB,sc::ColumnSpanSet> DataSpansType;
- TYPEINFO_OVERRIDE();
ScSimpleUndo( ScDocShell* pDocSh );
virtual ~ScSimpleUndo();
@@ -79,7 +78,6 @@ enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT
class ScBlockUndo: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange,
ScBlockUndoMode eBlockMode );
virtual ~ScBlockUndo();
@@ -101,7 +99,6 @@ protected:
class ScMultiBlockUndo: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScMultiBlockUndo(ScDocShell* pDocSh, const ScRangeList& rRanges,
ScBlockUndoMode eBlockMode);
virtual ~ScMultiBlockUndo();
@@ -130,7 +127,6 @@ protected:
SdrUndoAction* mpDrawUndo;
public:
- TYPEINFO_OVERRIDE();
ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo = nullptr );
virtual ~ScDBFuncUndo();
@@ -145,7 +141,6 @@ enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST };
class ScMoveUndo: public ScSimpleUndo // mit Referenzen
{
public:
- TYPEINFO_OVERRIDE();
ScMoveUndo( ScDocShell* pDocSh,
ScDocument* pRefDoc, ScRefUndoData* pRefData,
ScMoveUndoMode eRefMode );
@@ -171,7 +166,6 @@ class ScUndoWrapper: public SfxUndoAction // for manual merging of act
SfxUndoAction* pWrappedUndo;
public:
- TYPEINFO_OVERRIDE();
ScUndoWrapper( SfxUndoAction* pUndo );
virtual ~ScUndoWrapper();
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 1e29c5b8f274..2bafcdddfffb 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -42,7 +42,6 @@ class ScEditDataArray;
class ScUndoInsertCells: public ScMoveUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoInsertCells( ScDocShell* pNewDocShell,
const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
@@ -75,7 +74,6 @@ private:
class ScUndoDeleteCells: public ScMoveUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDeleteCells( ScDocShell* pNewDocShell,
const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData );
@@ -104,7 +102,6 @@ private:
class ScUndoDeleteMulti: public ScMoveUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDeleteMulti( ScDocShell* pNewDocShell,
bool bNewRows, bool bNeedsRefresh, SCTAB nNewTab,
@@ -135,7 +132,6 @@ private:
class ScUndoCut: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoCut( ScDocShell* pNewDocShell,
ScRange aRange, // adjusted for merged cells
ScAddress aOldEnd, // end position without adjustment
@@ -181,7 +177,6 @@ struct ScUndoPasteOptions
class ScUndoPaste: public ScMultiBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges,
const ScMarkData& rMark,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
@@ -217,7 +212,6 @@ private:
class ScUndoDragDrop: public ScMoveUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDragDrop( ScDocShell* pNewDocShell,
const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut,
ScDocument* pUndoDocument, ScRefUndoData* pRefData,
@@ -251,7 +245,6 @@ private:
class ScUndoDeleteContents: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDeleteContents( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
const ScRange& rRange,
@@ -287,7 +280,6 @@ private:
class ScUndoFillTable: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoFillTable( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
@@ -323,7 +315,6 @@ private:
class ScUndoSelectionAttr: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
@@ -359,7 +350,6 @@ private:
class ScUndoWidthOrHeight: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOLROW nNewStart, SCTAB nNewStartTab,
@@ -396,7 +386,6 @@ private:
class ScUndoAutoFill: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoAutoFill( ScDocShell* pNewDocShell,
const ScRange& rRange, const ScRange& rSourceArea,
ScDocument* pNewUndoDoc, const ScMarkData& rMark,
@@ -431,7 +420,6 @@ private:
class ScUndoMerge: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo);
virtual ~ScUndoMerge();
@@ -455,7 +443,6 @@ private:
class ScUndoAutoFormat: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocument* pNewUndoDoc,
const ScMarkData& rMark,
@@ -479,7 +466,6 @@ private:
class ScUndoReplace: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoReplace( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
@@ -509,7 +495,6 @@ private:
class ScUndoTabOp: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoTabOp( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -541,7 +526,6 @@ private:
class ScUndoConversion : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoConversion( ScDocShell* pNewDocShell, const ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc,
@@ -573,7 +557,6 @@ private:
class ScUndoRefConversion: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRefConversion( ScDocShell* pNewDocShell,
const ScRange& aMarkRange, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, InsertDeleteFlags nNewFlag);
@@ -603,7 +586,6 @@ private:
class ScUndoListNames: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoListNames( ScDocShell* pNewDocShell,
const ScRange& rRange,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc );
@@ -626,7 +608,6 @@ private:
class ScUndoConditionalFormat : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoConditionalFormat( ScDocShell* pNewDocShell,
ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange);
virtual ~ScUndoConditionalFormat();
@@ -648,7 +629,6 @@ private:
class ScUndoUseScenario: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoUseScenario( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
const ScArea& rDestArea, ScDocument* pNewUndoDoc,
@@ -672,7 +652,6 @@ private:
class ScUndoSelectionStyle: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoSelectionStyle( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
const ScRange& rRange,
@@ -700,7 +679,6 @@ private:
class ScUndoRefreshLink: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRefreshLink( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc );
virtual ~ScUndoRefreshLink();
@@ -720,7 +698,6 @@ private:
class ScUndoEnterMatrix: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoEnterMatrix( ScDocShell* pNewDocShell,
const ScRange& rArea,
ScDocument* pNewUndoDoc,
@@ -746,7 +723,6 @@ private:
class ScUndoInsertAreaLink : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoInsertAreaLink( ScDocShell* pShell,
const OUString& rDocName,
const OUString& rFltName, const OUString& rOptions,
@@ -773,7 +749,6 @@ private:
class ScUndoRemoveAreaLink : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRemoveAreaLink( ScDocShell* pShell,
const OUString& rDocName,
const OUString& rFltName, const OUString& rOptions,
@@ -800,7 +775,6 @@ private:
class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo?
{
public:
- TYPEINFO_OVERRIDE();
ScUndoUpdateAreaLink( ScDocShell* pShell,
const OUString& rOldD,
const OUString& rOldF, const OUString& rOldO,
@@ -844,7 +818,6 @@ private:
class ScUndoIndent: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, bool bIncrement );
virtual ~ScUndoIndent();
@@ -865,7 +838,6 @@ private:
class ScUndoTransliterate: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, sal_Int32 nType );
virtual ~ScUndoTransliterate();
@@ -886,7 +858,6 @@ private:
class ScUndoClearItems: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, const sal_uInt16* pW );
virtual ~ScUndoClearItems();
@@ -907,7 +878,6 @@ private:
class ScUndoRemoveBreaks: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRemoveBreaks( ScDocShell* pNewDocShell,
SCTAB nNewTab, ScDocument* pNewUndoDoc );
virtual ~ScUndoRemoveBreaks();
@@ -927,7 +897,6 @@ private:
class ScUndoRemoveMerge: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRemoveMerge( ScDocShell* pNewDocShell,
const ScCellMergeOption& rOption,
ScDocument* pNewUndoDoc );
@@ -950,7 +919,6 @@ private:
class ScUndoBorder: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoBorder( ScDocShell* pNewDocShell,
const ScRangeList& rRangeList,
ScDocument* pNewUndoDoc,
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index ab6ea1014ea2..7de6d534c3d7 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -45,7 +45,6 @@ class CellValues;
class ScUndoCursorAttr: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoCursorAttr( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
@@ -81,7 +80,6 @@ private:
class ScUndoEnterData: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
struct Value
{
@@ -123,7 +121,6 @@ private:
class ScUndoEnterValue: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoEnterValue(
ScDocShell* pNewDocShell, const ScAddress& rNewPos,
const ScCellValue& rUndoCell, double nVal );
@@ -149,7 +146,6 @@ private:
class ScUndoSetCell : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoSetCell( ScDocShell* pDocSh, const ScAddress& rPos, const ScCellValue& rOldVal, const ScCellValue& rNewVal );
virtual ~ScUndoSetCell();
@@ -174,7 +170,6 @@ private:
class ScUndoPageBreak: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoPageBreak( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
bool bNewColumn, bool bNewInsert );
@@ -200,7 +195,6 @@ private:
class ScUndoPrintZoom: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT,
sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP );
virtual ~ScUndoPrintZoom();
@@ -225,7 +219,6 @@ private:
class ScUndoThesaurus: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoThesaurus( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const ScCellValue& rOldText, const ScCellValue& rNewText );
@@ -255,7 +248,6 @@ private:
class ScUndoReplaceNote : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
/** Constructs an undo action for inserting or removing a cell note. */
ScUndoReplaceNote(
@@ -297,7 +289,6 @@ private:
class ScUndoShowHideNote : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow );
virtual ~ScUndoShowHideNote();
@@ -316,7 +307,6 @@ private:
class ScUndoDetective: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDetective( ScDocShell* pNewDocShell,
SdrUndoAction* pDraw, const ScDetOpData* pOperation,
ScDetOpList* pUndoList = nullptr );
@@ -340,7 +330,6 @@ private:
class ScUndoRangeNames: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
//use nTab = -1 for global range names
ScUndoRangeNames( ScDocShell* pNewDocShell,
ScRangeName* pOld, ScRangeName* pNew , SCTAB nTab = -1);
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 980a7fe3fcdf..98cc867b3eba 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -43,7 +43,6 @@ class ScMarkData;
class ScUndoDoOutline: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDoOutline( ScDocShell* pNewDocShell,
SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
ScDocument* pNewUndoDoc, bool bNewColumns,
@@ -71,7 +70,6 @@ private:
class ScUndoMakeOutline: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoMakeOutline( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -97,7 +95,6 @@ private:
class ScUndoOutlineLevel: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoOutlineLevel( ScDocShell* pNewDocShell,
SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
@@ -124,7 +121,6 @@ private:
class ScUndoOutlineBlock: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoOutlineBlock( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -150,7 +146,6 @@ private:
class ScUndoRemoveAllOutlines: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -174,7 +169,6 @@ private:
class ScUndoAutoOutline: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoAutoOutline( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -198,7 +192,6 @@ private:
class ScUndoSubTotals: public ScDBFuncUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
const ScSubTotalParam& rNewParam, SCROW nNewEndY,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
@@ -227,7 +220,6 @@ private:
class ScUndoQuery: public ScDBFuncUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab,
const ScQueryParam& rParam, ScDocument* pNewUndoDoc,
ScDBCollection* pNewUndoDB, const ScRange* pOld,
@@ -263,7 +255,6 @@ private:
void DoChange( bool bUndo );
public:
- TYPEINFO_OVERRIDE();
ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange,
const OUString& rName, bool bSet );
virtual ~ScUndoAutoFilter();
@@ -279,7 +270,6 @@ public:
class ScUndoDBData: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDBData( ScDocShell* pNewDocShell,
ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl );
virtual ~ScUndoDBData();
@@ -299,7 +289,6 @@ private:
class ScUndoImportData: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY,
SCCOL nNewFormula,
@@ -330,7 +319,6 @@ private:
class ScUndoRepeatDB: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY,
@@ -363,7 +351,6 @@ private:
class ScUndoDataPilot: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDataPilot( ScDocShell* pNewDocShell,
ScDocument* pOldDoc, ScDocument* pNewDoc,
const ScDPObject* pOldObj, const ScDPObject* pNewObj,
@@ -388,7 +375,6 @@ private:
class ScUndoConsolidate: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoConsolidate( ScDocShell* pNewDocShell,
const ScArea& rArea, const ScConsolidateParam& rPar,
ScDocument* pNewUndoDoc, bool bReference,
@@ -416,7 +402,6 @@ private:
class ScUndoChartData: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoChartData( ScDocShell* pNewDocShell,
const OUString& rName, const ScRange& rNew,
bool bColHdr, bool bRowHdr, bool bAdd );
@@ -449,7 +434,6 @@ private:
class ScUndoDataForm: public ScBlockUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDataForm( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index d5d53b669705..103b01514609 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -32,7 +32,6 @@ class ScUndoDraw: public SfxUndoAction
void UpdateSubShell();
public:
- TYPEINFO_OVERRIDE();
ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh );
virtual ~ScUndoDraw();
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index ce823a338873..fb54eb55ec02 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -58,7 +58,6 @@ private:
const ScStyleSaveData& rData );
public:
- TYPEINFO_OVERRIDE();
ScUndoModifyStyle( ScDocShell* pDocSh,
SfxStyleFamily eFam,
const ScStyleSaveData& rOld,
@@ -76,7 +75,6 @@ public:
class ScUndoApplyPageStyle: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoApplyPageStyle( ScDocShell* pDocSh, const OUString& rNewStyle );
virtual ~ScUndoApplyPageStyle();
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index c02a44d365c2..c4f1b49e6b0f 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -44,7 +44,6 @@ class ScMarkData;
class ScUndoInsertTab : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoInsertTab(
ScDocShell* pNewDocShell,
SCTAB nTabNum,
@@ -72,7 +71,6 @@ private:
class ScUndoInsertTables : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoInsertTables(
ScDocShell* pNewDocShell,
SCTAB nTabNum,
@@ -100,7 +98,6 @@ private:
class ScUndoDeleteTab: public ScMoveUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoDeleteTab(
ScDocShell* pNewDocShell,
const std::vector<SCTAB> &theTabs, //SCTAB nNewTab,
@@ -126,7 +123,6 @@ private:
class ScUndoRenameTab: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRenameTab(
ScDocShell* pNewDocShell,
SCTAB nT,
@@ -152,7 +148,6 @@ private:
class ScUndoMoveTab: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoMoveTab(
ScDocShell* pNewDocShell,
::std::vector<SCTAB>* pOldTabs,
@@ -181,7 +176,6 @@ private:
class ScUndoCopyTab: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoCopyTab(
ScDocShell* pNewDocShell,
::std::vector<SCTAB>* pOldTabs,
@@ -209,7 +203,6 @@ private:
class ScUndoTabColor: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoTabColor(
ScDocShell* pNewDocShell,
SCTAB nT,
@@ -236,7 +229,6 @@ private:
class ScUndoMakeScenario: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoMakeScenario(
ScDocShell* pNewDocShell,
SCTAB nSrc, SCTAB nDest,
@@ -266,7 +258,6 @@ private:
class ScUndoImportTab : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoImportTab(
ScDocShell* pShell,
SCTAB nNewTab, SCTAB nNewCount );
@@ -291,7 +282,6 @@ private:
class ScUndoRemoveLink : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRemoveLink( // Call before delete!
ScDocShell* pShell,
const OUString& rDoc );
@@ -320,7 +310,6 @@ private:
class ScUndoShowHideTab : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoShowHideTab(
ScDocShell* pShell,
const std::vector<SCTAB>& newUndoTabs,
@@ -388,7 +377,6 @@ private:
class ScUndoPrintRange : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew );
virtual ~ScUndoPrintRange();
@@ -411,7 +399,6 @@ private:
class ScUndoScenarioFlags: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoScenarioFlags(
ScDocShell* pNewDocShell, SCTAB nT,
const OUString& rON, const OUString& rNN,
@@ -443,7 +430,6 @@ private:
class ScUndoRenameObject: public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoRenameObject(
ScDocShell* pNewDocShell, const OUString& rPN,
const OUString& rON, const OUString& rNN );
@@ -468,7 +454,6 @@ private:
class ScUndoLayoutRTL : public ScSimpleUndo
{
public:
- TYPEINFO_OVERRIDE();
ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, bool bNewRTL );
virtual ~ScUndoLayoutRTL();
diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx
index 0d66b625a66d..dcf593d62162 100644
--- a/sc/source/ui/undo/target.cxx
+++ b/sc/source/ui/undo/target.cxx
@@ -21,7 +21,6 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScTabViewTarget, SfxRepeatTarget);
ScTabViewTarget::~ScTabViewTarget()
{
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 127c8168f54c..753f8dbac39a 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -35,12 +35,6 @@
#include <column.hxx>
#include <sortparam.hxx>
-TYPEINIT1(ScSimpleUndo, SfxUndoAction);
-TYPEINIT1(ScBlockUndo, ScSimpleUndo);
-TYPEINIT1(ScMultiBlockUndo, ScSimpleUndo);
-TYPEINIT1(ScMoveUndo, ScSimpleUndo);
-TYPEINIT1(ScDBFuncUndo, ScSimpleUndo);
-TYPEINIT1(ScUndoWrapper, SfxUndoAction);
ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
pDocShell( pDocSh ),
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 55f5e1ad2d87..6bf50fc3a5b2 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -60,23 +60,6 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoInsertCells, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteCells, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction);
-TYPEINIT1(ScUndoCut, ScBlockUndo);
-TYPEINIT1(ScUndoPaste, SfxUndoAction);
-TYPEINIT1(ScUndoDragDrop, SfxUndoAction);
-TYPEINIT1(ScUndoListNames, SfxUndoAction);
-TYPEINIT1(ScUndoConditionalFormat, SfxUndoAction);
-TYPEINIT1(ScUndoUseScenario, SfxUndoAction);
-TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction);
-TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo);
-TYPEINIT1(ScUndoIndent, ScBlockUndo);
-TYPEINIT1(ScUndoTransliterate, ScBlockUndo);
-TYPEINIT1(ScUndoClearItems, ScBlockUndo);
-TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo);
-TYPEINIT1(ScUndoBorder, ScBlockUndo);
// TODO:
/*A*/ // SetOptimalHeight on Document, if no View
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 4539c96f62cc..65012a67f17f 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -30,7 +30,6 @@
#include "undoolk.hxx"
-TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction);
/** Change column widths or row heights */
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 08504a597f45..f7e0e2846869 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -60,20 +60,6 @@
// STATIC DATA ---------------------------------------------------------------
-TYPEINIT1(ScUndoDeleteContents, SfxUndoAction);
-TYPEINIT1(ScUndoFillTable, SfxUndoAction);
-TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction);
-TYPEINIT1(ScUndoAutoFill, SfxUndoAction);
-TYPEINIT1(ScUndoMerge, SfxUndoAction);
-TYPEINIT1(ScUndoAutoFormat, SfxUndoAction);
-TYPEINIT1(ScUndoReplace, SfxUndoAction);
-TYPEINIT1(ScUndoTabOp, SfxUndoAction);
-TYPEINIT1(ScUndoConversion, SfxUndoAction);
-TYPEINIT1(ScUndoRefConversion, SfxUndoAction);
-TYPEINIT1(ScUndoRefreshLink, SfxUndoAction);
-TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction);
-TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
// TODO:
/*A*/ // SetOptimalHeight on Document, when no View
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 6909e64c1ccf..e07e0b2cceec 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -66,17 +66,6 @@ namespace HelperNotifyChanges
}
}
-TYPEINIT1(ScUndoCursorAttr, ScSimpleUndo);
-TYPEINIT1(ScUndoEnterData, ScSimpleUndo);
-TYPEINIT1(ScUndoEnterValue, ScSimpleUndo);
-TYPEINIT1(ScUndoSetCell, ScSimpleUndo);
-TYPEINIT1(ScUndoPageBreak, ScSimpleUndo);
-TYPEINIT1(ScUndoPrintZoom, ScSimpleUndo);
-TYPEINIT1(ScUndoThesaurus, ScSimpleUndo);
-TYPEINIT1(ScUndoReplaceNote, ScSimpleUndo);
-TYPEINIT1(ScUndoShowHideNote, ScSimpleUndo);
-TYPEINIT1(ScUndoDetective, ScSimpleUndo);
-TYPEINIT1(ScUndoRangeNames, ScSimpleUndo);
ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 82e0a4c1ab40..77e35c40cd34 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -44,22 +44,6 @@
#include "refundo.hxx"
#include "markdata.hxx"
-TYPEINIT1(ScUndoDoOutline, ScSimpleUndo);
-TYPEINIT1(ScUndoMakeOutline, ScSimpleUndo);
-TYPEINIT1(ScUndoOutlineLevel, ScSimpleUndo);
-TYPEINIT1(ScUndoOutlineBlock, ScSimpleUndo);
-TYPEINIT1(ScUndoRemoveAllOutlines, ScSimpleUndo);
-TYPEINIT1(ScUndoAutoOutline, ScSimpleUndo);
-TYPEINIT1(ScUndoSubTotals, ScDBFuncUndo);
-TYPEINIT1(ScUndoQuery, ScDBFuncUndo);
-TYPEINIT1(ScUndoAutoFilter, ScDBFuncUndo);
-TYPEINIT1(ScUndoDBData, ScSimpleUndo);
-TYPEINIT1(ScUndoImportData, ScSimpleUndo);
-TYPEINIT1(ScUndoRepeatDB, ScSimpleUndo);
-TYPEINIT1(ScUndoDataPilot, ScSimpleUndo);
-TYPEINIT1(ScUndoConsolidate, ScSimpleUndo);
-TYPEINIT1(ScUndoChartData, ScSimpleUndo);
-TYPEINIT1(ScUndoDataForm, SfxUndoAction);
// Show or hide outline groups
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index 4665a46a03d1..5645afb09406 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -23,7 +23,6 @@
#include "docsh.hxx"
#include "tabvwsh.hxx"
-TYPEINIT1(ScUndoDraw, SfxUndoAction);
ScUndoDraw::ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ) :
pDrawUndo( pUndo ),
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index a9a7102e91f7..9dcbfb21f133 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -29,8 +29,6 @@
#include "inputhdl.hxx"
#include "globstr.hrc"
-TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo);
-TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo);
// modify style (cell or page style)
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index ccfa2ee44234..f74667f17456 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -59,21 +59,6 @@ using ::std::unique_ptr;
using ::std::vector;
using std::shared_ptr;
-TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
-TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteTab, SfxUndoAction);
-TYPEINIT1(ScUndoRenameTab, SfxUndoAction);
-TYPEINIT1(ScUndoMoveTab, SfxUndoAction);
-TYPEINIT1(ScUndoCopyTab, SfxUndoAction);
-TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
-TYPEINIT1(ScUndoImportTab, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
-TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
-TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
-TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
-TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
-TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
-TYPEINIT1(ScUndoTabColor, SfxUndoAction);
ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
SCTAB nTabNum,
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 124351873d12..a61d4a064439 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -34,7 +34,6 @@
#define ScAuditingShell
#include "scslots.hxx"
-TYPEINIT1( ScAuditingShell, SfxShell );
SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell)
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 94952800fa03..9d35c9706e5a 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -62,7 +62,6 @@
#define CellMovement
#include "scslots.hxx"
-TYPEINIT1( ScCellShell, ScFormatShell );
SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell)
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 2a795a1b7ea2..d0e1b4d369e8 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -82,7 +82,6 @@
using namespace ::com::sun::star;
-TYPEINIT1( ScEditShell, SfxShell );
SFX_IMPL_INTERFACE(ScEditShell, SfxShell)
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 0ca101c976f0..7f19086254a8 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -119,7 +119,6 @@ SvxCellVerJustify lclConvertSlotToVAlign( sal_uInt16 nSlot )
} // namespace
-TYPEINIT1( ScFormatShell, SfxShell );
SFX_IMPL_INTERFACE(ScFormatShell, SfxShell)
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index d4c8df0dde1a..0a0766bd10ee 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -34,7 +34,6 @@
#define ScPageBreakShell
#include "scslots.hxx"
-TYPEINIT1( ScPageBreakShell, SfxShell );
SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell)
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 3e83de30cf47..a25cad370ad2 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -43,7 +43,6 @@
#include "scslots.hxx"
#include <memory>
-TYPEINIT1( ScPivotShell, SfxShell );
SFX_IMPL_INTERFACE(ScPivotShell, SfxShell)
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 73b90360f6de..8d0f7150d848 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -83,7 +83,6 @@ using namespace com::sun::star;
#include <memory>
-TYPEINIT1( ScPreviewShell, SfxViewShell );
SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell)
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index e10a0a129728..a2f5d101a14d 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -488,7 +488,7 @@ static sal_uInt16 lcl_DocShellNr( ScDocument* pDoc )
SfxObjectShell* pShell = SfxObjectShell::GetFirst();
while ( pShell )
{
- if ( pShell->Type() == TYPE(ScDocShell) )
+ if ( dynamic_cast<const ScDocShell *>(pShell) != nullptr )
{
if ( &static_cast<ScDocShell*>(pShell)->GetDocument() == pDoc )
return nShellCnt;
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index f9c6f2048ccd..480dd2262a2c 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -47,7 +47,6 @@
#define ScTabViewShell
#include "scslots.hxx"
-TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener);
SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell)
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 2d90bbe41179..e6765254837c 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -205,7 +205,6 @@ protected:
public:
- TYPEINFO_VISIBILITY_OVERRIDE(SAL_DLLPRIVATE);
SAL_DLLPRIVATE SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
SAL_DLLPRIVATE virtual ~SdDrawDocument();
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 05d49c8ec761..71e2db442a1c 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -736,7 +736,6 @@
#include <svx/sxciaitm.hxx>
#include <svx/sxekitm.hxx>
#include <svx/sxelditm.hxx>
-#include <svx/sxmsuitm.hxx>
#include <svx/tabline.hxx>
#include <svx/tbcontrl.hxx>
#include <svx/unoapi.hxx>
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index e0611e50a06b..603e322ea416 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -86,7 +86,6 @@ public:
class DiaEffectItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
DiaEffectItem( css::presentation::FadeEffect eFade = css::presentation::FadeEffect_NONE );
DiaEffectItem( SvStream& rIn );
@@ -98,7 +97,6 @@ public:
class DiaSpeedItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM );
DiaSpeedItem( SvStream& rIn );
@@ -110,7 +108,6 @@ public:
class DiaAutoItem : public SfxEnumItem
{
public:
- TYPEINFO_OVERRIDE();
DiaAutoItem( PresChange = PRESCHANGE_MANUAL );
DiaAutoItem( SvStream& rIn );
@@ -122,7 +119,6 @@ public:
class DiaTimeItem : public SfxUInt32Item
{
public:
- TYPEINFO_OVERRIDE();
DiaTimeItem( sal_uInt32 nValue = 0L );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 195728e8420b..27297e614da1 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -78,7 +78,6 @@ typedef std::map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache
class SdModule : public SfxModule, public SfxListener
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDAPP)
DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void );
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index f9fa1e569132..a7d60976ad14 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -153,7 +153,6 @@ protected:
void lateInit(const SdPage& rSrcPage);
public:
- TYPEINFO_OVERRIDE();
SdPage(SdDrawDocument& rNewDoc, bool bMasterPage=false);
virtual ~SdPage();
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 20da8b374a36..84b81a3215ae 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -28,7 +28,6 @@ class SdDrawDocument;
class SD_DLLPUBLIC SdUndoAction : public SfxUndoAction
{
public:
- TYPEINFO_OVERRIDE();
SdUndoAction(SdDrawDocument* pSdDrawDocument)
: mpDoc(pSdDrawDocument) {}
virtual ~SdUndoAction() {}
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 914ae1cdc62b..91cb397822aa 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -111,7 +111,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::beans::PropertyValue;
-TYPEINIT1( SdDrawDocument, FmFormModel );
SdDrawDocument* SdDrawDocument::pDocLockedInsertingLinks = nullptr;
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 00071654fe3d..56ca9237181c 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -48,7 +48,6 @@
#include <svx/dialmgr.hxx>
#include <editeng/bulletitem.hxx>
#include <svx/xtable.hxx>
-#include <svx/sxmsuitm.hxx>
#include <editeng/borderline.hxx>
#include <editeng/boxitem.hxx>
#include <svx/xit.hxx>
@@ -489,7 +488,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
pISet->Put(XLineEndWidthItem(200));
pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
- pISet->Put(makeSdrMeasureShowUnitItem(true));
+ pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
// Generate presentation templates for default layout.
OUString aPrefix = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx
index ce394fc167b1..186f376d7d8a 100644
--- a/sd/source/core/sdattr.cxx
+++ b/sd/source/core/sdattr.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
|* DiaEffectItem
|*
*************************************************************************/
-TYPEINIT1_AUTOFACTORY( DiaEffectItem, SfxEnumItem );
DiaEffectItem::DiaEffectItem( presentation::FadeEffect eFE ) :
SfxEnumItem( ATTR_DIA_EFFECT, (sal_uInt16)eFE )
@@ -53,7 +52,6 @@ SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, sal_uInt16 ) const
|* DiaSpeedItem
|*
*************************************************************************/
-TYPEINIT1_AUTOFACTORY( DiaSpeedItem, SfxEnumItem );
DiaSpeedItem::DiaSpeedItem( FadeSpeed eFS ) :
SfxEnumItem( ATTR_DIA_SPEED, (sal_uInt16)eFS )
@@ -80,7 +78,6 @@ SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, sal_uInt16 ) const
|* DiaAutoItem
|*
*************************************************************************/
-TYPEINIT1_AUTOFACTORY( DiaAutoItem, SfxEnumItem );
DiaAutoItem::DiaAutoItem( PresChange eChange ) :
SfxEnumItem( ATTR_DIA_AUTO, (sal_uInt16)eChange )
@@ -107,7 +104,6 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, sal_uInt16 ) const
|* DiaTimeItem
|*
*************************************************************************/
-TYPEINIT1_AUTOFACTORY( DiaTimeItem, SfxUInt32Item );
DiaTimeItem::DiaTimeItem( sal_uInt32 nValue ) :
SfxUInt32Item( ATTR_DIA_TIME, nValue )
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index cd3fe89a64d9..b4c6f8a70e90 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -81,7 +81,6 @@ using namespace ::com::sun::star::uno;
using namespace com::sun::star::xml::dom;
using ::com::sun::star::uno::Reference;
-TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
/*************************************************************************
|*
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 82c23e11115a..1cdb5cf80691 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -54,7 +54,6 @@
#include "cfgids.hxx"
#include "tools/SdGlobalResourceContainer.hxx"
-TYPEINIT1( SdModule, SfxModule );
#define SdModule
#include "sdslots.hxx"
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 05abede1c517..ad3d047ed7af 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -43,7 +43,6 @@ void LeftImpressPaneShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::sd::LeftPaneImpressChildWindow::GetChildWindowId());
}
-TYPEINIT1(LeftImpressPaneShell, SfxShell);
LeftImpressPaneShell::LeftImpressPaneShell()
: SfxShell()
@@ -69,7 +68,6 @@ void LeftDrawPaneShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::sd::LeftPaneDrawChildWindow::GetChildWindowId());
}
-TYPEINIT1(LeftDrawPaneShell, SfxShell);
LeftDrawPaneShell::LeftDrawPaneShell()
: SfxShell()
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index c8f290ff2ec2..1c24d1eaebd5 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -32,7 +32,6 @@
#include "stlsheet.hxx"
#include "glob.hrc"
-TYPEINIT1(StyleSheetUndoAction, SdUndoAction);
StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
SfxStyleSheet* pTheStyleSheet,
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 6c83b119c884..c30436e85394 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -84,7 +84,6 @@ namespace sd {
/**
* slotmaps and definitions of SFX
*/
-TYPEINIT1( DrawDocShell, SfxObjectShell );
SFX_IMPL_OBJECTFACTORY(
DrawDocShell,
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 0da31b4f6d9b..af6393990123 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -41,7 +41,6 @@ using namespace sd;
namespace sd
{
-TYPEINIT1(GraphicDocShell, DrawDocShell);
SFX_IMPL_SUPERCLASS_INTERFACE(GraphicDocShell, SfxObjectShell)
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index ece3c890f0b2..50be16e23fd7 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -37,7 +37,6 @@
#include <memory>
namespace sd {
-TYPEINIT1( FuArea, FuPoor );
FuArea::FuArea( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, _pView, pDoc, rReq)
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index d8686f1e0e71..445e4e8a3bc4 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -52,7 +52,6 @@ const sal_Unicode CHAR_LRM = ((sal_Unicode)0x200E);
const sal_Unicode CHAR_ZWSP = ((sal_Unicode)0x200B);
const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060);
-TYPEINIT1( FuBullet, FuPoor );
FuBullet::FuBullet (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index d94754d9f351..c0131037786c 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -40,7 +40,6 @@
namespace sd {
-TYPEINIT1( FuChar, FuPoor );
FuChar::FuChar (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 715464bec13d..0c27ad0381c3 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -52,7 +52,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuConstruct3dObject, FuConstruct );
FuConstruct3dObject::FuConstruct3dObject (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index c491b4b1c62d..4ef597f659dd 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -45,7 +45,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuConstructArc, FuConstruct );
FuConstructArc::FuConstructArc (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index d5f7a374ba91..c0d8113bda33 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno;
namespace sd {
-TYPEINIT1( FuConstructBezierPolygon, FuConstruct );
FuConstructBezierPolygon::FuConstructBezierPolygon (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index e2fcf2b392e6..aff2aa73a701 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -68,7 +68,6 @@
namespace sd {
-TYPEINIT1( FuConstructCustomShape, FuConstruct );
FuConstructCustomShape::FuConstructCustomShape (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index 1b7fa4661a94..e2e7b51d83a7 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -29,7 +29,6 @@
namespace sd {
-TYPEINIT1( FuConnectionDlg, FuPoor );
FuConnectionDlg::FuConnectionDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 3454c86afa1f..5ad85e42d554 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -64,7 +64,6 @@
namespace sd {
-TYPEINIT1( FuConstructRectangle, FuConstruct );
FuConstructRectangle::FuConstructRectangle (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 71a356b46a41..cc433a3b370f 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -44,7 +44,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuConstruct, FuDraw );
FuConstruct::FuConstruct (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index cf7104d299ad..a9eedc6f00e7 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -41,7 +41,6 @@
namespace sd {
-TYPEINIT1( FuConstructUnoControl, FuConstruct );
FuConstructUnoControl::FuConstructUnoControl (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index b57421045fda..9e9276ba75f4 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -44,7 +44,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuCopy, FuPoor );
FuCopy::FuCopy (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index e30e864be45a..100a433f532d 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -35,7 +35,6 @@
namespace sd {
-TYPEINIT1( FuCustomShowDlg, FuPoor );
FuCustomShowDlg::FuCustomShowDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 41921ea7e07d..e467a2fda4dc 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -68,7 +68,6 @@ using namespace ::com::sun::star;
namespace sd {
-TYPEINIT1( FuDraw, FuPoor );
/**
* Base-class for all drawmodul-specific functions
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index 13bea87b2d3e..fb4fb7f8eb06 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -31,7 +31,6 @@
namespace sd {
-TYPEINIT1( FuDisplayOrder, FuPoor );
FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq)
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 28340fa8ccbf..24a85a7bdd27 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -36,7 +36,6 @@
namespace sd {
-TYPEINIT1( FuEditGluePoints, FuDraw );
FuEditGluePoints::FuEditGluePoints (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 96af35b7de46..17bb5e4700f5 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -47,7 +47,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuExpandPage, FuPoor );
FuExpandPage::FuExpandPage (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 10210e71fcea..c9e578de9bf2 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -45,7 +45,6 @@
namespace sd {
-TYPEINIT1( FuFormatPaintBrush, FuText );
FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
: FuText(pViewSh, pWin, pView, pDoc, rReq)
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 30215376371d..fa55949b149d 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -51,7 +51,6 @@ namespace sd {
class ViewShell;
-TYPEINIT1( FuHangulHanjaConversion, FuPoor );
FuHangulHanjaConversion::FuHangulHanjaConversion (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 5c7864357c1b..86634c8cf0b2 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -91,10 +91,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuInsertGraphic, FuPoor );
-TYPEINIT1( FuInsertClipboard, FuPoor );
-TYPEINIT1( FuInsertOLE, FuPoor );
-TYPEINIT1( FuInsertAVMedia, FuPoor );
FuInsertGraphic::FuInsertGraphic (
ViewShell* pViewSh,
@@ -764,7 +760,6 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
}
#if HAVE_FEATURE_GLTF
-TYPEINIT1( FuInsert3DModel, FuPoor );
FuInsert3DModel::FuInsert3DModel(
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 187691a0e1c6..b768b077d23c 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -107,7 +107,6 @@ void lcl_AddFilter ( ::std::vector< FilterDesc >& rFilterDescList,
namespace sd {
-TYPEINIT1( FuInsertFile, FuPoor );
FuInsertFile::FuInsertFile (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 6d24224576fc..21b19bf3fc97 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -40,7 +40,6 @@
namespace sd {
-TYPEINIT1( FuLine, FuPoor );
FuLine::FuLine (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 2db668052fbb..a92a97c65f44 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -36,7 +36,6 @@
namespace sd {
-TYPEINIT1( FuLineEnd, FuPoor );
FuLineEnd::FuLineEnd(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index 245004a24c26..f39d668a041e 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -35,7 +35,6 @@ class SfxRequest;
namespace sd {
-TYPEINIT1( FuLink, FuPoor );
FuLink::FuLink (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index 17f693714dda..73fef5805709 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -29,7 +29,6 @@
namespace sd {
-TYPEINIT1( FuMeasureDlg, FuPoor );
FuMeasureDlg::FuMeasureDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index c4a68b57ce0a..bede93a36388 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -51,7 +51,6 @@ using namespace com::sun::star;
namespace sd {
#define ITEMVALUE( ItemSet, Id, Cast ) ( static_cast<const Cast&>( (ItemSet).Get( (Id) ) ).GetValue() )
-TYPEINIT1( FuMorph, FuPoor );
FuMorph::FuMorph (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/funavig.cxx b/sd/source/ui/func/funavig.cxx
index a739109a6c95..7cd0be79a554 100644
--- a/sd/source/ui/func/funavig.cxx
+++ b/sd/source/ui/func/funavig.cxx
@@ -31,7 +31,6 @@
namespace sd {
-TYPEINIT1( FuNavigation, FuPoor );
FuNavigation::FuNavigation (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 6d2e16aa18aa..a7068b0bff56 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star;
namespace sd {
-TYPEINIT1( FuObjectAnimationParameters, FuPoor );
#define ATTR_MISSING 0 ///< Attribute missing
#define ATTR_MIXED 1 ///< Attribute ambiguous (on multi-selection)
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 4b9f1e5ef90b..9a38ee8db1b9 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -42,7 +42,6 @@
using namespace svx::sidebar;
namespace sd {
-TYPEINIT1( FuOutlineBullet, FuPoor );
FuOutlineBullet::FuOutlineBullet(ViewShell* pViewShell, ::sd::Window* pWindow,
::sd::View* pView, SdDrawDocument* pDoc,
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index ee94791407e4..79757080dc4e 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -81,7 +81,6 @@ static sal_uInt16 SidArray[] = {
SID_PARASPACE_DECREASE,
0 };
-TYPEINIT1( FuOutlineText, FuOutline );
FuOutlineText::FuOutlineText(ViewShell* pViewShell, ::sd::Window* pWindow,
::sd::View* pView, SdDrawDocument* pDoc,
diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx
index c9ba61135bba..61b3b3daee01 100644
--- a/sd/source/ui/func/fuoutl.cxx
+++ b/sd/source/ui/func/fuoutl.cxx
@@ -26,7 +26,6 @@
namespace sd {
-TYPEINIT1( FuOutline, FuPoor );
FuOutline::FuOutline (
ViewShell* pViewShell,
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index cee740ff54af..96a1ef37db05 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -81,7 +81,6 @@ namespace sd {
#define MAXHEIGHT 28350
#define MAXWIDTH 28350
-TYPEINIT1( FuPage, FuPoor );
void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource )
{
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index fcfc7edf192d..935a019b7716 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -38,7 +38,6 @@
namespace sd {
-TYPEINIT1( FuParagraph, FuPoor );
FuParagraph::FuParagraph (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 2dad9ac97b54..fb896ce082bb 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -60,7 +60,6 @@ using ::com::sun::star::uno::Reference;
namespace sd {
-TYPEINIT0( FuPoor );
FuPoor::FuPoor (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 609cba3b849b..674aa643d4f2 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -57,7 +57,6 @@
namespace sd
{
-TYPEINIT1( FuPresentationLayout, FuPoor );
#define DOCUMENT_TOKEN '#'
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 40e9df5a19ba..3ea851cca0e8 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -43,7 +43,6 @@
namespace sd {
-TYPEINIT1( FuPresentationObjects, FuPoor );
FuPresentationObjects::FuPresentationObjects (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 7300c14a9f3f..023660ad827e 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -43,7 +43,6 @@
namespace sd {
-TYPEINIT1( FuScale, FuPoor );
FuScale::FuScale (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index b7186a70866d..7dca8701cbd1 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -48,7 +48,6 @@ static sal_uInt16 SidArraySpell[] = {
SID_HANDOUTMODE,
0 };
-TYPEINIT1( FuSearch, FuPoor );
FuSearch::FuSearch (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index c163fb7f6217..ce591019959d 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -77,7 +77,6 @@ using namespace ::com::sun::star;
namespace sd {
-TYPEINIT1( FuSelection, FuDraw );
FuSelection::FuSelection (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 9609ee8c3546..f3c2f098de40 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -38,7 +38,6 @@ namespace sd {
#define ITEMVALUE(ItemSet,Id,Cast) static_cast<const Cast&>((ItemSet).Get(Id)).GetValue()
-TYPEINIT1( FuSlideShowDlg, FuPoor );
FuSlideShowDlg::FuSlideShowDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 667c3230ad57..84688cdb3d87 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -39,7 +39,6 @@
namespace sd {
-TYPEINIT1( FuSnapLine, FuPoor );
FuSnapLine::FuSnapLine(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq) :
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index c3c27fb8dc10..3100e0970d76 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star;
namespace sd {
-TYPEINIT1( FuSummaryPage, FuPoor );
FuSummaryPage::FuSummaryPage (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index c7c34095c412..50c942591af0 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -75,7 +75,6 @@ using namespace com::sun::star::style;
namespace sd
{
-TYPEINIT1( FuTemplate, FuPoor );
FuTemplate::FuTemplate (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index ae88b076689a..cb0e848bdab7 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -130,7 +130,6 @@ static sal_uInt16 SidArray[] = {
FN_NUM_BULLET_ON, // 20138
0 };
-TYPEINIT1( FuText, FuConstruct );
static bool bTestText = false;
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 41a7cbc373ea..f9680f0ad320 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -50,7 +50,6 @@ class SfxRequest;
namespace sd {
-TYPEINIT1( FuThesaurus, FuPoor );
FuThesaurus::FuThesaurus( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq )
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 560c3efb5436..a7a4164d6692 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -35,7 +35,6 @@
namespace sd {
-TYPEINIT1( FuTransform, FuPoor );
FuTransform::FuTransform(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index 792d49cd4ab1..7737a4bd833c 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -30,7 +30,6 @@
namespace sd {
-TYPEINIT1( FuTextAttrDlg, FuPoor );
FuTextAttrDlg::FuTextAttrDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index dee4a4d1d96b..f5f729805605 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -34,7 +34,6 @@
namespace sd
{
-TYPEINIT1( FuVectorize, FuPoor );
FuVectorize::FuVectorize (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index 782c32e5ab44..f0e7fa8a1de6 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -40,7 +40,6 @@ sal_uInt16 SidArrayZoom[] = {
SID_ZOOM_IN,
0 };
-TYPEINIT1( FuZoom, FuPoor );
FuZoom::FuZoom(
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx
index 7e6a17b51371..19ec5a7689cb 100644
--- a/sd/source/ui/func/sdundo.cxx
+++ b/sd/source/ui/func/sdundo.cxx
@@ -19,6 +19,5 @@
#include "sdundo.hxx"
-TYPEINIT1(SdUndoAction, SfxUndoAction);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx
index 0c012205eed1..963e7ddc1150 100644
--- a/sd/source/ui/func/sdundogr.cxx
+++ b/sd/source/ui/func/sdundogr.cxx
@@ -19,7 +19,6 @@
#include "sdundogr.hxx"
-TYPEINIT1(SdUndoGroup, SdUndoAction);
SdUndoGroup::~SdUndoGroup()
{
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index bfb421bdad9d..126101fba2be 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -23,7 +23,6 @@
#include "strings.hrc"
#include <svl/itemset.hxx>
-TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction );
SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
SdDrawDocument& rDoc,
diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx
index 7533ce194056..ea29e91c3d62 100644
--- a/sd/source/ui/func/undoheaderfooter.cxx
+++ b/sd/source/ui/func/undoheaderfooter.cxx
@@ -25,7 +25,6 @@
#include "drawview.hxx"
#include "undoheaderfooter.hxx"
-TYPEINIT1(SdHeaderFooterUndoAction, SdUndoAction);
SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings )
: SdUndoAction(pDoc),
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index f852c48c1804..0b17185bfa22 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -25,7 +25,6 @@
#include "strings.hrc"
#include "sdresid.hxx"
-TYPEINIT1(SdLayerModifyUndoAction, SdUndoAction);
SdLayerModifyUndoAction::SdLayerModifyUndoAction(
SdDrawDocument* _pDoc, SdrLayer* pLayer,
diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx
index 3f3401bf20bd..571dac181e70 100644
--- a/sd/source/ui/func/undopage.cxx
+++ b/sd/source/ui/func/undopage.cxx
@@ -29,9 +29,6 @@
#include "drawview.hxx"
#include <svx/svdpagv.hxx>
-TYPEINIT1(SdPageFormatUndoAction, SdUndoAction);
-TYPEINIT1(SdPageLRUndoAction, SdUndoAction);
-TYPEINIT1(SdPageULUndoAction, SdUndoAction);
SdPageFormatUndoAction::~SdPageFormatUndoAction()
{
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index 6af2c2d017c1..9b64fe909554 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -21,7 +21,6 @@
#include "unoaprms.hxx"
#include "anminfo.hxx"
-TYPEINIT1(SdAnimationPrmsUndoAction, SdUndoAction);
void SdAnimationPrmsUndoAction::Undo()
{
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index edfdaac825af..0e9c122d74d0 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -24,7 +24,6 @@
#include "drawdoc.hxx"
#include "sdresid.hxx"
-TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction);
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
SdDrawDocument* pTheDoc,
diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx
index 07ca754c170c..b81ea4a90d8e 100644
--- a/sd/source/ui/inc/BezierObjectBar.hxx
+++ b/sd/source/ui/inc/BezierObjectBar.hxx
@@ -33,7 +33,6 @@ class BezierObjectBar
: public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR)
private:
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 70566b6fefbd..9bc0646453eb 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -49,7 +49,6 @@ class DrawViewShell;
class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL)
SFX_DECL_OBJECTFACTORY();
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index db77fc5aa5cb..d652d238e7e5 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -68,7 +68,6 @@ class DrawViewShell
public SfxListener
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDDRAWVIEWSHELL)
private:
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index b11f3c427547..f98efa1564dd 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -36,7 +36,6 @@ class GraphicDocShell
: public DrawDocShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDGRAPHICDOCSHELL)
private:
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index e0847c8bc6ae..cee27ab5bc57 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -33,7 +33,6 @@ class GraphicObjectBar
: public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR )
private:
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index 5e3740ab40fb..c1c0e326b3c0 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -39,7 +39,6 @@ class GraphicViewShell
: public DrawViewShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(GraphicViewShell);
SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL)
diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx
index 637c0c08949d..f94ade5b3fd0 100644
--- a/sd/source/ui/inc/GraphicViewShellBase.hxx
+++ b/sd/source/ui/inc/GraphicViewShellBase.hxx
@@ -31,7 +31,6 @@ class GraphicViewShellBase
: public ViewShellBase
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(GraphicViewShellBase);
/** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx
index 4471c5daf58a..1725834d3685 100644
--- a/sd/source/ui/inc/ImpressViewShellBase.hxx
+++ b/sd/source/ui/inc/ImpressViewShellBase.hxx
@@ -31,7 +31,6 @@ class ImpressViewShellBase
: public ViewShellBase
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(ImpressViewShellBase);
/** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index 47aea20a7366..cf6395ce46a6 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -33,7 +33,6 @@ class MediaObjectBar
: public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR )
private:
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 37f5a9e3765e..311360c51793 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -70,7 +70,6 @@ public:
void ConnectToApplication();
void DisconnectFromApplication();
- TYPEINFO_OVERRIDE();
static SdrTextObj* GetTitleTextObject(SdrPage* pPage);
static SdrTextObj* GetOutlineTextObject(SdrPage* pPage);
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index a2c666df6cde..2a7b8a5773c1 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -36,7 +36,6 @@ class OutlineViewShell
: public ViewShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(OutlineViewShell);
SFX_DECL_INTERFACE(SD_IF_SDOUTLINEVIEWSHELL)
diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx
index 68bfb33963bf..43b04a3332cd 100644
--- a/sd/source/ui/inc/OutlineViewShellBase.hxx
+++ b/sd/source/ui/inc/OutlineViewShellBase.hxx
@@ -31,7 +31,6 @@ class OutlineViewShellBase
: public ImpressViewShellBase
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(OutlineViewShellBase);
/** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx
index 7447159602c4..80d66bf934a3 100644
--- a/sd/source/ui/inc/PaneShells.hxx
+++ b/sd/source/ui/inc/PaneShells.hxx
@@ -33,7 +33,6 @@ class LeftImpressPaneShell
: public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDLEFTIMPRESSPANESHELL)
private:
@@ -52,7 +51,6 @@ class LeftDrawPaneShell
: public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDLEFTDRAWPANESHELL)
private:
@@ -70,7 +68,6 @@ public:
class ToolPanelPaneShell : public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL )
public:
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index 39c7ecc029a7..cd414dc0911e 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -30,7 +30,6 @@ namespace sd {
class PresentationViewShell : public DrawViewShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL )
diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx
index 438f801b818e..66a8ad4e0564 100644
--- a/sd/source/ui/inc/PresentationViewShellBase.hxx
+++ b/sd/source/ui/inc/PresentationViewShellBase.hxx
@@ -31,7 +31,6 @@ class PresentationViewShellBase
: public ViewShellBase
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(PresentationViewShellBase);
/** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 4a81623f00f3..c0b8e8008bd5 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -41,7 +41,6 @@ class SlideSorterViewShell
friend class controller::SlotManager;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL)
private:
diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx
index 4c78ca9abfa7..b5914ddcce54 100644
--- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx
@@ -31,7 +31,6 @@ class SlideSorterViewShellBase
: public ImpressViewShellBase
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_VIEWFACTORY(SlideSorterViewShellBase);
/** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx
index 026f664995e2..1475782597f7 100644
--- a/sd/source/ui/inc/TextObjectBar.hxx
+++ b/sd/source/ui/inc/TextObjectBar.hxx
@@ -35,7 +35,6 @@ class TextObjectBar
: public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR)
private:
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index c2f966fe9e4c..a870c39e3158 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -85,7 +85,6 @@ public:
class View : public FmFormView
{
public:
- TYPEINFO_OVERRIDE();
View (
SdDrawDocument& rDrawDoc,
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index e01f558408b0..c534b2fc52a0 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -108,7 +108,6 @@ public:
static const int MAX_VSPLIT_CNT = 1;
static const int MIN_SCROLLBAR_SIZE = 50;
- TYPEINFO_OVERRIDE();
ViewShell (
SfxViewFrame *pFrame,
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 1bb2395b221e..d0271d50c011 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -62,7 +62,6 @@ class ViewShellBase
: public SfxViewShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE)
private:
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 9dde2280c456..218443cf6104 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -33,7 +33,6 @@ class DrawViewShell;
class DrawView : public ::sd::View
{
public:
- TYPEINFO_OVERRIDE();
DrawView (
DrawDocShell* pDocSh,
diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx
index 386a749302eb..e437ffea7ecc 100644
--- a/sd/source/ui/inc/fuarea.hxx
+++ b/sd/source/ui/inc/fuarea.hxx
@@ -27,7 +27,6 @@ namespace sd {
class FuArea : public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx
index acf2ffb2e893..55672cd669b3 100644
--- a/sd/source/ui/inc/fubullet.hxx
+++ b/sd/source/ui/inc/fubullet.hxx
@@ -32,7 +32,6 @@ class ViewShell;
class FuBullet : public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx
index 791f37d6311d..7c8a413b085f 100644
--- a/sd/source/ui/inc/fuchar.hxx
+++ b/sd/source/ui/inc/fuchar.hxx
@@ -28,7 +28,6 @@ class FuChar
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx
index 4904d36fe9db..5c7acb0b8f10 100644
--- a/sd/source/ui/inc/fucon3d.hxx
+++ b/sd/source/ui/inc/fucon3d.hxx
@@ -33,7 +33,6 @@ class FuConstruct3dObject
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx
index e2df388a89ed..aae040205a9c 100644
--- a/sd/source/ui/inc/fuconarc.hxx
+++ b/sd/source/ui/inc/fuconarc.hxx
@@ -28,7 +28,6 @@ class FuConstructArc
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index b2ba189aefc5..0684f7d6daf1 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -31,7 +31,6 @@ class FuConstructBezierPolygon
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index fa35de1234f0..c8609faad49d 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -32,7 +32,6 @@ class FuConstructCustomShape
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx
index 33603064ea32..a26f444cf0b1 100644
--- a/sd/source/ui/inc/fuconnct.hxx
+++ b/sd/source/ui/inc/fuconnct.hxx
@@ -28,7 +28,6 @@ class FuConnectionDlg
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx
index ca307c630892..05026ea1726f 100644
--- a/sd/source/ui/inc/fuconrec.hxx
+++ b/sd/source/ui/inc/fuconrec.hxx
@@ -36,7 +36,6 @@ class FuConstructRectangle
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index 16aed369f019..b50e31f31a01 100644
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -32,7 +32,6 @@ class FuConstruct
: public FuDraw
{
public:
- TYPEINFO_OVERRIDE();
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index 840780106f38..142ee5f9e984 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -32,7 +32,6 @@ class FuConstructUnoControl
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx
index f417960d8e2d..a36f89fd821c 100644
--- a/sd/source/ui/inc/fucopy.hxx
+++ b/sd/source/ui/inc/fucopy.hxx
@@ -28,7 +28,6 @@ class FuCopy
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx
index adf6ea1be592..ac3f74802dc9 100644
--- a/sd/source/ui/inc/fucushow.hxx
+++ b/sd/source/ui/inc/fucushow.hxx
@@ -28,7 +28,6 @@ class FuCustomShowDlg
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index cf7f0611ee8b..b315e0bce27b 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -35,7 +35,6 @@ class FuDraw
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual bool KeyInput(const KeyEvent& rKEvt) override;
virtual bool MouseMove(const MouseEvent& rMEvt) override;
diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx
index eb7fc9f68347..24d61cafe26e 100644
--- a/sd/source/ui/inc/fudspord.hxx
+++ b/sd/source/ui/inc/fudspord.hxx
@@ -32,7 +32,6 @@ class FuDisplayOrder
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 17e21dea69ac..97f678eeb09c 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -28,7 +28,6 @@ class FuEditGluePoints
: public FuDraw
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx
index d7ca295a51b4..7552926ed6cd 100644
--- a/sd/source/ui/inc/fuexpand.hxx
+++ b/sd/source/ui/inc/fuexpand.hxx
@@ -28,7 +28,6 @@ class FuExpandPage
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx
index 6adcc27bdf54..f5221910440d 100644
--- a/sd/source/ui/inc/fuformatpaintbrush.hxx
+++ b/sd/source/ui/inc/fuformatpaintbrush.hxx
@@ -32,7 +32,6 @@ class DrawViewShell;
class FuFormatPaintBrush : public FuText
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx
index 015116744ccd..38daed572a00 100644
--- a/sd/source/ui/inc/fuhhconv.hxx
+++ b/sd/source/ui/inc/fuhhconv.hxx
@@ -29,7 +29,6 @@ class Outliner;
class FuHangulHanjaConversion : public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx
index ecfb29669b08..74e251a138c8 100644
--- a/sd/source/ui/inc/fuinsert.hxx
+++ b/sd/source/ui/inc/fuinsert.hxx
@@ -29,7 +29,6 @@ class FuInsertGraphic
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -50,7 +49,6 @@ class FuInsertClipboard
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -70,7 +68,6 @@ class FuInsertOLE
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -90,7 +87,6 @@ class FuInsertAVMedia
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -108,7 +104,6 @@ class FuInsert3DModel
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx
index e8eac8d19933..a15d612b5c1d 100644
--- a/sd/source/ui/inc/fuinsfil.hxx
+++ b/sd/source/ui/inc/fuinsfil.hxx
@@ -32,7 +32,6 @@ class FuInsertFile
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx
index 973590692bdf..b8f763c86e5d 100644
--- a/sd/source/ui/inc/fuline.hxx
+++ b/sd/source/ui/inc/fuline.hxx
@@ -28,7 +28,6 @@ class FuLine
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual void Activate() override;
virtual void Deactivate() override;
diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx
index cb968c92a4d5..71e14625ce2e 100644
--- a/sd/source/ui/inc/fulinend.hxx
+++ b/sd/source/ui/inc/fulinend.hxx
@@ -28,7 +28,6 @@ class FuLineEnd
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual void Activate() override;
virtual void Deactivate() override;
diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx
index 7516c4313e20..38a339009c7e 100644
--- a/sd/source/ui/inc/fulink.hxx
+++ b/sd/source/ui/inc/fulink.hxx
@@ -28,7 +28,6 @@ class FuLink
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx
index fc875dbf36d0..388a4bc874b4 100644
--- a/sd/source/ui/inc/fumeasur.hxx
+++ b/sd/source/ui/inc/fumeasur.hxx
@@ -28,7 +28,6 @@ class FuMeasureDlg
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx
index 60487135a41c..24890a7bb0a4 100644
--- a/sd/source/ui/inc/fumorph.hxx
+++ b/sd/source/ui/inc/fumorph.hxx
@@ -37,7 +37,6 @@ class FuMorph
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/funavig.hxx b/sd/source/ui/inc/funavig.hxx
index ce0b7fef6498..3f5449f72bda 100644
--- a/sd/source/ui/inc/funavig.hxx
+++ b/sd/source/ui/inc/funavig.hxx
@@ -28,7 +28,6 @@ class FuNavigation
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx
index 210eedbc1f1d..221aa3da7e7c 100644
--- a/sd/source/ui/inc/fuoaprms.hxx
+++ b/sd/source/ui/inc/fuoaprms.hxx
@@ -28,7 +28,6 @@ class FuObjectAnimationParameters
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx
index 8dccae45d7b6..383cd2d412ab 100644
--- a/sd/source/ui/inc/fuolbull.hxx
+++ b/sd/source/ui/inc/fuolbull.hxx
@@ -39,7 +39,6 @@ class FuOutlineBullet
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx
index 8ee54a719c19..4be5a1c14fe3 100644
--- a/sd/source/ui/inc/fuoltext.hxx
+++ b/sd/source/ui/inc/fuoltext.hxx
@@ -39,7 +39,6 @@ class FuOutlineText
: public FuOutline
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx
index 16243da28d58..d4cae3b4c0e1 100644
--- a/sd/source/ui/inc/fuoutl.hxx
+++ b/sd/source/ui/inc/fuoutl.hxx
@@ -39,7 +39,6 @@ class FuOutline
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual bool Command(const CommandEvent& rCEvt) override;
diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx
index 69fd982bcc0a..059d2a70da7e 100644
--- a/sd/source/ui/inc/fupage.hxx
+++ b/sd/source/ui/inc/fupage.hxx
@@ -33,7 +33,6 @@ class FuPage
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx
index 3742962b045e..360ee3888e2a 100644
--- a/sd/source/ui/inc/fuparagr.hxx
+++ b/sd/source/ui/inc/fuparagr.hxx
@@ -28,7 +28,6 @@ class FuParagraph
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual void Activate() override;
virtual void Deactivate() override;
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index 34153b4b8a01..41da005bf6d3 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_FUPOOR_HXX
#define INCLUDED_SD_SOURCE_UI_INC_FUPOOR_HXX
-#include <tools/rtti.hxx>
#include <vcl/timer.hxx>
#include <tools/link.hxx>
#include <tools/gen.hxx>
@@ -52,7 +51,6 @@ public:
static const int DRGPIX = 2; // Drag MinMove in Pixel
static const int DRGLOG = 53; // Minimal drag move in mm100
- TYPEINFO();
virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx
index 68101f2f0f33..8f53e069203e 100644
--- a/sd/source/ui/inc/fuprlout.hxx
+++ b/sd/source/ui/inc/fuprlout.hxx
@@ -34,7 +34,6 @@ class FuPresentationLayout
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx
index d1819e646ec7..34f85ffc6f48 100644
--- a/sd/source/ui/inc/fuprobjs.hxx
+++ b/sd/source/ui/inc/fuprobjs.hxx
@@ -34,7 +34,6 @@ class FuPresentationObjects
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx
index 694c5ebb4fef..554959c09210 100644
--- a/sd/source/ui/inc/fuscale.hxx
+++ b/sd/source/ui/inc/fuscale.hxx
@@ -28,7 +28,6 @@ class FuScale
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx
index 5c0376240e1d..eae95979f413 100644
--- a/sd/source/ui/inc/fusearch.hxx
+++ b/sd/source/ui/inc/fusearch.hxx
@@ -31,7 +31,6 @@ class Outliner;
class FuSearch : public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 867932c97d87..034bfa9ccc6e 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -33,7 +33,6 @@ class FuSelection
: public FuDraw
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx
index 40d64c058855..70a4636640ec 100644
--- a/sd/source/ui/inc/fusldlg.hxx
+++ b/sd/source/ui/inc/fusldlg.hxx
@@ -28,7 +28,6 @@ class FuSlideShowDlg
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx
index 40dc5a00fe43..0d2413faa8db 100644
--- a/sd/source/ui/inc/fusnapln.hxx
+++ b/sd/source/ui/inc/fusnapln.hxx
@@ -28,7 +28,6 @@ class FuSnapLine
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual void Activate() override;
virtual void Deactivate() override;
diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx
index 1bb6008e4289..0be6d73c9f1c 100644
--- a/sd/source/ui/inc/fusumry.hxx
+++ b/sd/source/ui/inc/fusumry.hxx
@@ -28,7 +28,6 @@ class FuSummaryPage
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx
index 484f7f2aaa88..0db34459e4dc 100644
--- a/sd/source/ui/inc/futempl.hxx
+++ b/sd/source/ui/inc/futempl.hxx
@@ -28,7 +28,6 @@ class FuTemplate
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
virtual void Activate() override;
virtual void Deactivate() override;
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index f6d3145402a3..1cb4900e7e94 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -38,7 +38,6 @@ class FuText
: public FuConstruct
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx
index 5c8822af2b2f..18d115cb7449 100644
--- a/sd/source/ui/inc/futhes.hxx
+++ b/sd/source/ui/inc/futhes.hxx
@@ -28,7 +28,6 @@ class FuThesaurus
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx
index c818a8588951..4484ade0c961 100644
--- a/sd/source/ui/inc/futransf.hxx
+++ b/sd/source/ui/inc/futransf.hxx
@@ -29,7 +29,6 @@ class FuTransform
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx
index 3a7fc02031f1..55620dc1fdf3 100644
--- a/sd/source/ui/inc/futxtatt.hxx
+++ b/sd/source/ui/inc/futxtatt.hxx
@@ -28,7 +28,6 @@ class FuTextAttrDlg
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx
index ae718350a726..5aa2b029ec8e 100644
--- a/sd/source/ui/inc/fuvect.hxx
+++ b/sd/source/ui/inc/fuvect.hxx
@@ -28,7 +28,6 @@ class FuVectorize
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx
index 7fa2adcde847..887ee7c05c41 100644
--- a/sd/source/ui/inc/fuzoom.hxx
+++ b/sd/source/ui/inc/fuzoom.hxx
@@ -31,7 +31,6 @@ class FuZoom
: public FuPoor
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx
index f1c4368707f3..131c1a5038d1 100644
--- a/sd/source/ui/inc/sdundogr.hxx
+++ b/sd/source/ui/inc/sdundogr.hxx
@@ -30,7 +30,6 @@ class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction
{
std::vector<SdUndoAction*> aCtn;
public:
- TYPEINFO_OVERRIDE();
SdUndoGroup(SdDrawDocument* pSdDrawDocument)
: SdUndoAction(pSdDrawDocument),
aCtn() {}
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 923046dcfba1..46c0343f9aca 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -54,7 +54,6 @@ class ToolPanelViewShell
: public ViewShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL)
public:
diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx
index 41931a2c55d2..88b9e33d37b8 100644
--- a/sd/source/ui/inc/unchss.hxx
+++ b/sd/source/ui/inc/unchss.hxx
@@ -35,7 +35,6 @@ class StyleSheetUndoAction : public SdUndoAction
OUString aComment;
public:
- TYPEINFO_OVERRIDE();
StyleSheetUndoAction(SdDrawDocument* pTheDoc,
SfxStyleSheet* pTheStyleSheet,
const SfxItemSet* pTheNewItemSet);
diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx
index 1104c79ce532..3b1553b4d239 100644
--- a/sd/source/ui/inc/undoback.hxx
+++ b/sd/source/ui/inc/undoback.hxx
@@ -38,7 +38,6 @@ private:
public:
- TYPEINFO_OVERRIDE();
SdBackgroundObjUndoAction(
SdDrawDocument& rDoc,
diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx
index dda019d25d36..020cf667ccc4 100644
--- a/sd/source/ui/inc/undoheaderfooter.hxx
+++ b/sd/source/ui/inc/undoheaderfooter.hxx
@@ -36,7 +36,6 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction
const sd::HeaderFooterSettings maNewSettings;
public:
- TYPEINFO_OVERRIDE();
SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings );
virtual ~SdHeaderFooterUndoAction();
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index 61f9bc6c8e73..4fc3749b731e 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -31,7 +31,6 @@ class SdLayerModifyUndoAction : public SdUndoAction
{
public:
- TYPEINFO_OVERRIDE();
SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer,
const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx
index 8c433b5d601a..4c84297c44b9 100644
--- a/sd/source/ui/inc/undopage.hxx
+++ b/sd/source/ui/inc/undopage.hxx
@@ -54,7 +54,6 @@ class SdPageFormatUndoAction : public SdUndoAction
bool mbNewFullSize;
public:
- TYPEINFO_OVERRIDE();
SdPageFormatUndoAction( SdDrawDocument* pDoc,
SdPage* pThePage,
const Size& rOldSz,
@@ -116,7 +115,6 @@ class SdPageLRUndoAction : public SdUndoAction
sal_Int32 mnNewRight;
public:
- TYPEINFO_OVERRIDE();
SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage,
sal_Int32 nOldLft, sal_Int32 nOldRgt,
sal_Int32 nNewLft, sal_Int32 nNewRgt ) :
@@ -145,7 +143,6 @@ class SdPageULUndoAction : public SdUndoAction
sal_Int32 mnNewLower;
public:
- TYPEINFO_OVERRIDE();
SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage,
sal_Int32 nOldUpr, sal_Int32 nOldLwr,
sal_Int32 nNewUpr, sal_Int32 nNewLwr ) :
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 5d2286832cc6..de6e4a17e40d 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -41,7 +41,6 @@ class ModifyPageUndoAction : public SdUndoAction
OUString maComment;
public:
- TYPEINFO_OVERRIDE();
ModifyPageUndoAction(
SdDrawDocument* pTheDoc,
SdPage* pThePage,
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index a53684b780d2..3b22345d6bcc 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -75,7 +75,6 @@ class SdAnimationPrmsUndoAction : public SdUndoAction
bool bInfoCreated;
public:
- TYPEINFO_OVERRIDE();
SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj,
bool bCreated)
: SdUndoAction(pTheDoc)
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index 0e7030d2f887..67496a929528 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -37,7 +37,6 @@ class SdPresentationLayoutUndoAction : public SdUndoAction
OUString aComment;
public:
- TYPEINFO_OVERRIDE();
SdPresentationLayoutUndoAction(SdDrawDocument* pTheDoc,
const OUString& aTheOldLayoutName,
const OUString& aTheNewLayoutName,
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 9331f98de176..97582146ed61 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -311,7 +311,6 @@ private:
//===== SelectionFunction =====================================================
-TYPEINIT1(SelectionFunction, FuPoor);
SelectionFunction::SelectionFunction (
SlideSorter& rSlideSorter,
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index c4c7afb8e5e3..9b7af9b6d1a3 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -41,7 +41,6 @@ class SelectionFunction
private ::boost::noncopyable
{
public:
- TYPEINFO_OVERRIDE();
static rtl::Reference<FuPoor> Create( SlideSorter& rSlideSorter, SfxRequest& rRequest );
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 8c26f12c968f..a17f255be042 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -64,7 +64,6 @@ class SlideSorterView
public ::boost::noncopyable
{
public:
- TYPEINFO_OVERRIDE();
/** Create a new view for the slide sorter.
@param rViewShell
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 32becf587f21..a77a630b4951 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -88,7 +88,6 @@ void SlideSorterViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
}
-TYPEINIT1(SlideSorterViewShell, ViewShell);
std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
SfxViewFrame* pFrame,
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 1c791e990eff..489370eff877 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -126,7 +126,6 @@ private:
Color maBackgroundColor;
};
-TYPEINIT1(SlideSorterView, ::sd::View);
SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter)
: ::sd::View (
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 8a5c70bef316..75ac9109e38a 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -74,7 +74,6 @@ void RegisterInterfaces(SfxModule* pMod)
// - TableObjectBar -
-TYPEINIT1( TableObjectBar, SfxShell );
SFX_IMPL_INTERFACE(TableObjectBar, SfxShell)
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 2fd290ae9383..7ef0f9cbd43e 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -36,7 +36,6 @@ namespace sd { namespace ui { namespace table {
class TableObjectBar : public SfxShell
{
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SD_IF_SDDRAWTABLEOBJECTBAR )
private:
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 6e20c21a04be..de78cf2d4cfd 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -60,7 +60,6 @@ void GraphicObjectBar::InitInterface_Impl()
{
}
-TYPEINIT1( GraphicObjectBar, SfxShell );
GraphicObjectBar::GraphicObjectBar (
ViewShell* pSdViewShell,
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 6a4b8b50c8f2..7157a04c852d 100644
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -31,7 +31,6 @@
namespace sd {
-TYPEINIT1(GraphicViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new GraphicViewShellBase object has been constructed.
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 5b10a9206277..e74440f08010 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -32,7 +32,6 @@
namespace sd {
-TYPEINIT1(ImpressViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new ImpressViewShellBase object has been constructed.
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 3e028c9c6797..46a11572163f 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -50,7 +50,6 @@ namespace sd {
// - MediaObjectBar -
-TYPEINIT1( MediaObjectBar, SfxShell );
SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell)
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index 625de08c2de6..8b8bd9a69bac 100644
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -29,7 +29,6 @@ namespace sd {
class DrawDocShell;
-TYPEINIT1(OutlineViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new OutlineViewShellBase object has been constructed.
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index ab051722cad3..dc52424e9d52 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -36,7 +36,6 @@ namespace sd {
class DrawDocShell;
-TYPEINIT1(PresentationViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new PresentationViewShellBase object has been constructed.
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 21a26baf0163..16842043fa58 100644
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -29,7 +29,6 @@ namespace sd {
class DrawDocShell;
-TYPEINIT1(SlideSorterViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new SlideSorterViewShellBase object has been constructed.
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 6cc54d5746b1..3436e3d8e2e1 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -216,7 +216,6 @@ private:
//===== ViewShellBase =========================================================
-TYPEINIT1(ViewShellBase, SfxViewShell);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new ViewShellBase object has been constructed.
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 8fc4277bf7e9..4343113ddcc8 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -72,7 +72,6 @@ using namespace ::com::sun::star;
namespace sd {
-TYPEINIT1(DrawView, View);
/**
* Shows the first page of document at position 0,0. In the case
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 543a674a7870..31b7a871fd90 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -60,7 +60,6 @@ void BezierObjectBar::InitInterface_Impl()
{
}
-TYPEINIT1(BezierObjectBar, ::SfxShell);
BezierObjectBar::BezierObjectBar(
ViewShell* pSdViewShell,
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 29c1ef3d21bd..52c7ffcbb09f 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -82,7 +82,6 @@ void TextObjectBar::InitInterface_Impl()
{
}
-TYPEINIT1( TextObjectBar, SfxShell );
TextObjectBar::TextObjectBar (
ViewShell* pSdViewSh,
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 0ac29d473859..bf4f097bb55a 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -80,7 +80,6 @@ void DrawViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
}
-TYPEINIT1( DrawViewShell, ViewShell );
// SdGraphicViewShell
SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell)
@@ -104,7 +103,6 @@ void GraphicViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
}
-TYPEINIT1( GraphicViewShell, DrawViewShell );
} // end of namespace sd
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 000bef80181a..bacfa42515ae 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -124,7 +124,6 @@ void OutlineViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
}
-TYPEINIT1( OutlineViewShell, ViewShell );
/**
* common initialization part of both constructors
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 5e923c944665..da72fcb8ad31 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -85,7 +85,6 @@ struct SdParaAndPos
// - OutlineView -
-TYPEINIT1( OutlineView, ::sd::View );
OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineViewShell& rOutlineViewShell)
: ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell)
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 05cb11dcb176..f96fad57f419 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -74,7 +74,6 @@ void PresentationViewShell::InitInterface_Impl()
RID_DRAW_COMMONTASK_TOOLBOX);
}
-TYPEINIT1( PresentationViewShell, DrawViewShell );
PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView)
: DrawViewShell( pFrame, rViewShellBase, pParentWindow, PK_STANDARD, pFrameView)
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 463a90c7d16f..a7576d01a7aa 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -101,7 +101,6 @@ using namespace com::sun::star::uno;
using namespace sdr::table;
namespace sd {
-TYPEINIT1(View, FmFormView);
View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
ViewShell* pViewShell)
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index abe3d73e0bae..5abb98a33fc1 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -31,7 +31,6 @@
#include "sdresid.hxx"
#include "drawdoc.hxx"
-TYPEINIT1(ModifyPageUndoAction, SdUndoAction);
ModifyPageUndoAction::ModifyPageUndoAction(
SdDrawDocument* pTheDoc,
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 2ca39fcd8a3a..a3e92b00f8cd 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -133,7 +133,6 @@ SfxViewFrame* ViewShell::GetViewFrame() const
}
/// declare SFX-Slotmap and standard interface
-TYPEINIT1(ViewShell, SfxShell);
ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter)
: SfxShell(&rViewShellBase)
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index a1876f804919..30f8c8db141f 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -691,7 +691,6 @@
#include <tools/rc.hxx>
#include <tools/rcid.h>
#include <tools/resary.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <tools/svborder.hxx>
#include <tools/tenccvt.hxx>
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 5adcbc8d3a25..69c833ea9ab6 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -29,7 +29,7 @@ private:
OUString aLanguage;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxScriptOrganizerItem();
SfxScriptOrganizerItem( const SfxScriptOrganizerItem& );
virtual ~SfxScriptOrganizerItem();
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index e2dab3835bec..ed854b65d672 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -42,7 +42,6 @@
#include <sfx2/docfile.hxx>
#include "workwin.hxx"
-TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
SfxFilterMatcher& SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 66f1290a5afd..e5466533f3ac 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno;
namespace sfx2
{
-TYPEINIT0( SvLinkSource )
class SvLinkSourceTimer : public Timer
{
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 63b3a73291f5..c6e37810637e 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno;
namespace sfx2
{
-TYPEINIT0( SvBaseLink )
class ImplDdeItem;
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index e226227ef448..99e702370662 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -132,7 +132,6 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig )
return rpList; }
-TYPEINIT1(SfxModule, SfxShell);
SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell)
diff --git a/sfx2/source/bastyp/dummytypes.cxx b/sfx2/source/bastyp/dummytypes.cxx
index e1ae0ad996cc..2955172ecaf1 100644
--- a/sfx2/source/bastyp/dummytypes.cxx
+++ b/sfx2/source/bastyp/dummytypes.cxx
@@ -8,7 +8,6 @@
#include <config_features.h>
-#include <tools/rtti.hxx>
#include <avmedia/mediaitem.hxx>
#if !HAVE_FEATURE_AVMEDIA
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 247ee3c17841..19b3829b98e2 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/uno/Reference.hxx>
-TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
using namespace com::sun::star;
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index 8fd65376b8da..a0d2458ecb1e 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -21,7 +21,7 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(SfxMacroInfoItem, SfxPoolItem);
+SfxPoolItem* SfxMacroInfoItem::CreateDefault() { DBG_ASSERT(false, "No SfxMacroInfItem factory available"); return 0; }
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 590b3bb1c4cb..574182c3cc98 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -29,7 +29,7 @@ SfxSlotKind SfxSlot::GetKind() const
return (SfxSlotKind) SFX_KIND_STANDARD;
if ( nMasterSlotId && fnExec==nullptr && fnState==nullptr )
{
- if ( pType->Type() == TYPE(SfxBoolItem) )
+ if ( *pType->pType == typeid(SfxBoolItem) )
return (SfxSlotKind) SFX_KIND_ENUM;
else
{
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 41524a8ad6d3..eafca7394d5e 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -95,7 +95,7 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
-TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
+const std::type_info* SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
{
const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId );
return pSlot ? pSlot->GetType()->Type() : nullptr;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 0e091441358a..17550aeeca7a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -51,7 +51,6 @@
// Maps the Which() field to a pointer to a SfxPoolItem
typedef boost::ptr_map<sal_uInt16, SfxPoolItem> SfxItemPtrMap;
-TYPEINIT0(SfxShell);
using namespace com::sun::star;
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 16e7bdccd463..8a202314decc 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -21,11 +21,11 @@
#include <sfx2/sfxsids.hrc>
#include "sorgitm.hxx"
#include <osl/diagnose.h>
-
+#include <typeinfo>
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1_AUTOFACTORY(SfxScriptOrganizerItem, SfxStringItem);
+SfxPoolItem* SfxScriptOrganizerItem::CreateDefault() { return new SfxScriptOrganizerItem; }
SfxScriptOrganizerItem::SfxScriptOrganizerItem() :
@@ -63,7 +63,7 @@ SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const
bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const
{
- return rItem.Type() == Type() &&
+ return typeid(rItem) == typeid(*this) &&
SfxStringItem::operator==(rItem) &&
aLanguage == static_cast<const SfxScriptOrganizerItem &>(rItem).aLanguage;
}
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index e41992aa5b8e..7a47fb645a83 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -412,7 +412,7 @@ void SfxStateCache::SetState_Impl
!IsInvalidItem(pState) && !IsInvalidItem(pLastItem);
DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" );
if ( bBothAvailable )
- bNotify = pState->Type() != pLastItem->Type() ||
+ bNotify = typeid(*pState) != typeid(*pLastItem) ||
*pState != *pLastItem;
else
bNotify = ( pState != pLastItem ) || ( eState != eLastState );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index ec301c7b1d3e..cb3050a93faf 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -968,7 +968,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
{
if (pLastState && !IsInvalidItem(pLastState))
{
- bNotify = pState->Type() != pLastState->Type() || *pState != *pLastState;
+ bNotify = typeid(*pState) != typeid(*pLastState) || *pState != *pLastState;
delete pLastState;
}
pLastState = !IsInvalidItem(pState) ? pState->Clone() : pState;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 8209bd458607..fb9fddcfe300 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -104,7 +104,8 @@ bool operator==(const util::DateTime &i_rLeft, const util::DateTime &i_rRight)
}
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
+
+SfxPoolItem* SfxDocumentInfoItem::CreateDefault() { return new SfxDocumentInfoItem; }
const sal_uInt16 HI_NAME = 1;
const sal_uInt16 HI_TYPE = 2;
@@ -327,7 +328,7 @@ SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
{
- if (!(rItem.Type() == Type() && SfxStringItem::operator==(rItem)))
+ if (!(typeid(rItem) == typeid(*this) && SfxStringItem::operator==(rItem)))
return false;
const SfxDocumentInfoItem& rInfoItem(static_cast<const SfxDocumentInfoItem&>(rItem));
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b2575dae91be..10464439f4fa 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -44,7 +44,6 @@ using namespace ::com::sun::star::uno;
#define USERITEM_NAME "UserItem"
-TYPEINIT1(SfxTabDialogItem,SfxSetItem);
struct TabPageImpl
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index edf73b61c9ee..fea4f79652ea 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -181,8 +181,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
#define MAX_FILTER_ENTRIES 14
-TYPEINIT0(SfxCommonTemplateDialog_Impl);
-TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
{
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index c53998c197a6..b8ca54f7c5f6 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -23,8 +23,8 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1_AUTOFACTORY(SfxTemplateItem, SfxFlagItem);
+SfxPoolItem* SfxTemplateItem::CreateDefault() { return new SfxTemplateItem; }
SfxTemplateItem::SfxTemplateItem() :
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index a8d7dbc14331..f6ad2b4ca076 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -174,7 +174,6 @@ bool SfxFrameProperties::operator ==( const SfxFrameProperties& rProp ) const
bResizable == rProp.bResizable && bSetResizable == rProp.bSetResizable;
}
-TYPEINIT1(SfxFrameDescriptorItem, SfxPoolItem);
SfxFrameDescriptorItem::~SfxFrameDescriptorItem()
{}
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 66154237224c..1e5a4f5459d8 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -22,8 +22,10 @@
#include <sfx2/objitem.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-TYPEINIT1_AUTOFACTORY(SfxObjectShellItem,SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SfxObjectItem,SfxPoolItem)
+
+SfxPoolItem* SfxObjectShellItem::CreateDefault() { return new SfxObjectShellItem; }
+
+SfxPoolItem* SfxObjectItem::CreateDefault() { return new SfxObjectItem; }
bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const
{
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 4db56613247c..55322b1eab06 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -39,7 +39,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <svl/eitem.hxx>
-#include <tools/rtti.hxx>
#include <svl/lstner.hxx>
#include <sfx2/sfxhelp.hxx>
#include <basic/sbstar.hxx>
@@ -202,7 +201,6 @@ void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _r
mpDoc->DoClose();
}
-TYPEINIT1(SfxObjectShell, SfxShell);
SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index 9b1e95068deb..0217acdb51b4 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -27,7 +27,8 @@
#include <sfx2/sfx.hrc>
-TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem);
+
+SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; }
#define ZOOM_PARAM_VALUE "Value"
#define ZOOM_PARAM_VALUESET "ValueSet"
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index eb16a8e2fe46..54190385efae 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -33,7 +33,6 @@ class SfxTemplateControllerItem;
#include <svl/eitem.hxx>
#include <rsc/rscsfx.hxx>
-#include <tools/rtti.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/templdlg.hxx>
@@ -291,7 +290,6 @@ protected:
SfxObjectShell* SaveSelection();
public:
- TYPEINFO_OVERRIDE();
SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool );
virtual ~SfxCommonTemplateDialog_Impl();
@@ -385,7 +383,6 @@ protected:
public:
friend class SfxTemplateDialog;
- TYPEINFO_OVERRIDE();
SfxTemplateDialog_Impl( SfxBindings*, SfxTemplatePanelControl* pDlgWindow );
virtual ~SfxTemplateDialog_Impl();
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 40c6b6e726c4..cf76a3a20ca7 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -247,7 +247,7 @@ SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/,
void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
{
RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
- SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
+ SfxMenuControl::CreateImpl, typeid(SfxStringItem), nSlotId ) );
}
@@ -258,7 +258,7 @@ void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pF
SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
{
- TypeId aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
+ const std::type_info* aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
if ( aSlotType )
{
SfxApplication *pApp = SfxGetpApp();
@@ -271,7 +271,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
{
SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nId) ) )
return rFactories[nFactory].pCtor( nId, rMenu, rBindings );
@@ -281,7 +281,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl();
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nId) ) )
return rFactories[nFactory].pCtor( nId, rMenu, rBindings );
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 3417c09fa27c..4c0d962a3383 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -604,7 +604,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
else
pSlotPool = &SfxSlotPool::GetSlotPool();
- TypeId aSlotType = pSlotPool->GetSlotType(nSlotID);
+ const std::type_info* aSlotType = pSlotPool->GetSlotType(nSlotID);
if ( aSlotType )
{
if ( pMod )
@@ -614,7 +614,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
{
SfxStbCtrlFactArr_Impl &rFactories = *pFactories;
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nSlotID) ) )
return rFactories[nFactory].pCtor( nSlotID, nStbId, *pBar );
@@ -623,7 +623,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
SfxStbCtrlFactArr_Impl &rFactories = pApp->GetStbCtrlFactories_Impl();
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nSlotID) ) )
return rFactories[nFactory].pCtor( nSlotID, nStbId, *pBar );
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 3ce36caf70be..7cbe75dde6a6 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -288,7 +288,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
pSlotPool = pMod->GetSlotPool();
else
pSlotPool = &SfxSlotPool::GetSlotPool();
- TypeId aSlotType = pSlotPool->GetSlotType( nSlotId );
+ const std::type_info* aSlotType = pSlotPool->GetSlotType( nSlotId );
if ( aSlotType )
{
SfxToolBoxControl *pCtrl;
@@ -303,7 +303,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
// search for a factory with the given slot id
for( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
break;
if( nFactory == nCount )
@@ -311,7 +311,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
// if no factory exists for the given slot id, see if we
// have a generic factory with the correct slot type and slot id == 0
for ( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == 0) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == 0) )
break;
}
@@ -329,7 +329,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
const sal_uInt16 nCount = rFactories.size();
for( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
break;
if( nFactory == nCount )
@@ -337,7 +337,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
// if no factory exists for the given slot id, see if we
// have a generic factory with the correct slot type and slot id == 0
for( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == 0) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == 0) )
break;
}
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index d354921a3319..8709e06c2061 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -75,10 +75,12 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::container;
-TYPEINIT1_AUTOFACTORY(SfxFrameItem, SfxPoolItem);
-TYPEINIT1(SfxUsrAnyItem, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SfxUnoFrameItem, SfxPoolItem);
+SfxPoolItem* SfxUsrAnyItem::CreateDefault() { DBG_ASSERT(false, "No SfxUsrAnyItem factory available"); return 0; }
+SfxPoolItem* SfxUnoFrameItem::CreateDefault()
+{
+ return new SfxUnoFrameItem();
+}
void SfxFrame::Construct_Impl()
{
pImp = new SfxFrame_Impl( this );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 05e2ca165d09..1534261dd592 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -154,8 +154,6 @@ void SfxViewFrame::InitInterface_Impl()
#endif
}
-TYPEINIT2(SfxViewFrame,SfxShell,SfxListener);
-TYPEINIT1(SfxViewFrameItem, SfxPoolItem);
namespace
{
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index a0a3b3afae1f..e9af2f4201a6 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -330,7 +330,6 @@ void SfxViewShell::InitInterface_Impl()
{
}
-TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
/** search for a filter name dependent on type and module
*/
diff --git a/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx
index e1da2bcaf5c3..7f30141d4ccb 100644
--- a/sot/inc/pch/precompiled_sot.hxx
+++ b/sot/inc/pch/precompiled_sot.hxx
@@ -78,7 +78,6 @@
#include <tools/debug.hxx>
#include <tools/globname.hxx>
#include <tools/ref.hxx>
-#include <tools/rtti.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index adb3c32987be..49346445e271 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -19,7 +19,6 @@
#include <rtl/ustrbuf.hxx>
#include <tools/stream.hxx>
-#include <tools/rtti.hxx>
#include <sot/exchange.hxx>
#include <sot/filelist.hxx>
#include <osl/diagnose.h>
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 2c126466b3de..52453000f5f8 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -44,9 +44,6 @@ static long nTmpCount = 0;
///////////////////////// class StorageBase
-TYPEINIT0( StorageBase );
-TYPEINIT1( BaseStorageStream, StorageBase );
-TYPEINIT1( BaseStorage, StorageBase );
StorageBase::StorageBase()
: m_bAutoCommit( false )
@@ -155,7 +152,6 @@ bool OLEStorageBase::ValidateMode_Impl( StreamMode m, StgDirEntry* p )
//////////////////////// class StorageStream
-TYPEINIT1( StorageStream, BaseStorageStream );
StorageStream::StorageStream( StgIo* p, StgDirEntry* q, StreamMode m )
: OLEStorageBase( p, q, m_nMode ), nPos( 0L )
@@ -336,7 +332,6 @@ bool Storage::IsStorageFile( SvStream* pStream )
// Open the storage file. If writing is permitted and the file is not
// a storage file, initialize it.
-TYPEINIT1( Storage, BaseStorage );
Storage::Storage( const OUString& rFile, StreamMode m, bool bDirect )
: OLEStorageBase( new StgIo, nullptr, m_nMode )
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 178446bde51a..a68b0a5efe20 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -304,8 +304,6 @@ void FileStreamWrapper_Impl::checkError()
throw NotConnectedException(OUString(), const_cast<XWeak*>(static_cast<const XWeak*>(this)));
}
-TYPEINIT1( UCBStorageStream, BaseStorageStream );
-TYPEINIT1( UCBStorage, BaseStorage );
#define COMMIT_RESULT_FAILURE 0
#define COMMIT_RESULT_NOTHING_TO_DO 1
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index b26b3e9a45c6..67ef680e79c6 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -150,7 +150,6 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
void readFormulaOoxml( oox::formulaimport::XmlStream& stream );
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+1)
SFX_DECL_OBJECTFACTORY();
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index f910c3dde627..aef1bca08698 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -166,7 +166,6 @@
#include <tools/gen.hxx>
#include <tools/globname.hxx>
#include <tools/mapunit.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
#include <ucbhelper/content.hxx>
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 575dbae28cfb..4a53375063f3 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -96,7 +96,6 @@ class SmModule : public SfxModule, utl::ConfigurationListener
static void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START + 0)
private:
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 39880ba1d4f6..a6c96c351746 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -288,7 +288,6 @@ protected:
virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ) override;
public:
- TYPEINFO_OVERRIDE();
SmViewShell(SfxViewFrame *pFrame, SfxViewShell *pOldSh);
virtual ~SmViewShell();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 7430f589f562..dae21759c0b2 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -105,7 +105,6 @@ using namespace ::com::sun::star::uno;
#define SmDocShell
#include "smslots.hxx"
-TYPEINIT1( SmDocShell, SfxObjectShell );
SFX_IMPL_SUPERCLASS_INTERFACE(SmDocShell, SfxObjectShell)
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 45b546704c51..0ba1e2c2d49d 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -30,7 +30,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/virdev.hxx>
#include <unotools/syslocale.hxx>
-#include <tools/rtti.hxx>
#include "smmod.hxx"
#include "symbol.hxx"
#include "cfgitem.hxx"
@@ -40,7 +39,6 @@
#include "starmath.hrc"
#include "svx/modctrl.hxx"
-TYPEINIT1( SmModule, SfxModule );
#define SmModule
#include "smslots.hxx"
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e0489a13cc33..a4e8c39ebb48 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -911,7 +911,6 @@ struct SmViewShell_Impl
SvtMiscOptions aOpts;
};
-TYPEINIT1(SmViewShell, SfxViewShell);
SFX_IMPL_SUPERCLASS_INTERFACE(SmViewShell, SfxViewShell)
diff --git a/svl/source/inc/strmadpt.hxx b/svl/source/inc/strmadpt.hxx
index 079cda74dd86..90fc31eb139b 100644
--- a/svl/source/inc/strmadpt.hxx
+++ b/svl/source/inc/strmadpt.hxx
@@ -31,7 +31,6 @@ class SvOutputStreamOpenLockBytes: public SvOpenLockBytes
sal_uInt64 m_nPosition;
public:
- TYPEINFO_OVERRIDE();
SvOutputStreamOpenLockBytes(
const css::uno::Reference< css::io::XOutputStream > & rTheOutputStream):
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 57dbd88d9996..f56d4045da97 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -23,7 +23,7 @@
#include <vector>
-TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
+SfxPoolItem* SfxAllEnumItem::CreateDefault() { return new SfxAllEnumItem; }
struct SfxAllEnumValue_Impl
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index a01f4b3eb99e..6f1bd0512ce3 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -26,7 +26,6 @@
#include <comphelper/extract.hxx>
-TYPEINIT1(SfxEnumItemInterface, SfxPoolItem)
// virtual
bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const
@@ -119,7 +118,6 @@ SfxEnumItem::SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream)
rStream.ReadUInt16( m_nValue );
}
-TYPEINIT1(SfxEnumItem, SfxEnumItemInterface)
// virtual
SvStream & SfxEnumItem::Store(SvStream & rStream, sal_uInt16) const
@@ -146,7 +144,10 @@ void SfxEnumItem::SetValue(sal_uInt16 const nTheValue)
m_nValue = nTheValue;
}
-TYPEINIT1_AUTOFACTORY(SfxBoolItem, SfxPoolItem);
+SfxPoolItem* SfxBoolItem::CreateDefault()
+{
+ return new SfxBoolItem();
+}
SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream & rStream)
: SfxPoolItem(nWhich)
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 4013cf771f16..6d30f4a44dd6 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -22,7 +22,6 @@
#include <tools/stream.hxx>
#include <svl/cintitem.hxx>
-TYPEINIT1_AUTOFACTORY(CntByteItem, SfxPoolItem);
// virtual
bool CntByteItem::operator ==(const SfxPoolItem & rItem) const
@@ -85,7 +84,6 @@ SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const
return new CntByteItem(*this);
}
-TYPEINIT1_AUTOFACTORY(CntUInt16Item, SfxPoolItem);
CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) :
SfxPoolItem(which)
@@ -157,7 +155,6 @@ SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const
return new CntUInt16Item(*this);
}
-TYPEINIT1_AUTOFACTORY(CntInt32Item, SfxPoolItem);
CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream)
: SfxPoolItem(which)
@@ -226,7 +223,6 @@ SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const
return new CntInt32Item(*this);
}
-TYPEINIT1_AUTOFACTORY(CntUInt32Item, SfxPoolItem);
CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) :
SfxPoolItem(which)
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 7728f6b56d8a..0bba3ae92086 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -29,7 +29,6 @@
#define CNTWALLPAPERITEM_STREAM_MAGIC ( (sal_uInt32)0xfefefefe )
#define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) )
-TYPEINIT1( CntWallpaperItem, SfxPoolItem );
CntWallpaperItem::CntWallpaperItem( sal_uInt16 which )
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 3f87e5468df7..ae559c3affad 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -33,7 +33,6 @@
// class CntContentTypeItem Implementation.
-TYPEINIT1_AUTOFACTORY( CntContentTypeItem, CntUnencodedStringItem );
#define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 )
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 8109d4877689..9f84dc32a0e6 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -24,7 +24,6 @@
#include <tools/stream.hxx>
#include <svl/custritm.hxx>
-TYPEINIT1_AUTOFACTORY(CntUnencodedStringItem, SfxPoolItem)
// virtual
bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index faa63f53d0df..905555dcdd54 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -22,7 +22,6 @@
#include <svl/poolitem.hxx>
#include <tools/stream.hxx>
-TYPEINIT1(SfxFlagItem, SfxPoolItem);
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 67aec474d1e4..793d0a79206b 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -31,8 +31,8 @@
// STATIC DATA
-TYPEINIT1_AUTOFACTORY(SfxGlobalNameItem, SfxPoolItem);
+SfxPoolItem* SfxGlobalNameItem::CreateDefault() { return new SfxGlobalNameItem; }
SfxGlobalNameItem::SfxGlobalNameItem()
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index 19213b65764c..2ed43f672785 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -14,7 +14,6 @@
#include <comphelper/sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-TYPEINIT1_AUTOFACTORY(SfxGrabBagItem, SfxPoolItem);
using namespace com::sun::star;
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index fe36cb62337a..ca2acb7a3da6 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -24,7 +24,8 @@
#include <svl/ilstitem.hxx>
-TYPEINIT1_AUTOFACTORY(SfxIntegerListItem, SfxPoolItem);
+
+SfxPoolItem* SfxIntegerListItem::CreateDefault() { return new SfxIntegerListItem; }
SfxIntegerListItem::SfxIntegerListItem()
{
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 4c56f41f1fca..e956460f9641 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -21,7 +21,8 @@
#include <svl/imageitm.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-TYPEINIT1( SfxImageItem, SfxInt16Item );
+
+SfxPoolItem* SfxImageItem::CreateDefault() { return new SfxImageItem; }
struct SfxImageItem_Impl
{
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 05eb03912451..2757ed0e0745 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -30,7 +30,10 @@
// class SfxByteItem
-TYPEINIT1_AUTOFACTORY(SfxByteItem, CntByteItem);
+SfxPoolItem* SfxByteItem::CreateDefault()
+{
+ return new SfxByteItem();
+};
// virtual
SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const
@@ -40,7 +43,10 @@ SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const
return new SfxByteItem(Which(), sal_uInt8(nValue));
}
-TYPEINIT1_AUTOFACTORY(SfxInt16Item, SfxPoolItem);
+SfxPoolItem* SfxInt16Item::CreateDefault()
+{
+ return new SfxInt16Item();
+};
SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream):
SfxPoolItem(which)
@@ -110,7 +116,10 @@ SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const
}
// class SfxUInt16Item
-TYPEINIT1_AUTOFACTORY(SfxUInt16Item, CntUInt16Item);
+SfxPoolItem* SfxUInt16Item::CreateDefault()
+{
+ return new SfxUInt16Item();
+};
void SfxUInt16Item::dumpAsXml(xmlTextWriterPtr pWriter) const
{
@@ -124,16 +133,21 @@ void SfxUInt16Item::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SfxInt32Item
-TYPEINIT1_AUTOFACTORY(SfxInt32Item, CntInt32Item);
+SfxPoolItem* SfxInt32Item::CreateDefault()
+{
+ return new SfxInt32Item();
+};
// class SfxUInt32Item
-TYPEINIT1_AUTOFACTORY(SfxUInt32Item, CntUInt32Item);
+SfxPoolItem* SfxUInt32Item::CreateDefault()
+{
+ return new SfxUInt32Item();
+};
-TYPEINIT1_AUTOFACTORY(SfxMetricItem, SfxInt32Item);
SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_uInt32 nValue):
SfxInt32Item(which, nValue)
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 71dcfb0e57a8..de032c0af575 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -669,7 +669,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
}
SFX_ASSERT( !pImp->ppStaticDefaults ||
- rItem.IsA(GetDefaultItem(nWhich).Type()), nWhich,
+ typeid(rItem) == typeid(GetDefaultItem(nWhich)), nWhich,
"SFxItemPool: wrong item type in Put" );
SfxPoolItemArray_Impl* pItemArr = pImp->maPoolItems[nIndex];
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index a21cdb5ebf8b..352019f1c57c 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -440,7 +440,7 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
// Different ones are present
return SfxItemState::DONTCARE;
- if ( (*ppFnd)->Type() == TYPE(SfxVoidItem) )
+ if ( dynamic_cast<const SfxVoidItem *>(*ppFnd) != nullptr )
return SfxItemState::DISABLED;
if (ppItem)
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 573765b0bea5..4cc6d2f305d8 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -26,7 +26,8 @@
-TYPEINIT1_AUTOFACTORY(SfxLockBytesItem, SfxPoolItem);
+
+SfxPoolItem* SfxLockBytesItem::CreateDefault() { return new SfxLockBytesItem; }
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index f8406c477fe8..133a1d944bac 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -25,8 +25,7 @@
#include <svl/macitem.hxx>
#include <stringio.hxx>
-TYPEINIT1_FACTORY(SvxMacroItem, SfxPoolItem, new SvxMacroItem(0));
-
+SfxPoolItem* SvxMacroItem::CreateDefault() { return new SvxMacroItem(0); }
SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLanguage)
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 7df7535d65cb..36eaac4f2f78 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -22,12 +22,7 @@
#include <tools/stream.hxx>
#include <osl/diagnose.h>
#include <libxml/xmlwriter.h>
-
-TYPEINIT0(SfxPoolItem);
-TYPEINIT1(SfxVoidItem, SfxPoolItem);
-// @@@ TYPEINIT1(SfxInvalidItem, SfxPoolItem);
-TYPEINIT1(SfxSetItem, SfxPoolItem);
-// @@@ TYPEINIT1(SfxItemChangedHint, SfxHint);
+#include <typeinfo>
#if OSL_DEBUG_LEVEL > 1
@@ -125,7 +120,7 @@ SfxPoolItem::~SfxPoolItem()
bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
{
- return rCmp.Type() == Type();
+ return typeid(rCmp) == typeid(*this);
}
@@ -200,6 +195,10 @@ void SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
xmlTextWriterEndElement(pWriter);
}
+SfxPoolItem* SfxVoidItem::CreateDefault()
+{
+ return new SfxVoidItem(0);
+}
SfxVoidItem::SfxVoidItem( sal_uInt16 which ):
SfxPoolItem(which)
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 56dfd45fd67f..e4f5c3593edb 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -30,8 +30,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_AUTOFACTORY(SfxPointItem, SfxPoolItem);
+SfxPoolItem* SfxPointItem::CreateDefault() { return new SfxPointItem; }
SfxPointItem::SfxPointItem()
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index ffc1d8ad4800..f4c95be10485 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -27,8 +27,8 @@
#include <svl/poolitem.hxx>
#include <svl/memberid.hrc>
-TYPEINIT1_AUTOFACTORY(SfxRectangleItem, SfxPoolItem);
+SfxPoolItem* SfxRectangleItem::CreateDefault() { return new SfxRectangleItem; }
SfxRectangleItem::SfxRectangleItem()
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 1eb615b2a2b0..a1205894aee1 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -32,8 +32,6 @@ static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges)
-TYPEINIT1_AUTOFACTORY(SfxRangeItem, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SfxUShortRangesItem, SfxPoolItem);
SfxRangeItem::SfxRangeItem()
{
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 9f35483ec7fd..11dac598010b 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -26,8 +26,7 @@
#include <tools/stream.hxx>
#include <stringio.hxx>
-TYPEINIT1_AUTOFACTORY(SfxStringListItem, SfxPoolItem);
-
+SfxPoolItem* SfxStringListItem::CreateDefault() { return new SfxStringListItem; }
class SfxImpStringList
{
public:
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 1756a43b369b..9cfcbfa22eea 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -61,8 +61,8 @@ using namespace com::sun::star::util;
// STATIC DATA
-TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0));
+SfxPoolItem* SvxSearchItem::CreateDefault() { return new SvxSearchItem(0);}
static Sequence< OUString > lcl_GetNotifyNames()
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index dea5550102c9..d2665fe3fa4c 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -24,7 +24,6 @@
// class SfxStringItem
-TYPEINIT1_AUTOFACTORY(SfxStringItem, CntUnencodedStringItem)
// virtual
SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream):
@@ -60,5 +59,8 @@ void SfxStringItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(GetValue().toUtf8().getStr()));
xmlTextWriterEndElement(pWriter);
}
-
+SfxPoolItem* SfxStringItem::CreateDefault()
+{
+ return new SfxStringItem();
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index a164475a1ec4..a10cc04a7d66 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -58,9 +58,7 @@ aDbgStyleSheetReferences;
#endif
-TYPEINIT0(SfxStyleSheetBase)
-TYPEINIT3(SfxStyleSheet, SfxStyleSheetBase, SfxListener, SfxBroadcaster)
SfxStyleSheetHintExtended::SfxStyleSheetHintExtended
(
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 90a7074eeb64..dffa4bdac26e 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -27,7 +27,6 @@
#include <svl/poolitem.hxx>
#include <svl/memberid.hrc>
-TYPEINIT1_AUTOFACTORY(SfxSizeItem, SfxPoolItem);
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index d73e54deeb0c..99f3ca4fbac0 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -22,7 +22,6 @@
#include <osl/diagnose.h>
#include <tools/stream.hxx>
-TYPEINIT1_AUTOFACTORY(SfxVisibilityItem, SfxPoolItem);
SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream):
SfxPoolItem(which)
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index f350153a8b9f..e0157a1406b1 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -129,7 +129,6 @@ inline bool SvDataPipe_Impl::isEOF() const
// SvOutputStreamOpenLockBytes
-TYPEINIT1(SvOutputStreamOpenLockBytes, SvOpenLockBytes)
// virtual
ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uInt64, void *, sal_uLong, sal_uLong*)
diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx
index d132e86e0651..0a7ef4b4e963 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -28,7 +28,6 @@
#include <cassert>
#include <vector>
-TYPEINIT0(SfxBroadcaster);
typedef std::vector<SfxListener*> SfxListenerArr_Impl;
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 4fc3426b8bd4..e24becc4f1e1 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -26,7 +26,6 @@
#include <cassert>
#include <deque>
-TYPEINIT0(SfxListener);
typedef std::deque<SfxBroadcaster*> SfxBroadcasterArr_Impl;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 7048b99f2bf4..c65ea1bfef5f 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -34,10 +34,6 @@
using ::com::sun::star::uno::Exception;
-TYPEINIT0(SfxUndoAction);
-TYPEINIT0(SfxListUndoAction);
-TYPEINIT0(SfxLinkUndoAction);
-TYPEINIT0(SfxRepeatTarget);
SfxRepeatTarget::~SfxRepeatTarget()
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index f633889814e1..94d592500862 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -363,7 +363,6 @@
#include <tools/resary.hxx>
#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
#include <tools/time.hxx>
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 3550f48a1a6c..47d6ab94aea2 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -28,14 +28,7 @@ namespace svt
{
- TYPEINIT0(CellController);
- TYPEINIT1(EditCellController, CellController);
- TYPEINIT1(SpinCellController, CellController);
- TYPEINIT1(CheckBoxCellController, CellController);
- TYPEINIT1(ComboBoxCellController, CellController);
- TYPEINIT1(ListBoxCellController, CellController);
-
- TYPEINIT1( FormattedFieldCellController, EditCellController );
+
//= ComboBoxControl
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
index c7e3ae1f0dfa..fd862053606d 100644
--- a/svtools/source/misc/xwindowitem.cxx
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -27,8 +27,6 @@ using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( XWindowItem, SfxPoolItem, new XWindowItem );
-
XWindowItem::XWindowItem() :
SfxPoolItem()
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 74ac2a7c9ee4..b5b4d21461b4 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -21,7 +21,6 @@
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
-#include <tools/rtti.hxx>
#include <svtools/unoevent.hxx>
#include <svl/macitem.hxx>
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index f41257020d12..674a892e7796 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -63,7 +63,6 @@ protected:
bool mbMovedAtAll;
public:
- TYPEINFO_OVERRIDE();
E3dDragMethod(
SdrDragView &rView,
const SdrMarkList& rMark,
@@ -86,7 +85,6 @@ class E3dDragRotate : public E3dDragMethod
basegfx::B3DPoint maGlobalCenter;
public:
- TYPEINFO_OVERRIDE();
E3dDragRotate(
SdrDragView &rView,
const SdrMarkList& rMark,
@@ -104,7 +102,6 @@ class E3dDragMove : public E3dDragMethod
Point maScaleFixPos;
public:
- TYPEINFO_OVERRIDE();
E3dDragMove(
SdrDragView &rView,
const SdrMarkList& rMark,
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx
index 2bbac7428575..ec221626b9cd 100644
--- a/svx/inc/sxcikitm.hxx
+++ b/svx/inc/sxcikitm.hxx
@@ -29,7 +29,6 @@ enum SdrCircKind {SDRCIRC_FULL,
class SdrCircKindItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index b892e0cb8ee5..718c860be857 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -29,7 +29,6 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
class SdrMeasureKindItem: public SfxEnumItem {
public:
- TYPEINFO_OVERRIDE();
SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index ba3859fe6bdd..76bc4625b598 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
@@ -23,7 +23,6 @@
#include <memory>
#include <list>
#include <algorithm>
-#include <tools/rtti.hxx>
class SfxHint;
class SdrHint;
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index a7b381ad2a12..502eeb98d95c 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -25,11 +25,11 @@
#include <com/sun/star/frame/status/LeftRightMargin.hpp>
#include <com/sun/star/frame/status/UpperLowerMargin.hpp>
-TYPEINIT1_AUTOFACTORY(SvxPagePosSizeItem, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SvxLongLRSpaceItem, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SvxLongULSpaceItem, SfxPoolItem);
-TYPEINIT1(SvxColumnItem, SfxPoolItem);
-TYPEINIT1(SvxObjectItem, SfxPoolItem);
+SfxPoolItem* SvxPagePosSizeItem::CreateDefault() { return new SvxPagePosSizeItem; }
+SfxPoolItem* SvxLongLRSpaceItem::CreateDefault() { return new SvxLongLRSpaceItem; }
+SfxPoolItem* SvxLongULSpaceItem::CreateDefault() { return new SvxLongULSpaceItem; }
+SfxPoolItem* SvxColumnItem::CreateDefault() { return new SvxColumnItem; }
+SfxPoolItem* SvxObjectItem::CreateDefault() { DBG_ASSERT(false, "No SvxObjectItem factory available"); return 0; }
/* SvxLongLRSpaceItem */
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index ff040edd7095..331b835a1d38 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -18,7 +18,6 @@
*/
#include "svx/svxgrahicitem.hxx"
-TYPEINIT1(SvxGraphicItem,SfxPoolItem);
SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic )
: SfxPoolItem( _nWhich ), aGraphic( rGraphic )
{
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 35beab7b13be..5f493084007e 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -34,7 +34,6 @@ sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact()
return new sdr::contact::ViewContactOfE3dCube(*this);
}
-TYPEINIT1(E3dCubeObj, E3dCompoundObject);
E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize)
: E3dCompoundObject(rDefault)
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index add71f23cf5f..1f6150ada67d 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -35,7 +35,6 @@
#include <drawinglayer/geometry/viewinformation3d.hxx>
#include <svx/e3dsceneupdater.hxx>
-TYPEINIT1(E3dDragMethod, SdrDragMethod);
E3dDragMethod::E3dDragMethod (
SdrDragView &_rView,
@@ -251,7 +250,6 @@ void E3dDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
}
}
-TYPEINIT1(E3dDragRotate, E3dDragMethod);
E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
const SdrMarkList& rMark,
@@ -432,7 +430,6 @@ Pointer E3dDragRotate::GetSdrDragPointer() const
// 3D scenes. If a 3D-scene itself moved, then this drag method will drag
// not be used.
-TYPEINIT1(E3dDragMove, E3dDragMethod);
E3dDragMove::E3dDragMove(SdrDragView &_rView,
const SdrMarkList& rMark,
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 9d6dcfcff40d..e194dd661ef1 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -24,7 +24,6 @@
#include <svx/scene3d.hxx>
#include <svx/e3dsceneupdater.hxx>
-TYPEINIT1(E3dUndoAction, SfxUndoAction);
E3dUndoAction::~E3dUndoAction ()
{
@@ -37,7 +36,6 @@ bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
return false;
}
-TYPEINIT1(E3dRotateUndoAction, E3dUndoAction);
// Undo destructor for 3D-Rotation
@@ -61,7 +59,6 @@ void E3dRotateUndoAction::Redo ()
pMy3DObj->SetTransform(aMyNewRotation);
}
-TYPEINIT1(E3dAttributesUndoAction, SdrUndoAction);
E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel,
E3dObject* pInObject,
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 29136bbcbcf0..84f71a4d4105 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -54,7 +54,6 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties()
-TYPEINIT1(E3dExtrudeObj, E3dCompoundObject);
// Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side
// surfaces rectangles from the passed PolyPolygon
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 1159bdd7dae9..bc4e87f0970a 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -52,7 +52,6 @@ sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties()
-TYPEINIT1(E3dLatheObj, E3dCompoundObject);
// Constructor from 3D polygon, scale is the conversion factor for the coordinates
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 203455dcb7e3..9d67c722261b 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -84,7 +84,6 @@ using namespace com::sun::star;
// List for 3D-Objects
-TYPEINIT1(E3dObjList, SdrObjList);
E3dObjList::E3dObjList(SdrModel* pNewModel, SdrPage* pNewPage, E3dObjList* pNewUpList)
: SdrObjList(pNewModel, pNewPage, pNewUpList)
@@ -181,7 +180,6 @@ sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties()
-TYPEINIT1(E3dObject, SdrAttrObj);
E3dObject::E3dObject()
: maSubList(),
@@ -776,7 +774,6 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti
-TYPEINIT1(E3dCompoundObject, E3dObject);
E3dCompoundObject::E3dCompoundObject()
: E3dObject(),
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index e2ab870a8add..df5d6a45bea1 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -25,7 +25,6 @@
#include <basegfx/polygon/b3dpolygon.hxx>
#include <basegfx/polygon/b3dpolygontools.hxx>
-TYPEINIT1(E3dPolygonObj, E3dCompoundObject);
// DrawContact section
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 379abcdfb5fc..d6aac7a216bb 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -34,7 +34,6 @@
#include <svx/xtable.hxx>
#include <svx/xlnwtit.hxx>
-TYPEINIT1(E3dPolyScene, E3dScene);
E3dPolyScene::E3dPolyScene()
: E3dScene()
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 880d5cd6acc2..911aca6e1820 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -182,7 +182,6 @@ sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact()
-TYPEINIT1(E3dScene, E3dObject);
E3dScene::E3dScene()
: E3dObject(),
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index a83054a6beff..b7d6cc935245 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -50,7 +50,6 @@ sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties()
-TYPEINIT1(E3dSphereObj, E3dCompoundObject);
// Build Sphere from polygon facets in latitude and longitude
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 1d934264f95c..1044492d5ceb 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -70,7 +70,6 @@ using namespace com::sun::star;
#define ITEMVALUE(ItemSet,Id,Cast) (static_cast<const Cast&>((ItemSet).Get(Id))).GetValue()
-TYPEINIT1(E3dView, SdrView);
// Migrate Marking
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 20b8aca7eb10..ac2b744ad6e1 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -527,20 +527,6 @@ void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _
//= cell controls
-TYPEINIT0( DbCellControl )
-TYPEINIT1( DbLimitedLengthField, DbCellControl )
-TYPEINIT1( DbTextField, DbLimitedLengthField )
-TYPEINIT1( DbFormattedField, DbLimitedLengthField )
-TYPEINIT1( DbCheckBox, DbCellControl )
-TYPEINIT1( DbComboBox, DbCellControl )
-TYPEINIT1( DbListBox, DbCellControl )
-TYPEINIT1( DbPatternField, DbCellControl )
-TYPEINIT1( DbSpinField, DbCellControl )
-TYPEINIT1( DbDateField, DbSpinField )
-TYPEINIT1( DbTimeField, DbSpinField )
-TYPEINIT1( DbCurrencyField, DbSpinField )
-TYPEINIT1( DbNumericField, DbSpinField )
-TYPEINIT1( DbFilterField, DbCellControl )
DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ )
@@ -3140,7 +3126,6 @@ IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void)
}
}
-TYPEINIT0(FmXGridCell);
@@ -3516,7 +3501,6 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window&
}
}
-TYPEINIT1(FmXDataCell, FmXGridCell);
void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
const Reference< css::sdb::XColumn >& _rxField,
@@ -3533,7 +3517,6 @@ void FmXDataCell::UpdateFromColumn()
m_pCellControl->UpdateFromField(xField, m_pColumn->GetParent().getNumberFormatter());
}
-TYPEINIT1(FmXTextCell, FmXDataCell);
FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl )
:FmXDataCell( pColumn, _rControl )
@@ -4541,7 +4524,6 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Win
}
}
-TYPEINIT1(FmXFilterCell, FmXGridCell);
FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl )
:FmXGridCell( pColumn, pControl )
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 4626178567ea..2f413e65c552 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -135,14 +135,12 @@ OLocalExchange* OFilterExchangeHelper::createExchange() const
}
-TYPEINIT0(FmFilterData);
Image FmFilterData::GetImage() const
{
return Image();
}
-TYPEINIT1(FmParentData, FmFilterData);
FmParentData::~FmParentData()
{
@@ -152,7 +150,6 @@ FmParentData::~FmParentData()
}
-TYPEINIT1(FmFormItem, FmParentData);
Image FmFormItem::GetImage() const
{
@@ -161,7 +158,6 @@ Image FmFormItem::GetImage() const
}
-TYPEINIT1(FmFilterItems, FmParentData);
FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const
{
@@ -186,7 +182,6 @@ Image FmFilterItems::GetImage() const
}
-TYPEINIT1(FmFilterItem, FmFilterData);
FmFilterItem::FmFilterItem( FmFilterItems* pParent,
const OUString& aFieldName,
@@ -500,7 +495,6 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event )
m_pModel->Insert( insertPos, pFilterItems );
}
-TYPEINIT1(FmFilterModel, FmParentData);
FmFilterModel::FmFilterModel()
:FmParentData(nullptr, OUString())
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 67b033b54a5a..53bb185cbe8c 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -173,7 +173,6 @@ void FmEntryDataList::clear()
maEntryDataList.clear();
}
-TYPEINIT0( FmEntryData );
FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
:pParent( pParentData )
@@ -254,7 +253,6 @@ bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
return true;
}
-TYPEINIT1( FmFormData, FmEntryData );
FmFormData::FmFormData(
const Reference< XForm >& _rxForm,
@@ -316,7 +314,6 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
return FmEntryData::IsEqualWithoutChildren( pFormData );
}
-TYPEINIT1( FmControlData, FmEntryData );
FmControlData::FmControlData(
const Reference< XFormComponent >& _rxComponent,
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 440ec5c40593..e8f319c5380e 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -25,7 +25,6 @@
// class FmInterfaceItem
-TYPEINIT1(FmInterfaceItem, SfxPoolItem);
bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 03ae492e69b3..149e757c0bdb 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -34,7 +34,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::container::XNameContainer;
using namespace svxform;
-TYPEINIT1(FmFormModel, SdrModel);
struct FmFormModelImplData
{
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 5d93ce213f27..3ce8975084d4 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::script;
using namespace ::com::sun::star::container;
using namespace ::svxform;
-TYPEINIT1(FmFormObj, SdrUnoObj);
FmFormObj::FmFormObj(const OUString& rModelName)
:SdrUnoObj ( rModelName )
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 34ed152f8500..41a1aef3b029 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -52,7 +52,6 @@ using com::sun::star::uno::UNO_QUERY;
using com::sun::star::container::XChild;
using com::sun::star::container::XNameContainer;
-TYPEINIT1(FmFormPage, SdrPage);
FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage)
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index a0b4115d11d2..e9e39a0cf100 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -201,7 +201,6 @@ void FmFormShell::InitInterface_Impl()
FM_UI_FEATURE_TB_FORMDESIGN);
}
-TYPEINIT1(FmFormShell,SfxShell)
FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
:SfxShell(_pParent)
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 788d7d62dbd5..d3ff3b1ef636 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -80,7 +80,6 @@ using namespace ::svx;
-TYPEINIT1(FmFormView, E3dView);
FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut )
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 891d904928a0..42ba89a242ad 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -62,7 +62,6 @@ class FmFilterData
OUString m_aText;
public:
- TYPEINFO();
FmFilterData(FmParentData* pParent = nullptr, const OUString& rText = OUString())
:m_pParent( pParent )
,m_aText( rText )
@@ -83,7 +82,6 @@ protected:
::std::vector< FmFilterData* > m_aChildren;
public:
- TYPEINFO_OVERRIDE();
FmParentData(FmParentData* pParent, const OUString& rText)
: FmFilterData(pParent, rText)
{}
@@ -100,7 +98,6 @@ class FmFormItem : public FmParentData
css::uno::Reference< css::form::runtime::XFilterController > m_xFilterController;
public:
- TYPEINFO_OVERRIDE();
FmFormItem( FmParentData* _pParent,
const css::uno::Reference< css::form::runtime::XFormController > & _xController,
@@ -124,7 +121,6 @@ public:
class FmFilterItems : public FmParentData
{
public:
- TYPEINFO_OVERRIDE();
FmFilterItems() : FmParentData(nullptr, OUString()) {}
FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {}
@@ -139,7 +135,6 @@ class FmFilterItem : public FmFilterData
const sal_Int32 m_nComponentIndex;
public:
- TYPEINFO_OVERRIDE();
FmFilterItem(
FmFilterItems* pParent,
const OUString& aFieldName,
@@ -166,7 +161,6 @@ class FmFilterModel : public FmParentData
FmFilterItems* m_pCurrentItems;
public:
- TYPEINFO_OVERRIDE();
FmFilterModel();
virtual ~FmFilterModel();
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index f7a7d1abc922..c3d225123c28 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -152,7 +152,6 @@ protected:
void newObject( const css::uno::Reference< css::uno::XInterface >& _rxIFace );
public:
- TYPEINFO();
FmEntryData( FmEntryData* pParentData, const css::uno::Reference< css::uno::XInterface >& _rIFace );
FmEntryData( const FmEntryData& rEntryData );
@@ -240,7 +239,6 @@ class FmFormData : public FmEntryData
css::uno::Reference< css::container::XContainer > m_xContainer;
public:
- TYPEINFO_OVERRIDE();
FmFormData(
const css::uno::Reference< css::form::XForm >& _rxForm,
@@ -267,7 +265,6 @@ class FmControlData : public FmEntryData
Image GetImage(const ImageList& ilNavigatorImages) const;
public:
- TYPEINFO_OVERRIDE();
FmControlData(
const css::uno::Reference< css::form::XFormComponent >& _rxComponent,
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index a9f0d3e40527..9167569f4c06 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -29,7 +29,6 @@ class FmInterfaceItem : public SfxPoolItem
css::uno::Reference< css::uno::XInterface > xInterface;
public:
- TYPEINFO_OVERRIDE();
FmInterfaceItem( const sal_uInt16 nId, const css::uno::Reference< css::uno::XInterface >& rxInterface )
:SfxPoolItem( nId )
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 577d027e6211..a4fe85c01a21 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -50,7 +50,6 @@ public:
FmFormObj(const OUString& rModelName);
FmFormObj();
- TYPEINFO_VISIBILITY_OVERRIDE(SAL_DLLPRIVATE);
SAL_DLLPRIVATE const css::uno::Reference< css::container::XIndexContainer>&
GetOriginalParent() const { return m_xParent; }
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 44ca4d57e391..04082d3ca5e6 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -44,7 +44,6 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/rtti.hxx>
class DbCellControl;
class Edit;
@@ -261,7 +260,6 @@ protected:
public:
- TYPEINFO();
DbCellControl(DbGridColumn& _rColumn, bool _bText = true);
virtual ~DbCellControl();
@@ -364,7 +362,6 @@ inline void DbCellControl::unlockValueProperty()
class DbLimitedLengthField : public DbCellControl
{
public:
- TYPEINFO_OVERRIDE();
protected:
DbLimitedLengthField( DbGridColumn& _rColumn );
@@ -392,7 +389,6 @@ protected:
virtual ~DbTextField( );
public:
- TYPEINFO_OVERRIDE();
DbTextField(DbGridColumn& _rColumn);
::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; }
@@ -423,7 +419,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
DbFormattedField(DbGridColumn& _rColumn);
virtual ~DbFormattedField();
@@ -446,7 +441,6 @@ protected:
class DbCheckBox : public DbCellControl
{
public:
- TYPEINFO_OVERRIDE();
DbCheckBox(DbGridColumn& _rColumn);
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
@@ -468,7 +462,6 @@ class DbComboBox : public DbCellControl
{
public:
- TYPEINFO_OVERRIDE();
DbComboBox(DbGridColumn& _rColumn);
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
@@ -496,7 +489,6 @@ class DbListBox :public DbCellControl
css::uno::Sequence< OUString > m_aValueList;
public:
- TYPEINFO_OVERRIDE();
DbListBox(DbGridColumn& _rColumn);
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
@@ -521,7 +513,6 @@ protected:
class DbPatternField : public DbCellControl
{
public:
- TYPEINFO_OVERRIDE();
DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext );
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
@@ -551,7 +542,6 @@ private:
sal_Int16 m_nStandardAlign;
public:
- TYPEINFO_OVERRIDE();
protected:
DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = css::awt::TextAlign::RIGHT );
@@ -572,7 +562,6 @@ protected:
class DbDateField : public DbSpinField
{
public:
- TYPEINFO_OVERRIDE();
DbDateField(DbGridColumn& _rColumn);
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
@@ -597,7 +586,6 @@ protected:
class DbTimeField : public DbSpinField
{
public:
- TYPEINFO_OVERRIDE();
DbTimeField(DbGridColumn& _rColumn);
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
@@ -624,7 +612,6 @@ class DbCurrencyField : public DbSpinField
sal_Int16 m_nScale;
public:
- TYPEINFO_OVERRIDE();
DbCurrencyField(DbGridColumn& _rColumn);
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
@@ -651,7 +638,6 @@ protected:
class DbNumericField : public DbSpinField
{
public:
- TYPEINFO_OVERRIDE();
DbNumericField(DbGridColumn& _rColumn);
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
@@ -686,7 +672,6 @@ class DbFilterField
bool m_bBound : 1;
public:
- TYPEINFO_OVERRIDE();
DbFilterField(const css::uno::Reference< css::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn);
virtual ~DbFilterField();
@@ -742,7 +727,6 @@ protected:
virtual ~FmXGridCell();
public:
- TYPEINFO();
FmXGridCell( DbGridColumn* pColumn, DbCellControl* pControl );
void init();
@@ -824,7 +808,6 @@ private:
class FmXDataCell : public FmXGridCell
{
public:
- TYPEINFO_OVERRIDE();
FmXDataCell( DbGridColumn* pColumn, DbCellControl& _rControl )
:FmXGridCell( pColumn, &_rControl )
{
@@ -863,7 +846,6 @@ protected:
bool m_bFastPaint;
public:
- TYPEINFO_OVERRIDE();
FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl );
virtual void PaintFieldToCell(OutputDevice& rDev,
@@ -1089,7 +1071,6 @@ class FmXFilterCell :public FmXGridCell
protected:
virtual ~FmXFilterCell();
public:
- TYPEINFO_OVERRIDE();
FmXFilterCell(DbGridColumn* pColumn = nullptr, DbCellControl* pControl = nullptr);
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 5ba83719d0cb..fd64d96c6aa9 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -25,7 +25,8 @@
using namespace ::com::sun::star;
-TYPEINIT1(SvxSmartTagItem, SfxPoolItem);
+
+SfxPoolItem* SvxSmartTagItem::CreateDefault() { DBG_ASSERT(false, "No SvxSmartTagItem factory available"); return 0; }
SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 0a1577d1fbe7..54720b99e83e 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -40,8 +40,9 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( SvxOrientationItem, SfxEnumItem, new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) );
-TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
+
+SfxPoolItem* SvxOrientationItem::CreateDefault() { return new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) ;}
+SfxPoolItem* SvxMarginItem::CreateDefault() { return new SvxMarginItem(0) ;}
SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
const sal_uInt16 nId):
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 39f1a5563635..0815388e96a4 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -31,14 +31,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0));
-TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem);
-TYPEINIT1(SvxChartTextOrderItem, SfxEnumItem);
-TYPEINIT1(SvxChartTextOrientItem, SfxEnumItem);
-TYPEINIT1(SvxChartIndicateItem, SfxEnumItem);
-TYPEINIT1(SvxChartKindErrorItem, SfxEnumItem);
-TYPEINIT1(SvxChartRegressItem, SfxEnumItem);
-TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0));
+
+SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);}
SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
SfxEnumItem(nId, (sal_uInt16)eStyle)
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 9835dfae0215..63a2a1b94090 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -33,7 +33,7 @@ struct SvxClipboardFormatItem_Impl
SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
};
-TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new SvxClipboardFormatItem(0));
+SfxPoolItem* SvxClipboardFormatItem::CreateDefault() { return new SvxClipboardFormatItem(0); };
SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
const SvxClipboardFormatItem_Impl& rCpy )
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 952438888a3b..ae492779761b 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -23,7 +23,6 @@
using namespace ::std;
using namespace com::sun::star;
-TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem);
SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem()
: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 423cab1e6fb8..213189d8028a 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -23,12 +23,13 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( SvxColorListItem, SfxPoolItem , new SvxColorListItem );
-TYPEINIT1_FACTORY( SvxGradientListItem, SfxPoolItem , new SvxGradientListItem );
-TYPEINIT1_FACTORY( SvxHatchListItem, SfxPoolItem , new SvxHatchListItem );
-TYPEINIT1_FACTORY( SvxBitmapListItem, SfxPoolItem , new SvxBitmapListItem );
-TYPEINIT1_FACTORY( SvxDashListItem, SfxPoolItem , new SvxDashListItem );
-TYPEINIT1_FACTORY( SvxLineEndListItem, SfxPoolItem , new SvxLineEndListItem );
+
+SfxPoolItem* SvxColorListItem::CreateDefault() { return new SvxColorListItem ;}
+SfxPoolItem* SvxGradientListItem::CreateDefault() { return new SvxGradientListItem ;}
+SfxPoolItem* SvxHatchListItem::CreateDefault() { return new SvxHatchListItem ;}
+SfxPoolItem* SvxBitmapListItem::CreateDefault() { return new SvxBitmapListItem ;}
+SfxPoolItem* SvxDashListItem::CreateDefault() { return new SvxDashListItem ;}
+SfxPoolItem* SvxLineEndListItem::CreateDefault() { return new SvxLineEndListItem ;}
SvxColorListItem::SvxColorListItem()
{
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 80ecad61aab2..d41b77818a31 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -24,8 +24,6 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem);
-
SvxB3DVectorItem::SvxB3DVectorItem()
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index 095a4c80663e..51d0cf7f1ba8 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -23,7 +23,8 @@
#include <com/sun/star/uno/Sequence.hxx>
-TYPEINIT1_AUTOFACTORY( SvxGalleryItem, SfxPoolItem );
+
+SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; }
SvxGalleryItem::SvxGalleryItem()
: m_nType( css::gallery::GalleryItemType::EMPTY )
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index f14d683b0224..8b8f1852f35f 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -26,7 +26,8 @@
-TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0));
+
+SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(0);}
#define HYPERLINKFF_MARKER 0x599401FE
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index a6348bc99234..630218127468 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -21,7 +21,6 @@
-TYPEINIT1(SvxNumberInfoItem, SfxPoolItem);
#define INIT(pNum,eVal,nDouble,rStr) \
SfxPoolItem ( nId ), \
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 6468acac3189..6153f0e75776 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -31,7 +31,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0));
+
+SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(0);}
SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 8139f0fce2ae..97cc424b3f70 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -24,9 +24,10 @@
-TYPEINIT1_FACTORY(SvxPostItAuthorItem, SfxStringItem, new SvxPostItAuthorItem(0));
-TYPEINIT1_FACTORY(SvxPostItDateItem, SfxStringItem, new SvxPostItDateItem(0));
-TYPEINIT1_FACTORY(SvxPostItTextItem, SfxStringItem, new SvxPostItTextItem(0));
+
+SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); }
+SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); }
+SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); }
SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich )
{
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index f35601038b0f..b5d622eb1aa7 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -36,8 +36,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0));
+SfxPoolItem* SvxRotateModeItem::CreateDefault() { return new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0);}
// SvxRotateModeItem - orientation with turned text
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 7c6cde664c92..ea349097cd44 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -26,7 +26,8 @@
#include <osl/diagnose.h>
-TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
+
+SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; }
#define VIEWLAYOUT_PARAM_COLUMNS "Columns"
#define VIEWLAYOUT_PARAM_BOOKMODE "BookMode"
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 5d776322fdf9..6b8cb85617a7 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -26,7 +26,8 @@
-TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
+
+SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; }
#define ZOOMSLIDER_PARAM_CURRENTZOOM "Columns"
#define ZOOMSLIDER_PARAM_SNAPPINGPOINTS "SnappingPoints"
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 674b3ef4a5f4..ea0ffce344cd 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -91,7 +91,7 @@ namespace sdr
void AttributeProperties::ImpRemoveStyleSheet()
{
// Check type since it is destroyed when the type is deleted
- if(GetStyleSheet() && HAS_BASE(SfxStyleSheet, mpStyleSheet))
+ if(GetStyleSheet() && dynamic_cast<const SfxStyleSheet *>(mpStyleSheet) != nullptr)
{
EndListening(*mpStyleSheet);
EndListening(mpStyleSheet->GetPool());
@@ -475,7 +475,7 @@ namespace sdr
void AttributeProperties::ForceStyleToHardAttributes()
{
- if(GetStyleSheet() && HAS_BASE(SfxStyleSheet, mpStyleSheet))
+ if(GetStyleSheet() && dynamic_cast<const SfxStyleSheet *>(mpStyleSheet) != nullptr)
{
// prepare copied, new itemset, but WITHOUT parent
GetObjectItemSet();
@@ -553,7 +553,7 @@ namespace sdr
// to register as listener to that new StyleSheet.
if(pModel && !rObj.IsInDestruction())
{
- if(HAS_BASE(SfxStyleSheet, GetStyleSheet()))
+ if(dynamic_cast<const SfxStyleSheet *>(GetStyleSheet()) != nullptr)
{
pNewStSh = static_cast<SfxStyleSheet*>(pModel->GetStyleSheetPool()->Find(
GetStyleSheet()->GetParent(), GetStyleSheet()->GetFamily()));
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 2ae586339f6b..8781e6a413ff 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -23,7 +23,6 @@
#include <svx/svddef.hxx>
#include <editeng/eeitem.hxx>
#include <svx/svdomeas.hxx>
-#include <svx/sxmsuitm.hxx>
#include <svx/xlnstit.hxx>
#include <svx/xlnstwit.hxx>
#include <svx/xlnedit.hxx>
@@ -108,7 +107,7 @@ namespace sdr
//#71958# by default, the show units Bool-Item is set as hard
// attribute to sal_True to avoid confusion when copying SdrMeasureObj's
// from one application to another
- mpItemSet->Put(makeSdrMeasureShowUnitItem(true));
+ mpItemSet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
basegfx::B2DPolygon aNewPolygon;
aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 9b4a045bb62a..794c2ec6f284 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -554,7 +554,7 @@ namespace sdr
if(rObj.HasText())
{
const svx::ITextProvider& rTextProvider(getTextProvider());
- if(HAS_BASE(SfxStyleSheet, &rBC))
+ if(dynamic_cast<const SfxStyleSheet *>(&rBC) != nullptr)
{
const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint);
sal_uInt32 nId(pSimple ? pSimple->GetId() : 0L);
@@ -595,7 +595,7 @@ namespace sdr
}
}
}
- else if(HAS_BASE(SfxStyleSheetBasePool, &rBC))
+ else if(dynamic_cast<const SfxStyleSheetBasePool *>(&rBC) != nullptr)
{
const SfxStyleSheetHintExtended* pExtendedHint = dynamic_cast<const SfxStyleSheetHintExtended*>(&rHint);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 49a50b550a8e..6fff9744b280 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -78,8 +78,6 @@
#include <sxmoitm.hxx>
#include <sxmovitm.hxx>
#include <sxmsitm.hxx>
-#include <svx/sxmspitm.hxx>
-#include <svx/sxmsuitm.hxx>
#include <sxmtaitm.hxx>
#include <svx/sxmtfitm.hxx>
#include <svx/sxmtpitm.hxx>
@@ -627,7 +625,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName)
// FractionItem
-TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem);
SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn):
SfxPoolItem(nId)
@@ -698,7 +695,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
// ScaleItem
-TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
bool SdrScaleItem::GetPresentation(
SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
@@ -740,7 +736,6 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const
// OnOffItem
-TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem);
SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -772,7 +767,6 @@ bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -808,7 +802,6 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
// class SdrPercentItem
-TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item);
SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -842,7 +835,6 @@ bool SdrPercentItem::GetPresentation(
// class SdrAngleItem
-TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item);
SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -931,7 +923,6 @@ bool SdrAngleItem::GetPresentation(
// class SdrMetricItem
-TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item);
SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -982,7 +973,6 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
// items of the legend object
-TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); }
@@ -1008,7 +998,6 @@ bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); }
@@ -1039,7 +1028,8 @@ bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
// FitToSize
-TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
+
+SfxPoolItem* SdrTextFitToSizeTypeItem::CreateDefault() { return new SdrTextFitToSizeTypeItem; }
SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); }
@@ -1099,7 +1089,6 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); }
@@ -1148,7 +1137,6 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); }
@@ -1197,7 +1185,6 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); }
@@ -1245,7 +1232,6 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); }
@@ -1294,7 +1280,6 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMembe
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); }
@@ -1317,7 +1302,6 @@ bool SdrTextAniDelayItem::GetPresentation(
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); }
@@ -1374,7 +1358,7 @@ bool SdrTextAniAmountItem::GetPresentation(
return true;
}
-TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
+
SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( bool bUseFixedCellHeight )
: SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight )
{
@@ -1438,7 +1422,6 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe
return true;
}
-TYPEINIT1_AUTOFACTORY( SdrCustomShapeAdjustmentItem, SfxPoolItem );
SdrCustomShapeAdjustmentItem::SdrCustomShapeAdjustmentItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_ADJUSTMENT )
{
@@ -1584,7 +1567,6 @@ bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*n
}
// EdgeKind
-TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); }
@@ -1721,7 +1703,6 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); }
@@ -1769,7 +1750,6 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); }
@@ -1817,7 +1797,6 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); }
@@ -1865,7 +1844,6 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); }
@@ -1914,7 +1892,6 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
return true;
}
-TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); }
@@ -1966,8 +1943,6 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
// class SdrSignedPercentItem
-TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item );
-
SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -1997,7 +1972,6 @@ bool SdrSignedPercentItem::GetPresentation(
return true;
}
-TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem );
SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2009,7 +1983,6 @@ SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrGrafRedItem( rIn );
}
-TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem );
SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2021,7 +1994,6 @@ SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrGrafGreenItem( rIn );
}
-TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem );
SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2033,7 +2005,6 @@ SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrGrafBlueItem( rIn );
}
-TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem );
SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2045,7 +2016,6 @@ SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c
return new SdrGrafLuminanceItem( rIn );
}
-TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem );
SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2057,7 +2027,6 @@ SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co
return new SdrGrafContrastItem( rIn );
}
-TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item );
SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const
{
@@ -2085,7 +2054,6 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*
return true;
}
-TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem );
SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2097,7 +2065,6 @@ SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons
return new SdrGrafInvertItem( rIn );
}
-TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem );
SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2109,7 +2076,6 @@ SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/
return new SdrGrafTransparenceItem( rIn );
}
-TYPEINIT1( SdrGrafModeItem, SfxEnumItem );
SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
{
@@ -2174,7 +2140,6 @@ bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
return true;
}
-TYPEINIT1( SdrGrafCropItem, SvxGrfCrop );
SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const
{
@@ -2191,5 +2156,97 @@ sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const
// GRFCROP_VERSION_MOVETOSVX is 1
return GRFCROP_VERSION_MOVETOSVX;
}
+SdrTextAniStartInsideItem::~SdrTextAniStartInsideItem()
+{
+}
+SfxPoolItem* SdrTextAniStartInsideItem::Clone(SfxItemPool* ) const
+{
+ return new SdrTextAniStartInsideItem(*this);
+}
+SdrTextAniStopInsideItem::~SdrTextAniStopInsideItem()
+{
+}
+SfxPoolItem* SdrTextAniStopInsideItem::Clone(SfxItemPool* ) const
+{
+ return new SdrTextAniStopInsideItem(*this);
+}
+SdrCaptionEscIsRelItem::~SdrCaptionEscIsRelItem()
+{
+}
+SfxPoolItem* SdrCaptionEscIsRelItem::Clone(SfxItemPool* ) const
+{
+ return new SdrCaptionEscIsRelItem(*this);
+}
+SdrCaptionEscRelItem::~SdrCaptionEscRelItem()
+{
+}
+SfxPoolItem* SdrCaptionEscRelItem::Clone(SfxItemPool*) const
+{
+ return new SdrCaptionEscRelItem(*this);
+}
+SdrCaptionFitLineLenItem::~SdrCaptionFitLineLenItem()
+{
+}
+SfxPoolItem* SdrCaptionFitLineLenItem::Clone(SfxItemPool* ) const
+{
+ return new SdrCaptionFitLineLenItem(*this);
+}
+SdrCaptionLineLenItem::~SdrCaptionLineLenItem()
+{
+}
+SfxPoolItem* SdrCaptionLineLenItem::Clone(SfxItemPool*) const
+{
+ return new SdrCaptionLineLenItem(*this);
+}
+SdrMeasureBelowRefEdgeItem::~SdrMeasureBelowRefEdgeItem()
+{
+}
+SfxPoolItem* SdrMeasureBelowRefEdgeItem::Clone(SfxItemPool* ) const
+{
+ return new SdrMeasureBelowRefEdgeItem(*this);
+}
+SdrMeasureTextIsFixedAngleItem::~SdrMeasureTextIsFixedAngleItem()
+{
+}
+SfxPoolItem* SdrMeasureTextIsFixedAngleItem::Clone(SfxItemPool* ) const
+{
+ return new SdrMeasureTextIsFixedAngleItem(*this);
+}
+SdrMeasureTextFixedAngleItem::~SdrMeasureTextFixedAngleItem()
+{
+}
+SfxPoolItem* SdrMeasureTextFixedAngleItem::Clone(SfxItemPool* ) const
+{
+ return new SdrMeasureTextFixedAngleItem(*this);
+}
+SdrMeasureDecimalPlacesItem::~SdrMeasureDecimalPlacesItem()
+{
+}
+SfxPoolItem* SdrMeasureDecimalPlacesItem::Clone(SfxItemPool* ) const
+{
+ return new SdrMeasureDecimalPlacesItem(*this);
+}
+SdrMeasureTextRota90Item::~SdrMeasureTextRota90Item()
+{
+}
+SfxPoolItem* SdrMeasureTextRota90Item::Clone(SfxItemPool* ) const
+{
+ return new SdrMeasureTextRota90Item(*this);
+}
+SdrMeasureTextUpsideDownItem::~SdrMeasureTextUpsideDownItem()
+{
+}
+SfxPoolItem* SdrMeasureTextUpsideDownItem::Clone(SfxItemPool* ) const
+{
+ return new SdrMeasureTextUpsideDownItem(*this);
+}
+SdrCustomShapeReplacementURLItem::~SdrCustomShapeReplacementURLItem()
+{
+}
+SfxPoolItem* SdrCustomShapeReplacementURLItem::Clone( SfxItemPool*) const
+{
+ return new SdrCustomShapeReplacementURLItem(*this);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 709ba718ea4d..89f7c3fb3772 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -454,7 +454,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
pAktCreate->SetMergedItemSet(maDefaultAttr);
}
- if (mpModel && HAS_BASE(SdrCaptionObj,pAktCreate))
+ if (mpModel && dynamic_cast<const SdrCaptionObj *>(pAktCreate) != nullptr)
{
SfxItemSet aSet(mpModel->GetItemPool());
aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index b643c4fb7e47..5192ad7ee023 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -34,7 +34,6 @@ protected:
virtual void createSdrDragEntries() override;
public:
- TYPEINFO_OVERRIDE();
explicit SdrDragMovHdl(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -55,7 +54,6 @@ private:
bool bRight;
public:
- TYPEINFO_OVERRIDE();
explicit SdrDragRotate(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -81,7 +79,6 @@ private:
bool bSlant;
public:
- TYPEINFO_OVERRIDE();
SdrDragShear(SdrDragView& rNewView,bool bSlant1);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -105,7 +102,6 @@ private:
bool ImpCheckSide(const Point& rPnt) const;
public:
- TYPEINFO_OVERRIDE();
explicit SdrDragMirror(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -128,7 +124,6 @@ private:
bool bIsGradient : 1;
public:
- TYPEINFO_OVERRIDE();
SdrDragGradient(SdrDragView& rNewView, bool bGrad = true);
bool IsGradient() const { return bIsGradient; }
@@ -177,7 +172,6 @@ protected:
virtual void createSdrDragEntries() override;
public:
- TYPEINFO_OVERRIDE();
explicit SdrDragCrook(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -208,7 +202,6 @@ protected:
virtual void createSdrDragEntries() override;
public:
- TYPEINFO_OVERRIDE();
explicit SdrDragDistort(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -226,7 +219,6 @@ public:
class SdrDragCrop : public SdrDragObjOwn
{
public:
- TYPEINFO_OVERRIDE();
explicit SdrDragCrop(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const override;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d97ef1b85278..bff9a6c0aead 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -302,7 +302,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create
-TYPEINIT0(SdrDragMethod);
void SdrDragMethod::resetSdrDragEntries()
{
@@ -965,7 +964,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla
-TYPEINIT1(SdrDragMovHdl,SdrDragMethod);
SdrDragMovHdl::SdrDragMovHdl(SdrDragView& rNewView)
: SdrDragMethod(rNewView)
@@ -1181,7 +1179,6 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const
-TYPEINIT1(SdrDragObjOwn,SdrDragMethod);
SdrDragObjOwn::SdrDragObjOwn(SdrDragView& rNewView)
: SdrDragMethod(rNewView),
@@ -1488,7 +1485,6 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const
-TYPEINIT1(SdrDragMove,SdrDragMethod);
void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/)
{
@@ -1767,7 +1763,6 @@ Pointer SdrDragMove::GetSdrDragPointer() const
-TYPEINIT1(SdrDragResize,SdrDragMethod);
SdrDragResize::SdrDragResize(SdrDragView& rNewView)
: SdrDragMethod(rNewView),
@@ -2104,7 +2099,6 @@ Pointer SdrDragResize::GetSdrDragPointer() const
-TYPEINIT1(SdrDragRotate,SdrDragMethod);
void SdrDragRotate::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
{
@@ -2241,7 +2235,6 @@ Pointer SdrDragRotate::GetSdrDragPointer() const
-TYPEINIT1(SdrDragShear,SdrDragMethod);
SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1)
: SdrDragMethod(rNewView),
@@ -2523,7 +2516,6 @@ Pointer SdrDragShear::GetSdrDragPointer() const
-TYPEINIT1(SdrDragMirror,SdrDragMethod);
void SdrDragMirror::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
{
@@ -2654,7 +2646,6 @@ Pointer SdrDragMirror::GetSdrDragPointer() const
-TYPEINIT1(SdrDragGradient, SdrDragMethod);
SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad)
: SdrDragMethod(rNewView),
@@ -2815,7 +2806,6 @@ Pointer SdrDragGradient::GetSdrDragPointer() const
-TYPEINIT1(SdrDragCrook,SdrDragMethod);
SdrDragCrook::SdrDragCrook(SdrDragView& rNewView)
: SdrDragMethod(rNewView),
@@ -3452,7 +3442,6 @@ Pointer SdrDragCrook::GetSdrDragPointer() const
-TYPEINIT1(SdrDragDistort,SdrDragMethod);
SdrDragDistort::SdrDragDistort(SdrDragView& rNewView)
: SdrDragMethod(rNewView),
@@ -3606,7 +3595,6 @@ void SdrDragDistort::applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPol
-TYPEINIT1(SdrDragCrop,SdrDragObjOwn);
SdrDragCrop::SdrDragCrop(SdrDragView& rNewView)
: SdrDragObjOwn(rNewView)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 62b2b81bc059..88dc38a92243 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -725,7 +725,7 @@ bool SdrDragView::IsInsGluePointPossible() const
{
// return sal_False, if only 1 object which is a connector.
const SdrObject* pObj=GetMarkedObjectByIndex(0);
- if (!HAS_BASE(SdrEdgeObj,pObj))
+ if (dynamic_cast<const SdrEdgeObj *>(pObj) == nullptr)
{
bRet=true;
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index ecd92f45b54b..646d2c064f32 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -85,7 +85,7 @@ public:
SfxItemState eState;
sal_uInt16 nWhichId;
- TypeId pType;
+ const std::type_info* pType;
ItemType eItemType;
sal_Int32 nVal;
@@ -925,7 +925,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
if (eState!=SfxItemState::DISABLED) {
const SfxPoolItem& rItem=pSet->Get(nWhich);
sal_uInt16 nIndent=0;
- if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) {
+ if (dynamic_cast<const SfxVoidItem *>(&rItem) == nullptr && dynamic_cast<const SfxSetItem *>(&rItem) == nullptr
+ && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) {
OUString aCommentStr;
INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,"L I N E");
@@ -967,29 +968,29 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
aEntry.eState=eState;
aEntry.nWhichId=nWhich;
if (!IsInvalidItem(&rItem)) {
- aEntry.pType=rItem.Type();
+ aEntry.pType=&typeid(&typeid(rItem));
aEntry.nMax=0x7FFFFFFF;
aEntry.nMin=-aEntry.nMax;
aEntry.nVal=-4711;
- if (HAS_BASE(SfxByteItem ,&rItem)) aEntry.eItemType=ITEM_BYTE;
- else if (HAS_BASE(SfxInt16Item ,&rItem)) aEntry.eItemType=ITEM_INT16;
- else if (HAS_BASE(SfxUInt16Item ,&rItem)) aEntry.eItemType=ITEM_UINT16;
- else if (HAS_BASE(SfxInt32Item ,&rItem)) aEntry.eItemType=ITEM_INT32;
- else if (HAS_BASE(SfxUInt32Item ,&rItem)) aEntry.eItemType=ITEM_UINT32;
- else if (HAS_BASE(SfxEnumItemInterface,&rItem)) aEntry.eItemType=ITEM_ENUM;
- else if (HAS_BASE(SfxBoolItem ,&rItem)) aEntry.eItemType=ITEM_BOOL;
- else if (HAS_BASE(SfxFlagItem ,&rItem)) aEntry.eItemType=ITEM_FLAG;
- else if (HAS_BASE(XColorItem ,&rItem)) aEntry.eItemType=ITEM_XCOLOR;
- else if (HAS_BASE(SfxStringItem ,&rItem)) aEntry.eItemType=ITEM_STRING;
- else if (HAS_BASE(SfxPointItem ,&rItem)) aEntry.eItemType=ITEM_POINT;
- else if (HAS_BASE(SfxRectangleItem,&rItem)) aEntry.eItemType=ITEM_RECT;
- else if (HAS_BASE(SfxRangeItem ,&rItem)) aEntry.eItemType=ITEM_RANGE;
- else if (HAS_BASE(SdrFractionItem ,&rItem)) aEntry.eItemType=ITEM_FRACTION;
- else if (HAS_BASE(SvxColorItem ,&rItem)) aEntry.eItemType=ITEM_COLOR;
- else if (HAS_BASE(SvxFontItem ,&rItem)) aEntry.eItemType=ITEM_FONT;
- else if (HAS_BASE(SvxFontHeightItem,&rItem))aEntry.eItemType=ITEM_FONTHEIGHT;
- else if (HAS_BASE(SvxCharScaleWidthItem,&rItem)) aEntry.eItemType=ITEM_FONTWIDTH;
- else if (HAS_BASE(SvxFieldItem ,&rItem)) aEntry.eItemType=ITEM_FIELD;
+ if (dynamic_cast<const SfxByteItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_BYTE;
+ else if (dynamic_cast<const SfxInt16Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_INT16;
+ else if (dynamic_cast<const SfxUInt16Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_UINT16;
+ else if (dynamic_cast<const SfxInt32Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_INT32;
+ else if (dynamic_cast<const SfxUInt32Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_UINT32;
+ else if (dynamic_cast<const SfxEnumItemInterface *>(&rItem) != nullptr) aEntry.eItemType=ITEM_ENUM;
+ else if (dynamic_cast<const SfxBoolItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_BOOL;
+ else if (dynamic_cast<const SfxFlagItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FLAG;
+ else if (dynamic_cast<const XColorItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_XCOLOR;
+ else if (dynamic_cast<const SfxStringItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_STRING;
+ else if (dynamic_cast<const SfxPointItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_POINT;
+ else if (dynamic_cast<const SfxRectangleItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_RECT;
+ else if (dynamic_cast<const SfxRangeItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_RANGE;
+ else if (dynamic_cast<const SdrFractionItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FRACTION;
+ else if (dynamic_cast<const SvxColorItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_COLOR;
+ else if (dynamic_cast<const SvxFontItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FONT;
+ else if (dynamic_cast<const SvxFontHeightItem *>(&rItem) != nullptr)aEntry.eItemType=ITEM_FONTHEIGHT;
+ else if (dynamic_cast<const SvxCharScaleWidthItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FONTWIDTH;
+ else if (dynamic_cast<const SvxFieldItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FIELD;
switch (aEntry.eItemType) {
case ITEM_BYTE : aEntry.bIsNum = true; aEntry.nVal=static_cast<const SfxByteItem &>(rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=255; break;
case ITEM_INT16 : aEntry.bIsNum = true; aEntry.nVal=static_cast<const SfxInt16Item &>(rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break;
@@ -1187,7 +1188,7 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, vo
case ITEM_INT16 : static_cast<SfxInt16Item *>(pNewItem)->SetValue((sal_Int16 )nLongVal); break;
case ITEM_UINT16: static_cast<SfxUInt16Item*>(pNewItem)->SetValue((sal_uInt16)nLongVal); break;
case ITEM_INT32: {
- if(HAS_BASE(SdrAngleItem, pNewItem))
+ if(dynamic_cast<const SdrAngleItem *>(pNewItem) != nullptr)
{
aNewText = aNewText.replace(',', '.');
double nVal = aNewText.toFloat();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 7df403858ee3..de7e1c62fc33 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -105,7 +105,6 @@ struct SdrModelImpl
-TYPEINIT1(SdrModel,SfxBroadcaster);
void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper,
bool bUseExtColorTable, bool bLoadRefCounts)
{
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 04acaef39c32..1e51ae6935fb 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -833,7 +833,6 @@ sdr::properties::BaseProperties* SdrObjCustomShape::CreateObjectSpecificProperti
return new sdr::properties::CustomShapeProperties(*this);
}
-TYPEINIT1(SdrObjCustomShape,SdrTextObj);
SdrObjCustomShape::SdrObjCustomShape() :
SdrTextObj(),
fObjectRotation( 0.0 ),
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index d96f92d1e218..e6102e9e21b4 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -81,7 +81,6 @@ sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties()
-TYPEINIT1(SdrAttrObj,SdrObject);
SdrAttrObj::SdrAttrObj()
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index d02a1b53a20f..5cbef0802e3e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -98,7 +98,6 @@
#include <sxlayitm.hxx>
#include <sxlogitm.hxx>
#include <sxmovitm.hxx>
-#include <svx/sxmspitm.hxx>
#include <sxoneitm.hxx>
#include <sxonitm.hxx>
#include <sxopitm.hxx>
@@ -143,7 +142,6 @@ using namespace ::com::sun::star;
-TYPEINIT0(SdrObjUserCall);
SdrObjUserCall::~SdrObjUserCall()
{
@@ -298,7 +296,6 @@ void SdrObject::SetBoundRectDirty()
-TYPEINIT1(SdrObject,SfxListener);
SdrObject::SdrObject() :
mpImpl(new Impl),
@@ -2195,8 +2192,8 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const
{
const Rectangle& rSnap=GetSnapRect();
const Rectangle& rLogic=GetLogicRect();
- lcl_SetItem(rAttr,bMerge,makeSdrObjMoveProtectItem(IsMoveProtect()));
- lcl_SetItem(rAttr,bMerge,makeSdrObjSizeProtectItem(IsResizeProtect()));
+ lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect()));
+ lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect()));
lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable()));
lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible()));
lcl_SetItem(rAttr,bMerge,makeSdrRotateAngleItem(GetRotateAngle()));
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index aac0488f37b5..fc3b0f03ebd1 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -193,7 +193,6 @@ sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrCaptionObj,SdrRectObj);
SdrCaptionObj::SdrCaptionObj():
SdrRectObj(OBJ_TEXT),
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 7f99164f541e..b0a8c62341df 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -106,7 +106,6 @@ sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrCircObj,SdrRectObj);
SdrCircObj::SdrCircObj(SdrObjKind eNewKind)
{
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index e7556d4ca866..553ec70bef34 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -164,7 +164,6 @@ sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact()
}
-TYPEINIT1(SdrEdgeObj,SdrTextObj);
SdrEdgeObj::SdrEdgeObj()
: SdrTextObj(),
@@ -2128,7 +2127,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
Rectangle aObjBound(pObj->GetCurrentBoundRect());
if (aObjBound.IsOver(aMouseRect)) {
aTestCon.ResetVars();
- bool bEdge=HAS_BASE(SdrEdgeObj,pObj); // no BestCon for Edge
+ bool bEdge=dynamic_cast<const SdrEdgeObj *>(pObj) != nullptr; // no BestCon for Edge
// User-defined connectors have absolute priority.
// After those come Vertex, Corner and center (Best), all prioritized equally.
// Finally, a HitTest for the object.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index cea2d2d8fea1..9c37084504fa 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -330,7 +330,6 @@ void SdrGrafObj::onGraphicChanged()
}
}
-TYPEINIT1(SdrGrafObj,SdrRectObj);
SdrGrafObj::SdrGrafObj()
: SdrRectObj(),
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 679b42842d5a..7cbaf43f1dce 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -68,7 +68,6 @@ sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrObjGroup,SdrObject);
SdrObjGroup::SdrObjGroup()
{
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 130710e740a9..5f65f17e8d33 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -56,7 +56,6 @@
#include <svx/sxmlhitm.hxx>
#include <sxmoitm.hxx>
#include <sxmsitm.hxx>
-#include <svx/sxmsuitm.hxx>
#include <sxmtaitm.hxx>
#include <svx/sxmtfitm.hxx>
#include <svx/sxmtpitm.hxx>
@@ -212,7 +211,6 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrMeasureObj,SdrTextObj);
SdrMeasureObj::SdrMeasureObj():
bTextDirty(false)
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 64a07c6a1f09..939ac77b4abe 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -77,7 +77,6 @@ struct SdrMediaObj::Impl
OUString m_LastFailedPkgURL;
};
-TYPEINIT1( SdrMediaObj, SdrRectObj );
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index bec870ba25b7..e786dbfb56e3 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -782,7 +782,6 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrOle2Obj,SdrRectObj);
SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) :
mpImpl(new SdrOle2ObjImpl(bFrame_))
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 33ea8b5839cd..1b3f0edc36e0 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -66,7 +66,6 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage)
-TYPEINIT1(SdrPageObj,SdrObject);
SdrPageObj::SdrPageObj(SdrPage* pNewPage)
: mpShownPage(pNewPage)
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 0b41030f8f50..73a57eee16c2 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1664,7 +1664,6 @@ sdr::contact::ViewContact* SdrPathObj::CreateObjectSpecificViewContact()
return new sdr::contact::ViewContactOfSdrPathObj(*this);
}
-TYPEINIT1(SdrPathObj,SdrTextObj);
SdrPathObj::SdrPathObj(SdrObjKind eNewKind)
: meKind(eNewKind),
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 1750e0c647cc..009164499f4e 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -63,7 +63,6 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrRectObj,SdrTextObj);
SdrRectObj::SdrRectObj()
: mpXPoly(nullptr)
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 5a5796d7e63c..6de973428c77 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -82,7 +82,6 @@ sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrTextObj,SdrAttrObj);
SdrTextObj::SdrTextObj()
: SdrAttrObj(),
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 04c39c959932..87eca7696a01 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -264,10 +264,10 @@ bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
if (bRet)
{
SetRectsDirty();
- if (HAS_BASE(SdrRectObj,this)) { // this is a hack
+ if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { // this is a hack
static_cast<SdrRectObj*>(this)->SetXPolyDirty();
}
- if (HAS_BASE(SdrCaptionObj,this)) { // this is a hack
+ if (dynamic_cast<const SdrCaptionObj *>(this) != nullptr) { // this is a hack
static_cast<SdrCaptionObj*>(this)->ImpRecalcTail();
}
}
@@ -282,10 +282,10 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
maRect = aNeuRect;
SetRectsDirty();
- if (HAS_BASE(SdrRectObj,this)) { // this is a hack
+ if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { // this is a hack
static_cast<SdrRectObj*>(this)->SetXPolyDirty();
}
- if (HAS_BASE(SdrCaptionObj,this)) { // this is a hack
+ if (dynamic_cast<const SdrCaptionObj *>(this) != nullptr) { // this is a hack
static_cast<SdrCaptionObj*>(this)->ImpRecalcTail();
}
SetChanged();
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 95a419b36362..004453006a86 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -200,7 +200,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat)
maRect = aRect1; // for ObjName
SetBoundRectDirty();
bSnapRectDirty=true;
- if (HAS_BASE(SdrRectObj,this)) {
+ if (dynamic_cast<const SdrRectObj *>(this) != nullptr) {
static_cast<SdrRectObj*>(this)->SetXPolyDirty();
}
return true;
@@ -214,7 +214,7 @@ bool SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
AdaptTextMinSize();
SetRectsDirty();
- if (HAS_BASE(SdrRectObj,this)) {
+ if (dynamic_cast<const SdrRectObj *>(this) != nullptr) {
static_cast<SdrRectObj*>(this)->SetXPolyDirty();
}
return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2);
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index b68a5574eb6b..d51809ad0372 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -147,7 +147,6 @@ namespace
}
}
-TYPEINIT1(SdrUnoObj, SdrRectObj);
SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 0ab775b068ea..9c16a472a3f8 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -45,7 +45,6 @@ sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrVirtObj,SdrObject);
SdrVirtObj::SdrVirtObj(SdrObject& rNewObj):
rRefObj(rNewObj)
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 91e6ad534024..432648dc6a59 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -71,7 +71,6 @@ public:
static const sal_Int32 InitialObjectContainerCapacity (64);
-TYPEINIT0(SdrObjList);
SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList):
maList(),
@@ -1195,7 +1194,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet)
-TYPEINIT1(SdrPage,SdrObjList);
SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
: SdrObjList(&rNewModel, this),
mpViewContact(nullptr),
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 8580edeca204..35f12113ad9f 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -155,7 +155,6 @@ BitmapEx convertMetafileToBitmapEx(
-TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget);
void SdrPaintView::ImpClearVars()
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 34dc6f961738..f9132dc38ec6 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -57,7 +57,6 @@ static void ImplUnmarkObject( SdrObject* pObj )
-TYPEINIT1(SdrUndoAction,SfxUndoAction);
SdrUndoAction::~SdrUndoAction() {}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 1bac9f79fa7a..526a7b281c13 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -154,7 +154,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay()
}
-TYPEINIT1(SdrView,SdrCreateView);
SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
: SdrCreateView(pModel1,pOut),
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 0a24b8feb793..71b0b5a0b9b7 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -750,7 +750,6 @@ sdr::contact::ViewContact* SdrTableObj::CreateObjectSpecificViewContact()
-TYPEINIT1(SdrTableObj,SdrTextObj);
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index ab438026d05b..b5ac4d8917f6 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -64,7 +64,6 @@ using namespace ::com::sun::star::lang;
#define ITEMVALUE(ItemSet,Id,Cast) static_cast<const Cast&>((ItemSet).Get(Id)).GetValue()
#define TOOLBOX_NAME OUString( "colorbar" )
-TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item );
TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) :
SfxUInt16Item( _nWhich, nImage )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index aa313c5f2129..0c7de3d39641 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2799,13 +2799,13 @@ SfxToolBoxControl* SvxColorToolBoxControl::CreateImpl( sal_uInt16 nSlotId, sal_u
void SvxColorToolBoxControl::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod)
{
if ( nSlotId == SID_ATTR_LINE_COLOR )
- SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(XLineColorItem), nSlotId ) );
+ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(XLineColorItem), nSlotId ) );
else if ( nSlotId == SID_ATTR_FILL_COLOR )
- SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(XFillColorItem), nSlotId ) );
+ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(XFillColorItem), nSlotId ) );
else if ( nSlotId == SID_ATTR_CHAR_BACK_COLOR )
- SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(SvxBackgroundColorItem), nSlotId ) );
+ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(SvxBackgroundColorItem), nSlotId ) );
else
- SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(SvxColorItem), nSlotId ) );
+ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(SvxColorItem), nSlotId ) );
}
// class SvxFrameToolBoxControl --------------------------------------------
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index aeac1938cc26..38b4eeb575d9 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -61,7 +61,6 @@ void ExtrusionBar::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_EXTRUSION_BAR);
}
-TYPEINIT1( ExtrusionBar, SfxShell );
ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell )
: SfxShell(pViewShell)
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 9409515b6bbb..ee0132b7b578 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -178,7 +178,6 @@ void FontworkBar::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_FONTWORK_BAR);
}
-TYPEINIT1( FontworkBar, SfxShell );
FontworkBar::FontworkBar(SfxViewShell* pViewShell )
: SfxShell(pViewShell)
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 4b5f51baec61..f2adb3164765 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -60,7 +60,6 @@ using namespace ::com::sun::star;
#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol))
-TYPEINIT1_AUTOFACTORY(NameOrIndex, SfxStringItem);
long ScaleMetricValue( long nVal, long nMul, long nDiv )
{
@@ -268,7 +267,7 @@ void NameOrIndex::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex);
+SfxPoolItem* XColorItem::CreateDefault() { return new XColorItem; }
XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) :
NameOrIndex(_nWhich, nIndex),
@@ -357,7 +356,8 @@ bool XColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
// --- line attributes ---
-TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
+
+SfxPoolItem* XLineStyleItem::CreateDefault() { return new XLineStyleItem; }
XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) :
SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
@@ -648,7 +648,7 @@ double XDash::CreateDotDashArray(::std::vector< double >& rDotDashArray, double
return fFullDotDashLen;
}
-TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
+SfxPoolItem* XLineDashItem::CreateDefault() {return new XLineDashItem;}
XLineDashItem::XLineDashItem(const OUString& rName, const XDash& rTheDash) :
NameOrIndex(XATTR_LINEDASH, rName),
@@ -1014,7 +1014,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const
return nullptr;
}
-TYPEINIT1_AUTOFACTORY(XLineWidthItem, SfxMetricItem);
+SfxPoolItem* XLineWidthItem::CreateDefault() {return new XLineWidthItem;}
XLineWidthItem::XLineWidthItem(long nWidth) :
SfxMetricItem(XATTR_LINEWIDTH, nWidth)
@@ -1071,7 +1071,7 @@ bool XLineWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
-TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
+SfxPoolItem* XLineColorItem::CreateDefault() { return new XLineColorItem; }
XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
@@ -1222,7 +1222,7 @@ namespace
}
}
-TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
+SfxPoolItem* XLineStartItem::CreateDefault() {return new XLineStartItem;}
XLineStartItem::XLineStartItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINESTART, nIndex)
@@ -1564,7 +1564,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
return nullptr;
}
-TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
+SfxPoolItem* XLineEndItem::CreateDefault() {return new XLineEndItem;}
XLineEndItem::XLineEndItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINEEND, nIndex)
@@ -1905,7 +1905,7 @@ bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
-TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem);
+SfxPoolItem* XLineStartWidthItem::CreateDefault() {return new XLineStartWidthItem;}
XLineStartWidthItem::XLineStartWidthItem(long nWidth) :
SfxMetricItem(XATTR_LINESTARTWIDTH, nWidth)
@@ -1955,7 +1955,7 @@ bool XLineStartWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemb
return true;
}
-TYPEINIT1_AUTOFACTORY(XLineEndWidthItem, SfxMetricItem);
+SfxPoolItem* XLineEndWidthItem::CreateDefault() {return new XLineEndWidthItem;}
XLineEndWidthItem::XLineEndWidthItem(long nWidth) :
SfxMetricItem(XATTR_LINEENDWIDTH, nWidth)
@@ -2005,7 +2005,7 @@ bool XLineEndWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMember
return true;
}
-TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
+SfxPoolItem* XLineStartCenterItem::CreateDefault() {return new XLineStartCenterItem;}
XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) :
SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
@@ -2056,7 +2056,7 @@ bool XLineStartCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMem
return true;
}
-TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
+SfxPoolItem* XLineEndCenterItem::CreateDefault() {return new XLineEndCenterItem;}
XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) :
SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
@@ -2109,7 +2109,8 @@ bool XLineEndCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMembe
// --- fill attributes ---
-TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem);
+
+SfxPoolItem* XFillStyleItem::CreateDefault() { return new XFillStyleItem; }
XFillStyleItem::XFillStyleItem(drawing::FillStyle eFillStyle) :
SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle))
@@ -2211,7 +2212,8 @@ void XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
+
+SfxPoolItem* XFillColorItem::CreateDefault() { return new XFillColorItem; }
XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
@@ -2274,8 +2276,7 @@ void XFillColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(GetColorValue().AsRGBHexString().toUtf8().getStr()));
xmlTextWriterEndElement(pWriter);
}
-
-TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
+SfxPoolItem* XSecondaryFillColorItem::CreateDefault() {return new XSecondaryFillColorItem;}
XSecondaryFillColorItem::XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor)
@@ -2363,7 +2364,8 @@ bool XGradient::operator==(const XGradient& rGradient) const
nStepCount == rGradient.nStepCount );
}
-TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
+
+SfxPoolItem* XFillGradientItem::CreateDefault() { return new XFillGradientItem; }
XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
const XGradient& rTheGradient) :
@@ -2748,7 +2750,8 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con
return nullptr;
}
-TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
+
+SfxPoolItem* XFillFloatTransparenceItem::CreateDefault() { return new XFillFloatTransparenceItem; }
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
bEnabled( false )
@@ -2871,7 +2874,8 @@ bool XHatch::operator==(const XHatch& rHatch) const
nAngle == rHatch.nAngle );
}
-TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
+
+SfxPoolItem* XFillHatchItem::CreateDefault() { return new XFillHatchItem; }
XFillHatchItem::XFillHatchItem(const OUString& rName,
const XHatch& rTheHatch) :
@@ -3156,7 +3160,8 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const
// --- form text attributes ---
-TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem);
+
+SfxPoolItem* XFormTextStyleItem::CreateDefault() { return new XFormTextStyleItem; }
XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) :
SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle))
@@ -3198,7 +3203,8 @@ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
return true;
}
-TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem);
+
+SfxPoolItem* XFormTextAdjustItem::CreateDefault() { return new XFormTextAdjustItem; }
XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) :
SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust))
@@ -3240,7 +3246,8 @@ bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*
return true;
}
-TYPEINIT1_AUTOFACTORY(XFormTextDistanceItem, SfxMetricItem);
+
+SfxPoolItem* XFormTextDistanceItem::CreateDefault() { return new XFormTextDistanceItem; }
XFormTextDistanceItem::XFormTextDistanceItem(long nDist) :
SfxMetricItem(XATTR_FORMTXTDISTANCE, nDist)
@@ -3262,7 +3269,7 @@ SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
return new XFormTextDistanceItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextStartItem, SfxMetricItem);
+SfxPoolItem* XFormTextStartItem::CreateDefault() { return new XFormTextStartItem; }
XFormTextStartItem::XFormTextStartItem(long nStart) :
SfxMetricItem(XATTR_FORMTXTSTART, nStart)
@@ -3284,7 +3291,8 @@ SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
return new XFormTextStartItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
+
+SfxPoolItem* XFormTextMirrorItem::CreateDefault() { return new XFormTextMirrorItem; }
XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) :
SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
@@ -3306,7 +3314,8 @@ SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
return new XFormTextMirrorItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
+
+SfxPoolItem* XFormTextOutlineItem::CreateDefault() { return new XFormTextOutlineItem; }
XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) :
SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
@@ -3328,7 +3337,8 @@ SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co
return new XFormTextOutlineItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem);
+
+SfxPoolItem* XFormTextShadowItem::CreateDefault() { return new XFormTextShadowItem; }
XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) :
SfxEnumItem(
@@ -3371,7 +3381,8 @@ bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*
return true;
}
-TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
+
+SfxPoolItem* XFormTextShadowColorItem::CreateDefault() { return new XFormTextShadowColorItem; }
XFormTextShadowColorItem::XFormTextShadowColorItem(const OUString& rName,
const Color& rTheColor) :
@@ -3394,7 +3405,8 @@ SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/
return new XFormTextShadowColorItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextShadowXValItem, SfxMetricItem);
+
+SfxPoolItem* XFormTextShadowXValItem::CreateDefault() { return new XFormTextShadowXValItem; }
XFormTextShadowXValItem::XFormTextShadowXValItem(long nVal) :
SfxMetricItem(XATTR_FORMTXTSHDWXVAL, nVal)
@@ -3416,7 +3428,8 @@ SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
return new XFormTextShadowXValItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextShadowYValItem, SfxMetricItem);
+
+SfxPoolItem* XFormTextShadowYValItem::CreateDefault() { return new XFormTextShadowYValItem; }
XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) :
SfxMetricItem(XATTR_FORMTXTSHDWYVAL, nVal)
@@ -3438,7 +3451,8 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
return new XFormTextShadowYValItem(rIn);
}
-TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
+
+SfxPoolItem* XFormTextHideFormItem::CreateDefault() { return new XFormTextHideFormItem; }
XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) :
SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
@@ -3462,7 +3476,6 @@ SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
// --- SetItems ---
-TYPEINIT1(XLineAttrSetItem, SfxSetItem);
/// a line attribute set item
XLineAttrSetItem::XLineAttrSetItem( SfxItemSet* pItemSet ) :
@@ -3508,7 +3521,6 @@ SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion )
}
-TYPEINIT1(XFillAttrSetItem, SfxSetItem);
/// fill attribute set item
XFillAttrSetItem::XFillAttrSetItem( SfxItemSet* pItemSet ) :
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 5aa7446c19c2..23c676025208 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -34,7 +34,7 @@
#include <libxml/xmlwriter.h>
-TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
+SfxPoolItem* XLineTransparenceItem::CreateDefault() {return new XLineTransparenceItem;}
XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
@@ -79,7 +79,8 @@ bool XLineTransparenceItem::GetPresentation
}
}
-TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
+
+SfxPoolItem* XLineJointItem::CreateDefault() { return new XLineJointItem; }
XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) :
SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
@@ -182,7 +183,6 @@ sal_uInt16 XLineJointItem::GetValueCount() const
return 5;
}
-TYPEINIT1_AUTOFACTORY(AffineMatrixItem, SfxPoolItem);
AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix)
: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX)
@@ -283,7 +283,8 @@ bool AffineMatrixItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberI
return false;
}
-TYPEINIT1_AUTOFACTORY(XLineCapItem, SfxEnumItem);
+
+SfxPoolItem* XLineCapItem::CreateDefault() { return new XLineCapItem; }
XLineCapItem::XLineCapItem(css::drawing::LineCap eLineCap)
: SfxEnumItem(XATTR_LINECAP, sal::static_int_cast< sal_uInt16 >(eLineCap))
@@ -392,7 +393,7 @@ css::drawing::LineCap XLineCapItem::GetValue() const
return eRetval;
}
-TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
+SfxPoolItem* XFillTransparenceItem::CreateDefault() {return new XFillTransparenceItem;}
XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
@@ -445,7 +446,8 @@ void XFillTransparenceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
+
+SfxPoolItem* XFormTextShadowTranspItem::CreateDefault() { return new XFormTextShadowTranspItem; }
XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) :
SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence)
@@ -469,7 +471,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*
// class XFillGradientStepCountItem
-TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
+SfxPoolItem* XGradientStepCountItem::CreateDefault() {return new XGradientStepCountItem;}
XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
@@ -505,7 +507,8 @@ bool XGradientStepCountItem::GetPresentation
return true;
}
-TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
+
+SfxPoolItem* XFillBmpTileItem::CreateDefault() {return new XFillBmpTileItem;}
XFillBmpTileItem::XFillBmpTileItem( bool bTile ) :
SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
@@ -549,7 +552,8 @@ void XFillBmpTileItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class XFillBmpTilePosItem
-TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem );
+
+SfxPoolItem* XFillBmpPosItem::CreateDefault() {return new XFillBmpPosItem;}
XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
@@ -598,7 +602,7 @@ void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class XFillBmpTileSizeXItem
-TYPEINIT1_AUTOFACTORY( XFillBmpSizeXItem, SfxMetricItem );
+SfxPoolItem* XFillBmpSizeXItem::CreateDefault() {return new XFillBmpSizeXItem;}
XFillBmpSizeXItem::XFillBmpSizeXItem( long nSizeX ) :
SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX )
@@ -639,7 +643,8 @@ bool XFillBmpSizeXItem::HasMetrics() const
// class XFillBmpTileSizeYItem
-TYPEINIT1_AUTOFACTORY( XFillBmpSizeYItem, SfxMetricItem );
+
+SfxPoolItem* XFillBmpSizeYItem::CreateDefault() {return new XFillBmpSizeYItem;}
XFillBmpSizeYItem::XFillBmpSizeYItem( long nSizeY ) :
SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY )
@@ -680,7 +685,7 @@ bool XFillBmpSizeYItem::HasMetrics() const
// class XFillBmpTileLogItem
-TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
+SfxPoolItem* XFillBmpSizeLogItem::CreateDefault() {return new XFillBmpSizeLogItem;}
XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) :
SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
@@ -716,7 +721,8 @@ bool XFillBmpSizeLogItem::GetPresentation
// class XFillBmpTileOffXItem
-TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item );
+
+SfxPoolItem* XFillBmpTileOffsetXItem::CreateDefault() {return new XFillBmpTileOffsetXItem;}
XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX )
@@ -752,7 +758,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation
// class XFillBmpTileOffYItem
-TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item );
+SfxPoolItem* XFillBmpTileOffsetYItem::CreateDefault() {return new XFillBmpTileOffsetYItem;}
XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
@@ -786,7 +792,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation
return true;
}
-TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
+SfxPoolItem* XFillBmpStretchItem::CreateDefault() {return new XFillBmpStretchItem;}
XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) :
SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
@@ -830,7 +836,7 @@ void XFillBmpStretchItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class XFillBmpTileOffPosXItem
-TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item );
+SfxPoolItem* XFillBmpPosOffsetXItem::CreateDefault() {return new XFillBmpPosOffsetXItem;}
XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
@@ -866,7 +872,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation
// class XFillBmpTileOffPosYItem
-TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item );
+SfxPoolItem* XFillBmpPosOffsetYItem::CreateDefault() {return new XFillBmpPosOffsetYItem;}
XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
@@ -900,7 +906,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation
return true;
}
-TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
+SfxPoolItem* XFillBackgroundItem::CreateDefault() {return new XFillBackgroundItem;}
XFillBackgroundItem::XFillBackgroundItem( bool bFill ) :
SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index ac6c003f18b7..d5036a6d6d7e 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -199,7 +199,8 @@ void XOBitmap::Array2Bitmap()
bGraphicDirty = false;
}
-TYPEINIT1_AUTOFACTORY(XFillBitmapItem, NameOrIndex);
+
+SfxPoolItem* XFillBitmapItem::CreateDefault() { return new XFillBitmapItem; }
XFillBitmapItem::XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject)
: NameOrIndex(XATTR_FILLBITMAP, rName),
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 58f42512ca20..3d25df8ba2fc 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -121,7 +121,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
virtual const SwRect GetObjBoundRect() const override;
public:
- TYPEINFO_OVERRIDE();
SwAnchoredDrawObject();
virtual ~SwAnchoredDrawObject();
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index c02f0a20706c..803a3986ec1e 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
#define INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
-#include <tools/rtti.hxx>
#include <swtypes.hxx>
#include <swrect.hxx>
#include <libxml/xmlwriter.h>
@@ -208,7 +207,6 @@ class SW_DLLPUBLIC SwAnchoredObject
virtual const SwRect GetObjBoundRect() const = 0;
public:
- TYPEINFO();
virtual ~SwAnchoredObject();
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index dcd6dc99ccdd..8032bc9c1d6d 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_INC_CALBCK_HXX
#define INCLUDED_SW_INC_CALBCK_HXX
-#include <tools/rtti.hxx>
#include "swdllapi.h"
#include <boost/noncopyable.hpp>
#include <ring.hxx>
@@ -131,8 +130,6 @@ public:
const SwModify* GetRegisteredIn() const { return pRegisteredIn; }
SwModify* GetRegisteredIn() { return pRegisteredIn; }
- // needed for class SwClientIter
- TYPEINFO();
// get information about attribute
virtual bool GetInfo( SfxPoolItem& ) const { return true; }
@@ -300,7 +297,7 @@ public:
return static_cast<TElementType*>(Sync());
while(GetRightOfPos())
m_pPosition = GetRightOfPos();
- if(static_cast<SwClient*>(m_pPosition)->IsA(TYPE(TElementType)))
+ if(dynamic_cast<const TElementType *>(static_cast<SwClient*>(m_pPosition)) != nullptr)
return static_cast<TElementType*>(Sync());
return Previous();
}
@@ -308,14 +305,14 @@ public:
{
if(!IsChanged())
m_pPosition = GetRightOfPos();
- while(m_pPosition && !static_cast<SwClient*>(m_pPosition)->IsA( TYPE(TElementType) ) )
+ while(m_pPosition && dynamic_cast<const TElementType *>(static_cast<SwClient*>(m_pPosition)) == nullptr)
m_pPosition = GetRightOfPos();
return static_cast<TElementType*>(Sync());
}
TElementType* Previous()
{
m_pPosition = GetLeftOfPos();
- while(m_pPosition && !static_cast<SwClient*>(m_pPosition)->IsA( TYPE(TElementType) ) )
+ while(m_pPosition && dynamic_cast<const TElementType *>(static_cast<SwClient*>(m_pPosition)) == nullptr)
m_pPosition = GetLeftOfPos();
return static_cast<TElementType*>(Sync());
}
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 7a4d27ce2191..9c9c64d39a2f 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -56,7 +56,6 @@ public:
SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL);
virtual ~SwCondCollItem();
- TYPEINFO_OVERRIDE();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index a9d029924a01..7d5ad9c27479 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -36,7 +36,6 @@ class SW_DLLPUBLIC SwCharFormat : public SwFormat
{}
public:
- TYPEINFO_OVERRIDE(); // already in base class Client
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 6de3f8a82452..124e5de8a4f2 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -23,7 +23,6 @@
#include <rtl/ustring.hxx>
#include <tools/link.hxx>
-#include <tools/rtti.hxx>
#include <vcl/keycod.hxx>
#include <IShellCursorSupplier.hxx>
@@ -299,7 +298,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
- TYPEINFO_OVERRIDE();
SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr );
// disguised copy constructor
SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin );
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 1b3d20bb17b4..c565b66dee82 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -102,7 +102,6 @@ protected:
void SetInDTOR();
public:
- TYPEINFO_OVERRIDE();
/// For reader. Only the connection is created.
SwContact( SwFrameFormat *pToRegisterIn );
@@ -195,7 +194,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
- TYPEINFO_OVERRIDE();
/// Creates DrawObject and registers it with the Model.
SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
@@ -241,7 +239,6 @@ class SwDrawVirtObj : public SdrVirtObj
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
public:
- TYPEINFO_OVERRIDE();
SwDrawVirtObj( SdrObject& _rNewObj,
SwDrawContact& _rDrawContact );
@@ -388,7 +385,6 @@ class SwDrawContact : public SwContact
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
- TYPEINFO_OVERRIDE();
SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj );
virtual ~SwDrawContact();
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index bf20d9ba2015..bd9cf5419751 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -158,7 +158,6 @@ public:
/// but we implement this ourselves.
SFX_DECL_INTERFACE(SW_DOCSHELL)
SFX_DECL_OBJECTFACTORY()
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 6e6ad6b86254..acd164809316 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -49,7 +49,6 @@ private:
SwFormatCharFormat & operator= (const SwFormatCharFormat &) = delete;
public:
- TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 6ea8b19986ac..da9420ff973a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -248,7 +248,6 @@ public:
using SwEditShell::Insert;
- TYPEINFO_OVERRIDE();
SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr );
SwFEShell( SwEditShell& rShell, vcl::Window *pWin );
virtual ~SwFEShell();
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index f72adf0a5411..c736476060fa 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -40,7 +40,6 @@ private:
SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) = delete;
public:
- TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 7388af608a00..0ac5922a24a3 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -91,7 +91,6 @@ protected:
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class Client.
inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
SwTextFormatColl& GetNextTextFormatColl() const { return *mpNextTextFormatColl; }
@@ -153,7 +152,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class Client.
};
// FEATURE::CONDCOLL
@@ -184,7 +182,6 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
} m_aSubCondition;
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class Client.
SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
sal_uLong nSubCond = 0 );
@@ -232,7 +229,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class Client.
virtual ~SwConditionTextFormatColl();
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 4aba5ee50cab..1db9bbb6f749 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -57,7 +57,6 @@ protected:
virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) override;
public:
- TYPEINFO_OVERRIDE();
/// Single argument constructors shall be explicit.
explicit SwFormatField( const SwField &rField );
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index a23e0f3e7501..031ef84df697 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -32,7 +32,6 @@ public:
SwFormatFollowTextFlow( bool bFlag = false )
: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
- TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index e0c9a513c081..c78cb01581d2 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -42,7 +42,6 @@ public:
virtual ~SwFormatHeader();
SwFormatHeader& operator=( const SwFormatHeader &rCpy );
- TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -74,7 +73,6 @@ public:
virtual ~SwFormatFooter();
SwFormatFooter& operator=( const SwFormatFooter &rCpy );
- TYPEINFO_OVERRIDE();
/// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index aa6ca6f424e9..7515b85f2c42 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -48,7 +48,7 @@ public:
SwFormatINetFormat(); ///< For TypeInfo.
virtual ~SwFormatINetFormat();
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 7d81094d3c9a..64f0f9a6f6d9 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -35,7 +35,7 @@ public:
SwFormatLineNumber();
virtual ~SwFormatLineNumber();
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 112d7fe343e2..b18ba45894fa 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -36,7 +36,6 @@ class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem
sal_Int16 m_eOrient;
sal_Int16 m_eRelation;
public:
- TYPEINFO_OVERRIDE();
SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = css::text::VertOrientation::NONE,
sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA );
inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy );
@@ -73,7 +72,6 @@ class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
sal_Int16 m_eRelation;
bool m_bPosToggle : 1; ///< Flip position on even pages.
public:
- TYPEINFO_OVERRIDE();
SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = css::text::HoriOrientation::NONE,
sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA, bool bPos = false );
inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy );
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index c07a2182b9ef..63018fda786f 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -52,7 +52,6 @@ public:
SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy );
virtual ~SwFormatPageDesc();
- TYPEINFO_OVERRIDE();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index d60d9c829c66..ca67be21402d 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -30,7 +30,6 @@ private:
sal_Int16 mnWrapInfluenceOnPosition;
public:
- TYPEINFO_OVERRIDE();
// #i35017# - constant name has changed
SwFormatWrapInfluenceOnObjPos(
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index fe0ddfd2ec55..63d41185a8cf 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -70,7 +70,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class Client.
virtual ~SwFormat();
SwFormat &operator=(const SwFormat&);
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 3e881645a6f9..717f3702995a 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -65,7 +65,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class Client.
virtual ~SwFrameFormat();
/// Destroys all Frms in aDepend (Frms are identified via dynamic_cast).
@@ -169,7 +168,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE();
virtual ~SwFlyFrameFormat();
/// Creates the views.
@@ -265,7 +263,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE();
virtual ~SwDrawFrameFormat();
/** DrawObjects are removed from the arrays at the layout.
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 09f933afd0c5..2d35d10ab96f 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -26,7 +26,6 @@ class SwGlobalDocShell : public SwDocShell
public:
SFX_DECL_OBJECTFACTORY();
- TYPEINFO_OVERRIDE();
SwGlobalDocShell(SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED);
virtual ~SwGlobalDocShell();
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 9b16b4b44c2c..d4aa180dcddc 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -82,7 +82,6 @@ public:
class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop
{
public:
- TYPEINFO_OVERRIDE();
SwCropGrf();
SwCropGrf( sal_Int32 nLeft, sal_Int32 nRight,
sal_Int32 nTop, sal_Int32 nBottom );
@@ -195,7 +194,6 @@ class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem
{
double nValue;
public:
- TYPEINFO_OVERRIDE();
SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( 1.0 )
{}
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index d7b6fef945d6..a1400553c73e 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_INC_INDEX_HXX
#include <sal/types.h>
-#include <tools/rtti.hxx>
#include <swdllapi.h>
#include <iostream>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 24a6bea2a96a..bf0a17494684 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -737,7 +737,6 @@ public:
bool IsHidden() const;
- TYPEINFO_OVERRIDE(); // fuer rtti
/// override SwIndexReg
virtual void Update(
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index b7e973fb321a..bcadbfee7408 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -379,7 +379,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
- TYPEINFO_OVERRIDE(); /// Already contained in base class Client.
/** MakeFrm will be called for a certain layout
pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 2fa8fbc52153..65dcacac9abd 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient
sal_uInt8 nChars; ///< Character count.
bool bWholeWord; ///< First word with initials.
public:
- TYPEINFO_OVERRIDE(); ///< Already in base class SwClient.
+ static SfxPoolItem* CreateDefault();
SwFormatDrop();
virtual ~SwFormatDrop();
@@ -113,7 +113,7 @@ public:
class SwRegisterItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
inline SwRegisterItem( const bool bRegister = false );
@@ -143,7 +143,7 @@ inline SwRegisterItem& SwRegisterItem::operator=(
class SW_DLLPUBLIC SwNumRuleItem : public SfxStringItem
{
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SwNumRuleItem()
: SfxStringItem( RES_PARATR_NUMRULE, OUString() ) {}
@@ -175,7 +175,6 @@ public:
class SwParaConnectBorderItem : public SfxBoolItem
{
public:
- TYPEINFO_OVERRIDE();
inline SwParaConnectBorderItem( const bool bConnect = true );
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index bcc8c963b01a..d5f843be6c24 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -1026,7 +1026,6 @@
#include <tools/resary.hxx>
#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <tools/time.hxx>
#include <tools/urlobj.hxx>
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index f3581ce9968b..793b4147f91d 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Sequence.h>
-#include <tools/rtti.hxx>
#include <tools/ref.hxx>
#include <svl/smplhint.hxx>
#include <sfx2/lnkbase.hxx>
@@ -159,7 +158,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
- TYPEINFO_OVERRIDE(); // rtti
SwSection(SectionType const eType, OUString const& rName,
SwSectionFormat & rFormat);
@@ -292,7 +290,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
- TYPEINFO_OVERRIDE(); // Already contained in base class client.
virtual ~SwSectionFormat();
// Deletes all Frms in aDepend (Frms are recognized via dynamic_cast).
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 602c5919af06..e5b292a997cf 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -35,7 +35,6 @@ protected:
SwBaseLink() {}
public:
- TYPEINFO_OVERRIDE();
SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = nullptr )
: ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 808a2c98ddfa..73eeb5b2c519 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -27,7 +27,6 @@ class SwDDETable : public SwTable
{
SwDepend aDepend;
public:
- TYPEINFO_OVERRIDE();
// Ctor moves all lines/boxes from SwTable to it.
// After that SwTable is empty and has to be deleted.
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 9ccb175bb1ab..66cb66b8ff79 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -118,7 +118,6 @@ public:
// public Data - used for internal Clipboard / Drag & Drop / XSelection
SwTransferable *m_pDragDrop, *m_pXSelection;
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
private:
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index ee21c78430ef..0f1b4a8ec150 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -135,7 +135,6 @@ public:
SEARCH_COL // column selection
};
- TYPEINFO_OVERRIDE();
// single argument ctors shall be explicit.
explicit SwTable( SwTableFormat* );
@@ -348,7 +347,6 @@ class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat.
SwTableBox *m_pUpper;
public:
- TYPEINFO_OVERRIDE();
SwTableLine() : m_pUpper(nullptr) {}
@@ -408,7 +406,6 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrameFormat.
static SwTableBoxFormat* CheckBoxFormat( SwTableBoxFormat* );
public:
- TYPEINFO_OVERRIDE();
SwTableBox();
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 6ace791b7e8b..999b7c5fefe2 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -38,7 +38,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
@@ -60,7 +59,6 @@ protected:
{}
public:
- TYPEINFO_OVERRIDE(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
@@ -85,7 +83,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
public:
- TYPEINFO_OVERRIDE(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index fde50c3519a7..89f117b22794 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -83,7 +83,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
- TYPEINFO_OVERRIDE(); // rtti
// single argument ctors shall be explicit.
explicit SwTOXMark( const SwTOXType* pTyp );
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index a31cb125cdc9..2712a7c7264d 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -78,7 +78,6 @@ protected:
public:
SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual ~SwTextRuby();
- TYPEINFO_OVERRIDE();
virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index e16b36ec944a..6f9dd900a772 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -38,7 +38,6 @@ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual ~SwTextINetFormat();
- TYPEINFO_OVERRIDE();
virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 298c9ca69941..f07aa30f3c74 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -23,7 +23,7 @@
#include <memory>
#include <svl/undo.hxx>
-
+#include <tools/solar.h>
#include <SwRewriter.hxx>
#include <swundo.hxx>
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 661b9acc5917..8a14e748f377 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -227,7 +227,6 @@ protected:
public:
SwXShape(css::uno::Reference< css::uno::XInterface > & xShape);
- TYPEINFO_OVERRIDE();
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 4a3eb3718d79..b5822dd92c8b 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -93,7 +93,6 @@ public:
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
- TYPEINFO_OVERRIDE();
//XNamed
virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
@@ -360,7 +359,6 @@ class SwXOLEListener : public cppu::WeakImplHelper
public:
SwXOLEListener(SwFormat& rOLEFormat, css::uno::Reference< css::frame::XModel > xOLE);
virtual ~SwXOLEListener();
- TYPEINFO_OVERRIDE();
// css::lang::XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 2c0cadfc0522..30e03ddaec71 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -75,7 +75,6 @@ public:
SwXRedline(SwRangeRedline& rRedline, SwDoc& rDoc);
virtual ~SwXRedline();
- TYPEINFO_OVERRIDE();
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw() override {OWeakObject::acquire();}
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 5f2b64d4a440..8aabdff3c082 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -206,7 +206,6 @@ public:
virtual ~SwXStyle();
- TYPEINFO_OVERRIDE();
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index c5fc850c94cc..73770e381484 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -96,7 +96,6 @@ public:
SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND);
SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode); // XML import interface
- TYPEINFO_OVERRIDE();
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -178,7 +177,6 @@ protected:
public:
SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine);
- TYPEINFO_OVERRIDE();
//XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;
@@ -336,7 +334,6 @@ public:
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
- TYPEINFO_OVERRIDE();
//XTextTable
virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(css::uno::RuntimeException, std::exception) override;
@@ -474,7 +471,6 @@ public:
virtual ~SwXCellRange() {};
std::vector< css::uno::Reference< css::table::XCell > > GetCells();
- TYPEINFO_OVERRIDE();
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -562,7 +558,6 @@ protected:
public:
SwXTableRows(SwFrameFormat& rFrameFormat);
- TYPEINFO_OVERRIDE();
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
@@ -603,7 +598,6 @@ protected:
public:
SwXTableColumns(SwFrameFormat& rFrameFormat);
- TYPEINFO_OVERRIDE();
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 359f2e80d8e3..873b31127e74 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -368,7 +368,6 @@ protected:
public:
SFX_DECL_VIEWFACTORY(SwView);
SFX_DECL_INTERFACE(SW_VIEWSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 61b562b7a753..8b8875b620eb 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/embed/XClassifiedObject.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <tools/rtti.hxx>
#include "swdllapi.h"
#include <swtypes.hxx>
#include <ring.hxx>
@@ -197,7 +196,6 @@ protected:
bool mbOutputToWindow;
public:
- TYPEINFO();
SwViewShellImp *Imp() { return mpImp; }
const SwViewShellImp *Imp() const { return mpImp; }
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index 411b0082b535..286c16ddade0 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -29,7 +29,6 @@ public:
// But implement yourself.
SFX_DECL_INTERFACE(SW_WEBDOCSHELL)
SFX_DECL_OBJECTFACTORY();
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 206fe93146d1..13d9642c3b79 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1436,12 +1436,9 @@ namespace
struct TestHint final : SfxHint {};
struct TestModify : SwModify
{
- TYPEINFO_OVERRIDE();
};
- TYPEINIT1( TestModify, SwModify );
struct TestClient : SwClient
{
- TYPEINFO_OVERRIDE();
int m_nModifyCount;
int m_nNotifyCount;
TestClient() : m_nModifyCount(0), m_nNotifyCount(0) {};
@@ -1455,17 +1452,14 @@ namespace
SwClient::SwClientNotify(rModify, rHint);
}
};
- TYPEINIT1( TestClient, SwClient );
// sad copypasta as tools/rtti.hxxs little brain can't cope with templates
struct OtherTestClient : SwClient
{
- TYPEINFO_OVERRIDE();
int m_nModifyCount;
OtherTestClient() : m_nModifyCount(0) {};
virtual void Modify( const SfxPoolItem*, const SfxPoolItem*) override
{ ++m_nModifyCount; }
};
- TYPEINIT1( OtherTestClient, SwClient );
}
void SwDocTest::testClientModify()
{
@@ -1508,7 +1502,7 @@ void SwDocTest::testClientModify()
CPPUNIT_ASSERT_EQUAL(aClient2.m_nNotifyCount,1);
}
// test typed iteration
- CPPUNIT_ASSERT(!aClient1.IsA(TYPE(OtherTestClient)));
+ CPPUNIT_ASSERT(typeid(aClient1) != typeid(OtherTestClient));
{
SwIterator<OtherTestClient,SwModify> aIter(aMod);
for(OtherTestClient* pClient = aIter.First(); pClient ; pClient = aIter.Next())
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index d7ec7cd2f8a4..e98cd5cac8ca 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -26,7 +26,6 @@
sw::LegacyModifyHint::~LegacyModifyHint() {}
-TYPEINIT0( SwClient );
SwClient::~SwClient()
{
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index 7cd973a47fb8..b30df30e6e45 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -19,7 +19,6 @@
#include <fmtfollowtextflow.hxx>
-TYPEINIT1(SwFormatFollowTextFlow, SfxBoolItem);
SfxPoolItem* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
{
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 6ee45e2c913e..dc27d270926e 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-TYPEINIT1(SwFormatWrapInfluenceOnObjPos, SfxPoolItem);
SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
: SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 580b2c623ecd..1c86b77d92e2 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -38,7 +38,6 @@
using namespace com::sun::star;
-TYPEINIT1( SwFormat, SwClient );
SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm,
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 7ba3d9fab95e..6709941a4fb2 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -69,7 +69,6 @@
using namespace com::sun::star;
using namespace util;
-TYPEINIT2(SwCrsrShell,SwViewShell,SwModify);
/**
* Delete all overlapping Cursors from a Cursor ring.
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 795c037227cb..3508b079f9ce 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -77,7 +77,6 @@
using namespace ::com::sun::star;
-TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection ); // for RTTI
sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const
{
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 5a677db5fc44..e436506425c9 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -35,10 +35,6 @@
#include <calbck.hxx>
#include <svl/intitem.hxx>
-TYPEINIT1( SwTextFormatColl, SwFormatColl );
-TYPEINIT1( SwGrfFormatColl, SwFormatColl );
-TYPEINIT1( SwConditionTextFormatColl, SwTextFormatColl );
-TYPEINIT1( SwCollCondition, SwClient );
namespace TextFormatCollFunc
{
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 6b9ef815b1a2..9c0612cfdbdd 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -70,7 +70,6 @@
using namespace ::com::sun::star::i18n;
-TYPEINIT1( SwContentNode, SwModify )
/*
* Some local helper functions for the attribute set handle of a content node.
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 698cf64873f9..e7214fee20b8 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -92,8 +92,6 @@ public:
}
};
-TYPEINIT1(SwSectionFormat,SwFrameFormat );
-TYPEINIT1(SwSection,SwClient );
SwSectionData::SwSectionData(SectionType const eType, OUString const& rName)
: m_eType(eType)
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index d96b397df9a6..852db82278b9 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -57,7 +57,6 @@ using namespace com::sun::star;
static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size &rOrigGrfSize );
-TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
{
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b0087471967b..c94781b33110 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -72,9 +72,6 @@
using namespace ::com::sun::star;
-TYPEINIT1( SwContact, SwClient )
-TYPEINIT1( SwFlyDrawContact, SwContact )
-TYPEINIT1( SwDrawContact, SwContact )
void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor )
{
@@ -2148,7 +2145,6 @@ namespace sdr
} // end of namespace sdr
/// implementation of class <SwDrawVirtObj>
-TYPEINIT1(SwDrawVirtObj,SdrVirtObj);
sdr::contact::ViewContact* SwDrawVirtObj::CreateObjectSpecificViewContact()
{
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 67ce43953a14..3b9cf03713c0 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -64,8 +64,6 @@ using namespace ::com::sun::star;
static bool bInResize = false;
-TYPEINIT1( SwFlyDrawObj, SdrObject )
-TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
namespace sdr
{
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index fe5df4207a42..6c356ae47be7 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -33,7 +33,6 @@
#include <swtblfmt.hxx>
#include <fieldhint.hxx>
-TYPEINIT1( SwDDETable, SwTable );
/// Ctor moves all lines/boxes from a SwTable into itself.
/// Afterwards the SwTable is empty and must be deleted.
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 21c01eba28e6..a5c04992d31e 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -52,7 +52,6 @@
using namespace com::sun::star;
-TYPEINIT1(SwFEShell,SwEditShell)
void SwFEShell::EndAllActionAndCall()
{
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 855e9b7a9d79..71cf98283d6b 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -40,8 +40,6 @@
using namespace ::com::sun::star;
-TYPEINIT1_AUTOFACTORY(SwCropGrf, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwGammaGrf, SfxPoolItem)
SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const
{
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 92f574ba0a87..e534b4d05f93 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -67,7 +67,6 @@ protected:
virtual ~SwContentFrm();
public:
- TYPEINFO_OVERRIDE(); // already in base class
virtual void Cut() override;
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override;
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 36e9c7747721..c21fa1ad1d23 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -45,7 +45,6 @@ protected:
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
public:
- TYPEINFO_OVERRIDE();
SwFlyDrawObj();
virtual ~SwFlyDrawObj();
@@ -78,7 +77,6 @@ public:
basegfx::B2DRange getOuterBound() const;
basegfx::B2DRange getInnerBound() const;
- TYPEINFO_OVERRIDE();
SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly);
virtual ~SwVirtFlyDrawObj();
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 2b084ede4ebd..bc9c543e1519 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -77,7 +77,6 @@ public:
void Update( const SfxItemSet* pAttr = nullptr,
const bool _bNewTOX = false );
void UpdatePageNum(); // insert page numbering
- TYPEINFO_OVERRIDE(); // for rtti
const SwTOXSortTabBases& GetTOXSortTabBases() const { return aSortArr; }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index cbd417c01dc0..dbe0e03812b3 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -153,7 +153,6 @@ protected:
public:
// #i26791#
- TYPEINFO_OVERRIDE();
// get client information
virtual bool GetInfo( SfxPoolItem& ) const override;
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 2a38939f9de5..0deb6b7b96fa 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -69,7 +69,6 @@ protected:
public:
// #i28701#
- TYPEINFO_OVERRIDE();
virtual void MakeAll(vcl::RenderContext* pRenderContext) override;
@@ -126,7 +125,6 @@ class SwFlyLayFrm : public SwFlyFreeFrm
{
public:
// #i28701#
- TYPEINFO_OVERRIDE();
SwFlyLayFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
@@ -153,7 +151,6 @@ protected:
public:
// #i28701#
- TYPEINFO_OVERRIDE();
SwFlyAtCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
@@ -191,7 +188,6 @@ protected:
public:
// #i28701#
- TYPEINFO_OVERRIDE();
SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 42b1a443661d..9fcc0a9c9870 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -423,7 +423,6 @@ public:
return css::uno::Sequence< css::style::TabStop >();
}
- TYPEINFO_OVERRIDE(); // already in base class
sal_uInt16 GetType() const { return mnFrmType; }
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 7a422eabbecf..972c0daff1a8 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -64,7 +64,6 @@ protected:
public:
// --> #i28701#
- TYPEINFO_OVERRIDE();
virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
void RefreshLaySubsidiary( const SwPageFrm*, const SwRect& ) const;
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 9c565ddc52d9..79b4d78a8a17 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -374,7 +374,6 @@ public:
SwTwips HangingMargin() const;
// RTTI
- TYPEINFO_OVERRIDE();
DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrm)
// Locking
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 568665073748..2d09ae61a509 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -190,7 +190,6 @@ bool SwObjPosOscillationControl::OscillationDetected()
return bOscillationDetected;
}
-TYPEINIT1(SwAnchoredDrawObject,SwAnchoredObject);
SwAnchoredDrawObject::SwAnchoredDrawObject() :
SwAnchoredObject(),
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index b6d6553b02df..d054a05d50c2 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -64,7 +64,6 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress()
}
}
-TYPEINIT0(SwAnchoredObject);
SwAnchoredObject::SwAnchoredObject() :
mpDrawObj( nullptr ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 43e448ed1516..129eca5fd76e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -87,12 +87,8 @@
using namespace ::com::sun::star;
-TYPEINIT1(SwFormatVertOrient, SfxPoolItem);
-TYPEINIT1(SwFormatHoriOrient, SfxPoolItem);
-TYPEINIT2(SwFormatHeader, SfxPoolItem, SwClient );
-TYPEINIT2(SwFormatFooter, SfxPoolItem, SwClient );
-TYPEINIT2(SwFormatPageDesc, SfxPoolItem, SwClient );
-TYPEINIT1_AUTOFACTORY(SwFormatLineNumber, SfxPoolItem);
+
+SfxPoolItem* SwFormatLineNumber::CreateDefault() { return new SwFormatLineNumber; }
static sal_Int16 lcl_IntToRelation(const uno::Any& rVal)
{
@@ -2499,7 +2495,6 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
}
// Partially implemented inline in hxx
-TYPEINIT1( SwFrameFormat, SwFormat );
IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrameFormat )
SwFrameFormat::SwFrameFormat(
@@ -2848,7 +2843,6 @@ void SwFrameFormats::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) cons
// class SwFlyFrameFormat
// Partially implemented inline in hxx
-TYPEINIT1( SwFlyFrameFormat, SwFrameFormat );
IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrameFormat )
SwFlyFrameFormat::~SwFlyFrameFormat()
@@ -3295,7 +3289,6 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
// class SwDrawFrameFormat
// Partially implemented inline in hxx
-TYPEINIT1( SwDrawFrameFormat, SwFrameFormat );
IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrameFormat )
SwDrawFrameFormat::~SwDrawFrameFormat()
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 5745f83f6820..afc4f926fbb9 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -66,7 +66,6 @@
using namespace ::com::sun::star;
-TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
SwFlyFrm::SwFlyFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
SwLayoutFrm( pFormat, pSib ),
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index f2780c5b2971..f2fec6a7d311 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -74,7 +74,6 @@ SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAn
}
// #i28701#
-TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm);
void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 21c599fe6c09..c0a41ec2fa8f 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -58,7 +58,6 @@ SwFlyInCntFrm::~SwFlyInCntFrm()
}
// #i28701#
-TYPEINIT1(SwFlyInCntFrm,SwFlyFrm);
void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
const Point& rRelAttr,
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 767a93e9b075..d365fe291711 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -87,7 +87,6 @@ SwFlyFreeFrm::~SwFlyFreeFrm()
}
// #i28701#
-TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
/** Notifies the background (all ContentFrms that currently are overlapping).
*
* Additionally, the window is also directly invalidated (especially where
@@ -474,7 +473,6 @@ SwFlyLayFrm::SwFlyLayFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch )
}
// #i28701#
-TYPEINIT1(SwFlyLayFrm,SwFlyFreeFrm);
void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index b579454fe4f6..d4af1593e468 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -340,8 +340,6 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft;
// #i65250#
sal_uInt32 SwFrm::mnLastFrmId=0;
-TYPEINIT1(SwFrm,SwClient); //rtti for SwFrm
-TYPEINIT1(SwContentFrm,SwFrm); //rtti for SwContentFrm
void _FrmInit()
{
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 896e82a830ce..446ac29582fb 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2153,7 +2153,6 @@ SwLayoutFrm::SwLayoutFrm(SwFrameFormat *const pFormat, SwFrm *const pSib)
}
// #i28701#
-TYPEINIT1(SwLayoutFrm,SwFrm);
SwTwips SwLayoutFrm::InnerHeight() const
{
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index fb9b973f01a3..e017364d4cc3 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -43,10 +43,10 @@
using namespace ::com::sun::star;
-TYPEINIT2_AUTOFACTORY( SwFormatDrop, SfxPoolItem, SwClient);
-TYPEINIT1_AUTOFACTORY( SwRegisterItem, SfxBoolItem);
-TYPEINIT1_AUTOFACTORY( SwNumRuleItem, SfxStringItem);
-TYPEINIT1_AUTOFACTORY( SwParaConnectBorderItem, SfxBoolItem);
+
+SfxPoolItem* SwFormatDrop::CreateDefault() { return new SwFormatDrop; }
+SfxPoolItem* SwRegisterItem::CreateDefault() { return new SwRegisterItem; }
+SfxPoolItem* SwNumRuleItem::CreateDefault() { return new SwNumRuleItem; }
SwFormatDrop::SwFormatDrop()
: SfxPoolItem( RES_PARATR_DROP ),
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 8cb9d0eb1e72..b0363a4725f2 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -69,12 +69,6 @@
using namespace com::sun::star;
-TYPEINIT1( SwTable, SwClient );
-TYPEINIT1( SwTableBox, SwClient );
-TYPEINIT1( SwTableLine, SwClient );
-TYPEINIT1( SwTableFormat, SwFrameFormat );
-TYPEINIT1( SwTableBoxFormat, SwFrameFormat );
-TYPEINIT1( SwTableLineFormat, SwFrameFormat );
#define COLFUZZY 20
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 267b3c9e5a50..e9b2f94531a8 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -78,7 +78,6 @@
#include <calbck.hxx>
#include <ftnidx.hxx>
-TYPEINIT1( SwTextFrm, SwContentFrm );
/// Switches width and height of the text frame
void SwTextFrm::SwapWidthAndHeight()
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 2285d9150b89..68066b783ba5 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -91,7 +91,6 @@ static void lcl_FillAuthPattern(SwFormTokens &rAuthTokens, sal_uInt16 nTypeId)
}
-TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient ); // fuers rtti
/// pool default constructor
SwTOXMark::SwTOXMark()
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 89649a0cb06c..a201bf33ba60 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -41,7 +41,6 @@
#include <fieldhint.hxx>
#include <svl/smplhint.hxx>
-TYPEINIT3(SwFormatField, SfxPoolItem, SwModify, SfxBroadcaster)
// constructor for default item in attribute-pool
SwFormatField::SwFormatField( sal_uInt16 nWhich )
diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx
index 9e303170105e..f8776f540d68 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -22,7 +22,6 @@
#include <charfmt.hxx>
#include <docary.hxx>
-TYPEINIT1( SwCharFormat, SwFormat ); //rtti fuer SwCharFormat
void SwCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
{
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index b9def1c5c168..796d84a7e836 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -52,8 +52,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_AUTOFACTORY(SwFormatINetFormat, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SwFormatAutoFormat, SfxPoolItem);
+
+SfxPoolItem* SwFormatINetFormat::CreateDefault() { return new SwFormatINetFormat; }
SwFormatCharFormat::SwFormatCharFormat( SwCharFormat *pFormat )
: SfxPoolItem( RES_TXTATR_CHARFMT ),
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index aa805592b77d..2d6bcd82a771 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -95,7 +95,6 @@ using namespace ::com::sun::star;
typedef std::vector<SwTextAttr*> SwpHts;
-TYPEINIT1( SwTextNode, SwContentNode )
// unfortunately everyone can change Hints without ensuring order or the linking between them
#ifdef DBG_UTIL
@@ -3599,7 +3598,7 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa
SwFormatColl* SwTextNode::ChgFormatColl( SwFormatColl *pNewColl )
{
OSL_ENSURE( pNewColl,"ChgFormatColl: Collectionpointer has value 0." );
- OSL_ENSURE( HAS_BASE( SwTextFormatColl, pNewColl ),
+ OSL_ENSURE( dynamic_cast<const SwTextFormatColl *>(pNewColl) != nullptr,
"ChgFormatColl: is not a Text Collection pointer." );
SwTextFormatColl *pOldColl = GetTextColl();
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 3e96644ad11e..450444911fe1 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -35,8 +35,7 @@
#include <IDocumentState.hxx>
#include <IDocumentStylePoolAccess.hxx>
-TYPEINIT1(SwTextINetFormat,SwClient);
-TYPEINIT1(SwTextRuby,SwClient);
+
SwTextCharFormat::SwTextCharFormat( SwFormatCharFormat& rAttr,
sal_Int32 nStt, sal_Int32 nEnde )
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index c57b279a51f7..e983c6bb2512 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/rtti.hxx>
#include <SwUndoField.hxx>
#include <swundo.hxx>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 5577eb249738..c2e8b5fe6726 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -878,7 +878,6 @@ SwDoc* SwXDrawPage::GetDoc()
return pDoc;
}
-TYPEINIT1(SwXShape, SwClient);
namespace
{
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index feed9a498431..eb0e40822504 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1171,7 +1171,6 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rI
return 0;
}
-TYPEINIT1(SwXFrame, SwClient);
OUString SwXFrame::getImplementationName() throw( uno::RuntimeException, std::exception )
{
@@ -3748,7 +3747,6 @@ uno::Reference<container::XNameReplace> SAL_CALL
return new SwFrameEventDescriptor( *this );
}
-TYPEINIT1(SwXOLEListener, SwClient);
SwXOLEListener::SwXOLEListener( SwFormat& rOLEFormat, uno::Reference< XModel > xOLE) :
SwClient(&rOLEFormat),
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 7c705789a212..ce58ecd5cca9 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -362,7 +362,6 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties
return aRet;
}
-TYPEINIT1(SwXRedline, SwClient);
SwXRedline::SwXRedline(SwRangeRedline& rRedline, SwDoc& rDoc) :
SwXText(&rDoc, CURSOR_REDLINE),
pDoc(&rDoc),
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 20de3d335ecd..16dfb092a078 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1150,7 +1150,6 @@ sal_Int64 SAL_CALL SwXStyle::getSomething( const uno::Sequence< sal_Int8 >& rId
return 0;
}
-TYPEINIT1(SwXStyle, SfxListener);
OUString SwXStyle::getImplementationName() throw( uno::RuntimeException, std::exception )
{
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index d42b1ab09a50..ac526d230538 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -718,7 +718,6 @@ void sw_setValue( SwXCell &rCell, double nVal )
pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
}
-TYPEINIT1(SwXCell, SwClient);
SwXCell::SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBx, size_t const nPos) :
SwXText(pTableFormat->GetDoc(), CURSOR_TBLTEXT),
@@ -1236,7 +1235,6 @@ sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( u
uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{ return {"com.sun.star.text.TextTableRow"}; }
-TYPEINIT1(SwXTextTableRow, SwClient);
SwXTextTableRow::SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLn) :
SwClient(pFormat),
@@ -1939,7 +1937,6 @@ sal_Int64 SAL_CALL SwXTextTable::getSomething( const uno::Sequence< sal_Int8 >&
return 0;
}
-TYPEINIT1(SwXTextTable, SwClient)
SwXTextTable::SwXTextTable()
: m_pImpl(new Impl)
@@ -3122,7 +3119,6 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >&
return 0;
}
-TYPEINIT1(SwXCellRange, SwClient);
OUString SwXCellRange::getImplementationName() throw( uno::RuntimeException, std::exception )
{ return OUString("SwXCellRange"); }
@@ -3749,7 +3745,6 @@ sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno:
uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{ return { "com.sun.star.text.TableRows" }; }
-TYPEINIT1(SwXTableRows, SwClient);
SwXTableRows::SwXTableRows(SwFrameFormat& rFrameFormat) :
SwClient(&rFrameFormat)
@@ -3901,7 +3896,6 @@ sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( u
uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{ return { "com.sun.star.text.TableColumns"}; }
-TYPEINIT1(SwXTableColumns, SwClient);
SwXTableColumns::SwXTableColumns(SwFrameFormat& rFrameFormat) :
SwClient(&rFrameFormat)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c1cb98e1f96b..c682566691fb 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -93,7 +93,6 @@ BitmapEx* SwViewShell::mpReplaceBmp = nullptr;
bool bInSizeNotify = false;
-TYPEINIT0(SwViewShell);
using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 7a840e9542a6..af98c92dbd0e 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -236,7 +236,7 @@ namespace sw
template<class T> const T & item_cast(const SfxPoolItem &rItem)
throw(std::bad_cast)
{
- if (!rItem.IsA(STATICTYPE(T)))
+ if (dynamic_cast<const T *>(&rItem) == nullptr)
throw std::bad_cast();
return static_cast<const T &>(rItem);
}
@@ -261,9 +261,7 @@ namespace sw
*/
template<class T> const T * item_cast(const SfxPoolItem *pItem)
{
- if (pItem && !pItem->IsA(STATICTYPE(T)))
- pItem = nullptr;
- return static_cast<const T *>(pItem);
+ return dynamic_cast<const T *>(pItem);
}
/** Extract a SfxPoolItem derived property from a SwContentNode
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 9b1bcc5960c0..ec9c2cbb4971 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -65,7 +65,6 @@ static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-TYPEINIT1( SwXMLBrushItemImportContext, SvXMLImportContext );
void SwXMLBrushItemImportContext::ProcessAttrs(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index f65604cafcfa..56fef7456e51 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -43,7 +43,6 @@ private:
const SvXMLUnitConverter& rUnitConv );
public:
- TYPEINFO_OVERRIDE();
SwXMLBrushItemImportContext(
SvXMLImport& rImport,
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index acf62efd26a6..aa728f99aff9 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -202,7 +202,6 @@ public:
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLConditionContext_Impl();
- TYPEINFO_OVERRIDE();
bool IsValid() const { return 0 != nCondition; }
@@ -253,7 +252,6 @@ SwXMLConditionContext_Impl::~SwXMLConditionContext_Impl()
{
}
-TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext );
typedef std::vector<SwXMLConditionContext_Impl*> SwXMLConditions_Impl;
@@ -267,7 +265,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SwXMLTextStyleContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -284,7 +281,6 @@ public:
virtual void Finish( bool bOverwrite ) override;
};
-TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext );
uno::Reference < style::XStyle > SwXMLTextStyleContext_Impl::Create()
{
@@ -443,7 +439,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SwXMLItemSetStyleContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx,
@@ -547,7 +542,6 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
return pContext;
}
-TYPEINIT1( SwXMLItemSetStyleContext_Impl, SvXMLStyleContext );
SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -730,7 +724,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SwXMLStylesContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx,
@@ -744,7 +737,6 @@ public:
virtual void EndElement() override;
};
-TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext );
SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -912,7 +904,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SwXMLMasterStylesContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx,
@@ -922,7 +913,6 @@ public:
virtual void EndElement() override;
};
-TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 78ee5864f0fa..776f5512d77b 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -126,7 +126,6 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLBodyContext_Impl();
- TYPEINFO_OVERRIDE();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -144,7 +143,6 @@ SwXMLBodyContext_Impl::~SwXMLBodyContext_Impl()
{
}
-TYPEINIT1( SwXMLBodyContext_Impl, SvXMLImportContext );
SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext(
sal_uInt16 /*nPrefix*/,
@@ -171,7 +169,6 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLDocContext_Impl();
- TYPEINFO_OVERRIDE();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -189,7 +186,6 @@ SwXMLDocContext_Impl::~SwXMLDocContext_Impl()
{
}
-TYPEINIT1( SwXMLDocContext_Impl, SvXMLImportContext );
SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
@@ -261,7 +257,6 @@ public:
const Reference< document::XDocumentProperties >& xDocProps);
virtual ~SwXMLOfficeDocContext_Impl();
- TYPEINFO_OVERRIDE();
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
@@ -285,7 +280,6 @@ SwXMLOfficeDocContext_Impl::~SwXMLOfficeDocContext_Impl()
{
}
-TYPEINIT1( SwXMLOfficeDocContext_Impl, SwXMLDocContext_Impl );
SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
@@ -325,7 +319,6 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLDocStylesContext_Impl();
- TYPEINFO_OVERRIDE();
virtual void EndElement() override;
};
@@ -344,7 +337,6 @@ SwXMLDocStylesContext_Impl::~SwXMLDocStylesContext_Impl()
{
}
-TYPEINIT1( SwXMLDocStylesContext_Impl, SwXMLDocContext_Impl );
void SwXMLDocStylesContext_Impl::EndElement()
{
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 8999e9c7c285..59e44c1bb3a4 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1066,7 +1066,6 @@ class SwXMLDDETableContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
SwXMLDDETableContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName);
@@ -1083,7 +1082,6 @@ public:
bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; }
};
-TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext );
SwXMLDDETableContext_Impl::SwXMLDDETableContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName) :
@@ -1273,7 +1271,6 @@ SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow,
return (*m_pRows)[nRow]->GetCell( nCol );
}
-TYPEINIT1( SwXMLTableContext, XMLTextTableContext );
SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index ff23336ce92d..c3fad16f6d2d 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -127,7 +127,6 @@ class SwXMLTableContext : public XMLTextTableContext
public:
- TYPEINFO_OVERRIDE();
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 3a6fb3e4c8fb..a412f5a921a4 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -139,7 +139,6 @@ void SwDocShell::InitInterface_Impl()
{
}
-TYPEINIT2(SwDocShell, SfxObjectShell, SfxListener);
SFX_IMPL_OBJECTFACTORY(SwDocShell, SvGlobalName(SO3_SW_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter" )
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 2a2d7c98b518..238d9fb451d5 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -137,7 +137,6 @@ bool g_bNoInterrupt = false;
using namespace com::sun::star;
-TYPEINIT1( SwModule, SfxModule );
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
index 6967722b60c6..ed65626e3008 100644
--- a/sw/source/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/uibase/chrdlg/ccoll.cxx
@@ -129,7 +129,6 @@ const CommandStruct SwCondCollItem::aCmds[] =
{ PARA_IN_LIST, 9 }
};
-TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem)
// Item for the transport of the condition table
SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) :
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 91f306116636..b80a68f422e1 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -29,10 +29,6 @@
#include "cfgitems.hxx"
#include "crstate.hxx"
-TYPEINIT1_AUTOFACTORY(SwDocDisplayItem, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwElemItem, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwAddPrinterItem, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwShadowCursorItem, SfxPoolItem)
SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
SfxPoolItem(_nWhich),
diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx
index 2918c8972f65..e9816626dafd 100644
--- a/sw/source/uibase/dialog/swwrtshitem.cxx
+++ b/sw/source/uibase/dialog/swwrtshitem.cxx
@@ -18,7 +18,6 @@
*/
#include "swwrtshitem.hxx"
-TYPEINIT1(SwWrtShellItem,SfxPoolItem);
SwWrtShellItem::SwWrtShellItem( sal_uInt16 _nWhich, SwWrtShell* pSh )
: SfxPoolItem( _nWhich ), pWrtSh( pSh )
{
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index e5f12bbbca66..99a2ef4b0027 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -43,7 +43,8 @@
using namespace utl;
using namespace ::com::sun::star::uno;
-TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
+
+SfxPoolItem* SwEnvItem::CreateDefault() { return new SwEnvItem; }
OUString MakeSender()
{
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 7e9a6c78236d..40f60b8ac26d 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -30,7 +30,6 @@
// Description: Register all filters
-TYPEINIT1(SwGlobalDocShell, SwDocShell);
SFX_IMPL_OBJECTFACTORY( SwGlobalDocShell, SvGlobalName(SO3_SWGLOB_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter/GlobalDocument" )
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index 23c31e68b293..c9bfb4601770 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.hxx
@@ -32,7 +32,6 @@ class SwAnnotationShell: public SfxShell
public:
SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 628fd856fcb7..b730c04e45bf 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -70,7 +70,6 @@ public:
virtual ~SwBaseShell();
SFX_DECL_INTERFACE(SW_BASESHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx
index 2116c1b659d3..ad943b25ba45 100644
--- a/sw/source/uibase/inc/beziersh.hxx
+++ b/sw/source/uibase/inc/beziersh.hxx
@@ -25,7 +25,6 @@ class SwBezierShell: public SwBaseShell
{
public:
SFX_DECL_INTERFACE(SW_BEZIERSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index e21869810765..50928483b905 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -57,7 +57,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
Color aIndexBackgrndCol;
public:
- TYPEINFO_OVERRIDE();
SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP );
SwDocDisplayItem(
const SwDocDisplayItem& rSwDocDisplayItem );
@@ -90,7 +89,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
friend class SwContentOptPage;
public:
- TYPEINFO_OVERRIDE();
SwElemItem( sal_uInt16 nWhich = FN_PARAM_ELEM );
SwElemItem(const SwElemItem& rElemItem);
SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich);
@@ -112,7 +110,6 @@ class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData
using SwPrintData::operator ==;
public:
- TYPEINFO_OVERRIDE();
SwAddPrinterItem( sal_uInt16 nWhich = FN_PARAM_ADDPRINTER );
SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData );
SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem);
@@ -130,7 +127,6 @@ class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem
sal_uInt8 eMode;
bool bOn;
public:
- TYPEINFO_OVERRIDE();
SwShadowCursorItem( sal_uInt16 nWhich = FN_PARAM_SHADOWCURSOR );
SwShadowCursorItem( const SwShadowCursorItem& rElemItem );
SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich );
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index c95505070edc..8d7fa6c657c1 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.hxx
@@ -27,7 +27,6 @@ class SwDrawShell: public SwDrawBaseShell
{
public:
SFX_DECL_INTERFACE(SW_DRAWSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/drformsh.hxx b/sw/source/uibase/inc/drformsh.hxx
index 19063344d8a0..194a6f706757 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.hxx
@@ -27,7 +27,6 @@ class SwDrawFormShell: public SwDrawBaseShell
{
public:
SFX_DECL_INTERFACE(SW_DRAWFORMSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index 95254b27ac9c..1ade7acc6a73 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -37,7 +37,6 @@ public:
virtual ~SwDrawBaseShell();
SFX_DECL_INTERFACE(SW_DRAWBASESHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index 98e5757c9a9d..d4d027671b0e 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -40,7 +40,6 @@ class SwDrawTextShell: public SfxShell
public:
SFX_DECL_INTERFACE(SW_DRWTXTSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 62dc0bcc2d7e..02fb1700df0d 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -56,8 +56,7 @@ public:
SwEnvItem();
SwEnvItem(const SwEnvItem& rItem);
- TYPEINFO_OVERRIDE();
-
+ static SfxPoolItem* CreateDefault();
SwEnvItem& operator =(const SwEnvItem& rItem);
virtual bool operator ==(const SfxPoolItem& rItem) const override;
diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx
index 6722ec79f5b3..3421e14570be 100644
--- a/sw/source/uibase/inc/glshell.hxx
+++ b/sw/source/uibase/inc/glshell.hxx
@@ -30,7 +30,6 @@ protected:
virtual bool Save() override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_GLOSDOCSHELL)
private:
@@ -61,7 +60,6 @@ protected:
virtual bool Save() override;
public:
- TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL)
private:
diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx
index 733d26ca06f4..0caecf64282e 100644
--- a/sw/source/uibase/inc/listsh.hxx
+++ b/sw/source/uibase/inc/listsh.hxx
@@ -25,7 +25,6 @@ class SwListShell: public SwBaseShell
{
public:
SFX_DECL_INTERFACE(SW_LISTSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 88af21b6da6a..0c97e69b2d31 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -228,7 +228,6 @@ protected:
public:
SFX_DECL_VIEWFACTORY(SwPagePreview);
SFX_DECL_INTERFACE(SW_PAGEPREVIEW)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index e381e4c201a6..96be7e5ea884 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -52,7 +52,6 @@ protected:
public:
SFX_DECL_VIEWFACTORY(SwSrcView);
SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index a0474a77c1a2..21309f06260d 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -28,7 +28,6 @@ class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem
SwWrtShell* pWrtSh;
public:
- TYPEINFO_OVERRIDE();
SwWrtShellItem();
SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh);
SwWrtShellItem( const SwWrtShellItem& );
diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx
index bc1d636f77aa..1ae2653d4964 100644
--- a/sw/source/uibase/inc/tabsh.hxx
+++ b/sw/source/uibase/inc/tabsh.hxx
@@ -33,7 +33,6 @@ class SwTableShell: public SwBaseShell
{
public:
SFX_DECL_INTERFACE(SW_TABSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 5cf3c0e3746a..9abef5b0d499 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -39,7 +39,6 @@ class SW_DLLPUBLIC SwTextShell: public SwBaseShell
public:
SFX_DECL_INTERFACE(SW_TEXTSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx
index dfbfd7ba847b..09fdcbeee479 100644
--- a/sw/source/uibase/inc/wformsh.hxx
+++ b/sw/source/uibase/inc/wformsh.hxx
@@ -34,7 +34,6 @@ private:
static void InitInterface_Impl();
public:
- TYPEINFO_OVERRIDE();
};
#endif
diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx
index 2ab9335ab6fd..4ad5dabc2948 100644
--- a/sw/source/uibase/inc/wfrmsh.hxx
+++ b/sw/source/uibase/inc/wfrmsh.hxx
@@ -26,7 +26,6 @@ class SwWebFrameShell: public SwFrameShell
{
public:
SFX_DECL_INTERFACE(SW_WEBFRAMESHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx
index 26ee0bf015b8..4e423dfc8afb 100644
--- a/sw/source/uibase/inc/wgrfsh.hxx
+++ b/sw/source/uibase/inc/wgrfsh.hxx
@@ -28,7 +28,6 @@ public:
virtual ~SwWebGrfShell();
SFX_DECL_INTERFACE(SW_WEBGRFSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx
index 77a266d27278..752a3f33d657 100644
--- a/sw/source/uibase/inc/wlistsh.hxx
+++ b/sw/source/uibase/inc/wlistsh.hxx
@@ -31,7 +31,6 @@ private:
static void InitInterface_Impl();
public:
- TYPEINFO_OVERRIDE();
SwWebListShell(SwView &rView);
virtual ~SwWebListShell();
diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx
index 3249e64ea3a4..319cf71def54 100644
--- a/sw/source/uibase/inc/wtabsh.hxx
+++ b/sw/source/uibase/inc/wtabsh.hxx
@@ -25,7 +25,6 @@ class SwWebTableShell: public SwTableShell
{
public:
SFX_DECL_INTERFACE(SW_WEBTABSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx
index a7b76007a361..10b683a12891 100644
--- a/sw/source/uibase/inc/wtextsh.hxx
+++ b/sw/source/uibase/inc/wtextsh.hxx
@@ -26,7 +26,6 @@ class SwWebTextShell: public SwTextShell
{
public:
SFX_DECL_INTERFACE(SW_WEBTEXTSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx
index 40b1f8872ed7..88a57458f22e 100644
--- a/sw/source/uibase/inc/wview.hxx
+++ b/sw/source/uibase/inc/wview.hxx
@@ -30,7 +30,6 @@ protected:
public:
SFX_DECL_VIEWFACTORY(SwWebView);
SFX_DECL_INTERFACE(SW_WEBVIEWSHELL)
- TYPEINFO_OVERRIDE();
private:
/// SfxInterface initializer.
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index be79bafab709..9b05cb57550b 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -68,8 +68,6 @@ void SwWebGlosDocShell::InitInterface_Impl()
{
}
-TYPEINIT1( SwGlosDocShell, SwDocShell );
-TYPEINIT1( SwWebGlosDocShell, SwWebDocShell );
static void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq )
{
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index e0239fd1bb48..2d46ca8ceda0 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -144,7 +144,6 @@ void SwAnnotationShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_ANNOTATION_POPUPMENU));
}
-TYPEINIT1(SwAnnotationShell,SfxShell)
SfxItemPool* SwAnnotationShell::GetAnnotationPool(SwView& rV)
{
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 8949cea9121b..1fcfc3a68c4f 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -161,7 +161,6 @@ void SwBaseShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SvxContourDlgChildWindow::GetChildWindowId());
}
-TYPEINIT1(SwBaseShell,SfxShell)
static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
{
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index ef49f21f72fb..fbe4f54d956a 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -52,7 +52,6 @@ void SwBezierShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_BEZIER_TOOLBOX);
}
-TYPEINIT1(SwBezierShell,SwBaseShell)
SwBezierShell::SwBezierShell(SwView &_rView):
SwBaseShell( _rView )
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 3f1e09814594..e580ef5eeab7 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -80,7 +80,6 @@ void SwDrawShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
}
-TYPEINIT1(SwDrawShell,SwDrawBaseShell)
// #i123922# check as the name implies
SdrObject* SwDrawShell::IsSingleFillableNonOLESelected()
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 6162ba5498e9..3d2ef44960c3 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -66,7 +66,6 @@ void SwDrawFormShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
}
-TYPEINIT1(SwDrawFormShell, SwDrawBaseShell)
void SwDrawFormShell::Execute(SfxRequest &rReq)
{
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index ec43a4f81cc4..a5fcf6b350b7 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -72,7 +72,6 @@ void SwDrawBaseShell::InitInterface_Impl()
{
}
-TYPEINIT1(SwDrawBaseShell,SwBaseShell)
SwDrawBaseShell::SwDrawBaseShell(SwView &_rView)
: SwBaseShell(_rView)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 4a8cb89257fe..391d0f175f6d 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -92,7 +92,6 @@ void SwDrawTextShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
}
-TYPEINIT1(SwDrawTextShell,SfxShell)
void SwDrawTextShell::Init()
{
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 0ec00e554c19..91d0c7355d6d 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -58,7 +58,6 @@ void SwListShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
}
-TYPEINIT1(SwListShell,SwBaseShell)
// #i35572# Functionality of Numbering/Bullet toolbar
// for outline numbered paragraphs should match the functions for outlines
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 96016f8cf94e..55162768b06d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -100,7 +100,6 @@ void SwTableShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
}
-TYPEINIT1(SwTableShell,SwBaseShell)
static const sal_uInt16 aUITableAttrRange[] =
{
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 619186115204..c0d542ec8aa2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -133,7 +133,6 @@ void SwTextShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(FN_WORDCOUNT_DIALOG);
}
-TYPEINIT1(SwTextShell,SwBaseShell)
void SwTextShell::ExecInsert(SfxRequest &rReq)
{
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 3c388fe66a8c..dc727de22312 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -99,7 +99,6 @@ void SwPagePreview::InitInterface_Impl()
RID_PVIEW_TOOLBOX);
}
-TYPEINIT1(SwPagePreview,SfxViewShell)
#define SWVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::HAS_PRINTOPTIONS )
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 7f1bc323ff53..0c55eedca0a4 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -126,7 +126,6 @@ void SwSrcView::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId());
}
-TYPEINIT1(SwSrcView, SfxViewShell)
static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_Int32 nCurPage, const OUString& rTitle )
{
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index c762faa60e13..aaa4703a9fa5 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -117,7 +117,6 @@ void SwView::InitInterface_Impl()
#endif
}
-TYPEINIT1(SwView,SfxViewShell)
ShellModes SwView::GetShellMode()
{
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 7b2db477f0cb..11653aa705c0 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -59,7 +59,6 @@
using namespace com::sun::star;
-TYPEINIT2(SwFormatCharFormat,SfxPoolItem,SwClient);
// query the attribute descriptions
void SwAttrSet::GetPresentation(
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index e5ba996d5383..8cca32f3b570 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -47,7 +47,6 @@ void SwWebDocShell::InitInterface_Impl()
{
}
-TYPEINIT1(SwWebDocShell, SwDocShell);
SFX_IMPL_OBJECTFACTORY(SwWebDocShell, SvGlobalName(SO3_SWWEB_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter/web" )
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 6daf3022188d..844de0332fd4 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -48,7 +48,6 @@ void SwWebDrawFormShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
}
-TYPEINIT1(SwWebDrawFormShell, SwDrawFormShell)
SwWebDrawFormShell::SwWebDrawFormShell(SwView& rVw) :
SwDrawFormShell(rVw)
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index f455f57db584..de1b7896c7f6 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -47,7 +47,6 @@ void SwWebFrameShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBFRAME_TOOLBOX);
}
-TYPEINIT1(SwWebFrameShell, SwFrameShell)
SwWebFrameShell::SwWebFrameShell(SwView &_rView) :
SwFrameShell(_rView)
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 5994df559fd5..02433c941add 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -50,7 +50,6 @@ void SwWebGrfShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBGRAPHIC_TOOLBOX);
}
-TYPEINIT1(SwWebGrfShell,SwGrfShell)
SwWebGrfShell::SwWebGrfShell(SwView &_rView) :
SwGrfShell(_rView)
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 65397e033dad..b58861a844aa 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -44,7 +44,6 @@ void SwWebListShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
}
-TYPEINIT1(SwWebListShell,SwListShell)
SwWebListShell::SwWebListShell(SwView &_rView) :
SwListShell(_rView)
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index f6578e83f6df..e58ab8a7b8b0 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -50,7 +50,6 @@ void SwWebTableShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
}
-TYPEINIT1(SwWebTableShell,SwTableShell)
SwWebTableShell::SwWebTableShell(SwView &_rView) :
SwTableShell(_rView)
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index a572f85b1361..19f732c71222 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -56,7 +56,6 @@ void SwWebTextShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD);
}
-TYPEINIT1(SwWebTextShell, SwTextShell)
SwWebTextShell::SwWebTextShell(SwView &_rView) :
SwTextShell(_rView)
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 0954f8bf69d0..8d298b7cf03d 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -86,7 +86,6 @@ void SwWebView::InitInterface_Impl()
RID_WEBTOOLS_TOOLBOX);
}
-TYPEINIT1(SwWebView,SwView)
SwWebView::SwWebView(SfxViewFrame* _pFrame, SfxViewShell* _pShell) :
SwView(_pFrame, _pShell)
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 9d9345b16df7..61efff495395 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -97,15 +97,10 @@ void EDcr_Impl::UnRegisterEDcr(DynamicErrorInfo *pDcr)
ppDcr[lIdx]=nullptr;
}
-TYPEINIT0(ErrorInfo);
ErrorInfo::~ErrorInfo()
{
}
-TYPEINIT1(DynamicErrorInfo, ErrorInfo);
-TYPEINIT1(StringErrorInfo, DynamicErrorInfo);
-TYPEINIT1(TwoStringErrorInfo, DynamicErrorInfo);
-TYPEINIT1(MessageInfo, DynamicErrorInfo);
ErrorInfo *ErrorInfo::GetErrorInfo(sal_uIntPtr lId)
{
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index fb9dc605ed5f..273a14b7c0fe 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -40,9 +40,6 @@ SvCreateInstancePersist SvClassManager::Get( sal_Int32 nClassId )
return i == aAssocTable.end() ? nullptr : i->second;
}
-// SvRttiBase
-TYPEINIT0( SvRttiBase );
-
/** Constructor
@param rMgr Stores factories for objects that can persisted
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index c42200728e89..c6d8b2a0cce6 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -170,7 +170,6 @@ void SvLockBytes::close()
m_pStream = nullptr;
}
-TYPEINIT0(SvLockBytes);
// virtual
ErrCode SvLockBytes::ReadAt(sal_uInt64 const nPos, void * pBuffer, sal_Size nCount,
@@ -251,11 +250,9 @@ ErrCode SvLockBytes::Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const
// class SvOpenLockBytes
-TYPEINIT1(SvOpenLockBytes, SvLockBytes);
// class SvAsyncLockBytes
-TYPEINIT1(SvAsyncLockBytes, SvOpenLockBytes);
// virtual
ErrCode SvAsyncLockBytes::ReadAt(sal_uInt64 const nPos, void * pBuffer, sal_Size nCount,
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 4d147ed1615e..8a7c9c97fa2f 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -373,7 +373,6 @@
#include <tools/resary.hxx>
#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
#include <tools/time.hxx>
@@ -381,7 +380,6 @@
#include <tools/vcompat.hxx>
#include <tools/zcodec.hxx>
#include <touch/touch.h>
-#include <typeinfo>
#include <ucbhelper/content.hxx>
#include <unicode/ubidi.h>
#include <unicode/uchar.h>
diff --git a/vcl/inc/vcleventlisteners.hxx b/vcl/inc/vcleventlisteners.hxx
index e2f72bf6544b..ec97c55cf8d7 100644
--- a/vcl/inc/vcleventlisteners.hxx
+++ b/vcl/inc/vcleventlisteners.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_INC_VCLEVENTLISTENERS_HXX
#include <tools/link.hxx>
-#include <tools/rtti.hxx>
#include <vcl/dllapi.h>
#include <vcl/impdel.hxx>
#include <vcl/vclptr.hxx>
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index c6a96b95c3bc..f0c281763de5 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -28,9 +28,6 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::accessibility::XAccessible;
-TYPEINIT0(VclSimpleEvent);
-TYPEINIT1(VclWindowEvent, VclSimpleEvent);
-TYPEINIT1(VclMenuEvent, VclSimpleEvent);
VclAccessibleEvent::VclAccessibleEvent( sal_uLong n, const Reference<XAccessible>& rxAccessible ) :
VclSimpleEvent(n),
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 1fc7cfeab2f8..adb0de9d9a22 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -30,7 +30,6 @@ private:
TextNode* mpNode; // points at the valid not-destroyed object
public:
- TYPEINFO_OVERRIDE();
TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uInt32 nPara );
virtual ~TextUndoDelPara();
@@ -47,7 +46,6 @@ private:
sal_Int32 mnSepPos;
public:
- TYPEINFO_OVERRIDE();
TextUndoConnectParas( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos );
virtual ~TextUndoConnectParas();
@@ -64,7 +62,6 @@ private:
sal_Int32 mnSepPos;
public:
- TYPEINFO_OVERRIDE();
TextUndoSplitPara( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos );
virtual ~TextUndoSplitPara();
@@ -81,7 +78,6 @@ private:
OUString maText;
public:
- TYPEINFO_OVERRIDE();
TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr );
virtual void Undo() override;
@@ -99,7 +95,6 @@ private:
OUString maText;
public:
- TYPEINFO_OVERRIDE();
TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr );
virtual void Undo() override;
@@ -114,7 +109,6 @@ private:
TextSelection maSelection;
public:
- TYPEINFO_OVERRIDE();
TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel );
virtual ~TextUndoSetAttribs();
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 6fc11ef96d4b..91237d356850 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -29,12 +29,6 @@
#include <svdata.hxx>
#include <tools/resid.hxx>
-TYPEINIT1( TextUndo, SfxUndoAction );
-TYPEINIT1( TextUndoDelPara, TextUndo );
-TYPEINIT1( TextUndoConnectParas, TextUndo );
-TYPEINIT1( TextUndoSplitPara, TextUndo );
-TYPEINIT1( TextUndoInsertChars, TextUndo );
-TYPEINIT1( TextUndoRemoveChars, TextUndo );
namespace
{
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index 1adb531b044d..6db0df05a60a 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -64,7 +64,6 @@ protected:
TEParaPortions* GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; }
public:
- TYPEINFO_OVERRIDE();
explicit TextUndo( TextEngine* pTextEngine );
virtual ~TextUndo();
diff --git a/vcl/source/gdi/extoutdevdata.cxx b/vcl/source/gdi/extoutdevdata.cxx
index 593ab36439e7..49f188c850f7 100644
--- a/vcl/source/gdi/extoutdevdata.cxx
+++ b/vcl/source/gdi/extoutdevdata.cxx
@@ -18,12 +18,10 @@
*/
#include <vcl/extoutdevdata.hxx>
-#include <tools/rtti.hxx>
namespace vcl
{
-TYPEINIT0(ExtOutDevData);
ExtOutDevData::~ExtOutDevData()
{
}
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 5d4633146530..5a1fd37f7c07 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -490,7 +490,6 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
return bRet;
}
-TYPEINIT1(PDFExtOutDevData,ExtOutDevData);
PDFExtOutDevData::PDFExtOutDevData( const OutputDevice& rOutDev ) :
mrOutDev ( rOutDev ),
mbTaggedPDF ( false ),
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index cd10951b8e36..05e0c090011d 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -39,7 +39,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 42a7ed18dc72..6ff4d06b7394 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -47,7 +47,6 @@ private:
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
public:
- TYPEINFO_OVERRIDE();
XMLBackgroundImageContext(
SvXMLImport& rImport,
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index c20fcc6c29fd..746261f73a9f 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -35,7 +35,6 @@ protected:
const OUString& rValue ) override;
public:
- TYPEINFO_OVERRIDE();
XMLChartStyleContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 26d296defc27..1c412c818ae4 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -39,7 +39,6 @@ protected:
void SetInsert( bool bIns ) { bInsert = bIns; }
public:
- TYPEINFO_OVERRIDE();
XMLElementPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 20df48e18164..acb7a5f2d55e 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -37,7 +37,6 @@ class XMLEmbeddedObjectImportContext : public SvXMLImportContext
OUString sCLSID;
public:
- TYPEINFO_OVERRIDE();
const OUString& GetFilterServiceName() const { return sFilterService; }
const OUString& GetFilterCLSID() const { return sCLSID; }
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 6f5195cd2923..0a61d4de5cbe 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -65,7 +65,6 @@ class XMLFootnoteConfigurationImportContext : public SvXMLStyleContext
public:
- TYPEINFO_OVERRIDE();
XMLFootnoteConfigurationImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 335565cbc58e..aee890581c77 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -45,7 +45,6 @@ class XMLImageMapContext : public SvXMLImportContext
::com::sun::star::beans::XPropertySet> xPropertySet;
public:
- TYPEINFO_OVERRIDE();
XMLImageMapContext(
SvXMLImport& rImport,
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 9b8bb0d2edc0..babf25cf8b2c 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -66,7 +66,6 @@ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexBibliographyConfigurationContext(
SvXMLImport& rImport,
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index e7ef59b565d9..6d1f6639faf7 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -77,7 +77,6 @@ class XMLLineNumberingImportContext : public SvXMLStyleContext
public:
- TYPEINFO_OVERRIDE();
XMLLineNumberingImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 7859b9ff4227..05348002dfa2 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -46,7 +46,6 @@ protected:
void add( OUString& rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString& rText );
public:
- TYPEINFO_OVERRIDE();
SdXMLNumberFormatImportContext( SdXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 1d3ef176355d..4dae10a7cdc7 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -40,7 +40,6 @@ class XMLReplacementImageContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLReplacementImageContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index 5f8de6841520..1893f4efdf99 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -29,7 +29,6 @@ class XMLShapePropertySetContext : public SvXMLPropertySetContext
public:
- TYPEINFO_OVERRIDE();
XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index f04a2fc4064b..97d2dae84011 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -36,7 +36,6 @@ class XMLStringBufferImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLStringBufferImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 25359ce19747..6c6c7d9d52a8 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -48,7 +48,6 @@ class XMLTextColumnsContext :public XMLElementPropertyContext
sal_Int32 nAutomaticDistance;
public:
- TYPEINFO_OVERRIDE();
XMLTextColumnsContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 3b51cf3ad9b3..4ace7244dc4a 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -46,7 +46,6 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext
bool bFirst : 1;
public:
- TYPEINFO_OVERRIDE();
XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 68c225342e0c..307dafeaa922 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -38,7 +38,6 @@ class AnimationNodeContext : public SvXMLImportContext
void init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
public:
- TYPEINFO_OVERRIDE();
AnimationNodeContext(
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode,
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 2fe49c692855..9d80281de6b7 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -32,7 +32,6 @@ class XMLAnimationsContext : public SvXMLImportContext
AnimImpImpl* mpImpl;
public:
- TYPEINFO_OVERRIDE();
XMLAnimationsContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index ad605cac6af7..2baa3117e1cd 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -124,7 +124,6 @@ protected:
bool bValid; /// whether this field is valid ?
public:
- TYPEINFO_OVERRIDE();
XMLTextFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -200,7 +199,6 @@ protected:
sal_uInt16 nElementToken; /// token for this element field
public:
- TYPEINFO_OVERRIDE();
XMLSenderFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -235,7 +233,6 @@ class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext
const OUString sPropertyContent;
public:
- TYPEINFO_OVERRIDE();
XMLAuthorFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -267,7 +264,6 @@ class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext
sal_Int16 nPlaceholderType;
public:
- TYPEINFO_OVERRIDE();
XMLPlaceholderFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -308,7 +304,6 @@ protected:
bool bIsDefaultLanguage;
public:
- TYPEINFO_OVERRIDE();
XMLTimeFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -331,7 +326,6 @@ public:
class XMLDateFieldImportContext : public XMLTimeFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLDateFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -357,7 +351,6 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext
bool sStringOK; /// continuation string encountered?
public:
- TYPEINFO_OVERRIDE();
XMLPageContinuationImportContext(
SvXMLImport& rImport, /// XML Import
@@ -390,7 +383,6 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext
bool sNumberFormatOK;
public:
- TYPEINFO_OVERRIDE();
XMLPageNumberImportContext(
SvXMLImport& rImport, /// XML Import
@@ -444,7 +436,6 @@ protected:
bool bUseDisplay );
public:
- TYPEINFO_OVERRIDE();
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@@ -467,7 +458,6 @@ public:
class XMLDatabaseNameImportContext : public XMLDatabaseFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLDatabaseNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -496,7 +486,6 @@ protected:
const OUString& sLocalName);
public:
- TYPEINFO_OVERRIDE();
XMLDatabaseNextImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -521,7 +510,6 @@ class XMLDatabaseSelectImportContext : public XMLDatabaseNextImportContext
bool bNumberOK;
public:
- TYPEINFO_OVERRIDE();
XMLDatabaseSelectImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -549,7 +537,6 @@ class XMLDatabaseNumberImportContext : public XMLDatabaseFieldImportContext
bool bValueOK;
public:
- TYPEINFO_OVERRIDE();
XMLDatabaseNumberImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -580,7 +567,6 @@ protected:
bool bHasContent;
public:
- TYPEINFO_OVERRIDE();
XMLSimpleDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -617,7 +603,6 @@ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext
bool bIsDefaultLanguage;
public:
- TYPEINFO_OVERRIDE();
XMLDateTimeDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -642,7 +627,6 @@ class XMLRevisionDocInfoImportContext : public XMLSimpleDocInfoImportContext
const OUString sPropertyRevision;
public:
- TYPEINFO_OVERRIDE();
XMLRevisionDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -669,7 +653,6 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext
bool bIsDefaultLanguage;
public:
- TYPEINFO_OVERRIDE();
XMLUserDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -696,7 +679,6 @@ class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext
bool bIsHidden;
public:
- TYPEINFO_OVERRIDE();
XMLHiddenParagraphImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -733,7 +715,6 @@ class XMLConditionalTextImportContext : public XMLTextFieldImportContext
bool bCurrentValue;
public:
- TYPEINFO_OVERRIDE();
XMLConditionalTextImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -766,7 +747,6 @@ class XMLHiddenTextImportContext : public XMLTextFieldImportContext
bool bIsHidden;
public:
- TYPEINFO_OVERRIDE();
XMLHiddenTextImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -795,7 +775,6 @@ class XMLFileNameImportContext : public XMLTextFieldImportContext
bool bFixed;
public:
- TYPEINFO_OVERRIDE();
XMLFileNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -821,7 +800,6 @@ class XMLTemplateNameImportContext : public XMLTextFieldImportContext
sal_Int16 nFormat;
public:
- TYPEINFO_OVERRIDE();
XMLTemplateNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -849,7 +827,6 @@ class XMLChapterImportContext : public XMLTextFieldImportContext
sal_Int8 nLevel;
public:
- TYPEINFO_OVERRIDE();
XMLChapterImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -878,7 +855,6 @@ class XMLCountFieldImportContext : public XMLTextFieldImportContext
bool bNumberFormatOK;
public:
- TYPEINFO_OVERRIDE();
XMLCountFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -910,7 +886,6 @@ class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext
bool bNumberFormatOK;
public:
- TYPEINFO_OVERRIDE();
XMLPageVarGetFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -938,7 +913,6 @@ class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext
bool bActive;
public:
- TYPEINFO_OVERRIDE();
XMLPageVarSetFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -971,7 +945,6 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext
bool bDescriptionOK;
public:
- TYPEINFO_OVERRIDE();
XMLMacroFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1013,7 +986,6 @@ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext
bool bTypeOK;
public:
- TYPEINFO_OVERRIDE();
XMLReferenceFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1043,7 +1015,6 @@ class XMLDdeFieldDeclsImportContext : public SvXMLImportContext
SvXMLTokenMap aTokenMap;
public:
- TYPEINFO_OVERRIDE();
XMLDdeFieldDeclsImportContext(SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -1068,7 +1039,6 @@ class XMLDdeFieldDeclImportContext : public SvXMLImportContext
const SvXMLTokenMap& rTokenMap;
public:
- TYPEINFO_OVERRIDE();
XMLDdeFieldDeclImportContext(SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -1088,7 +1058,6 @@ class XMLDdeFieldImportContext : public XMLTextFieldImportContext
OUString sPropertyContent;
public:
- TYPEINFO_OVERRIDE();
XMLDdeFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1114,7 +1083,6 @@ class XMLSheetNameImportContext : public XMLTextFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLSheetNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1136,7 +1104,6 @@ protected:
class XMLPageNameFieldImportContext : public XMLTextFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLPageNameFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -1166,7 +1133,6 @@ class XMLUrlFieldImportContext : public XMLTextFieldImportContext
bool bFrameOK;
public:
- TYPEINFO_OVERRIDE();
XMLUrlFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1192,7 +1158,6 @@ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext
::std::vector< ::com::sun::star::beans::PropertyValue> aValues;
public:
- TYPEINFO_OVERRIDE();
XMLBibliographyFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1240,7 +1205,6 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext
sal_uInt16 m_nToken;
public:
- TYPEINFO_OVERRIDE();
XMLAnnotationImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1279,7 +1243,6 @@ class XMLScriptImportContext : public XMLTextFieldImportContext
bool bScriptTypeOK;
public:
- TYPEINFO_OVERRIDE();
XMLScriptImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1303,7 +1266,6 @@ class XMLMeasureFieldImportContext : public XMLTextFieldImportContext
sal_Int16 mnKind;
public:
- TYPEINFO_OVERRIDE();
XMLMeasureFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1340,7 +1302,6 @@ class XMLDropDownFieldImportContext : public XMLTextFieldImportContext
const OUString sPropertyToolTip;
public:
- TYPEINFO_OVERRIDE();
XMLDropDownFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
@@ -1367,7 +1328,6 @@ protected:
class XMLHeaderFieldImportContext : public XMLTextFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLHeaderFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -1389,7 +1349,6 @@ public:
class XMLFooterFieldImportContext : public XMLTextFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLFooterFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -1411,7 +1370,6 @@ public:
class XMLDateTimeFieldImportContext : public XMLTextFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLDateTimeFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -1437,7 +1395,6 @@ class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
const OUString sPropertyValue;
public:
- TYPEINFO_OVERRIDE();
XMLCustomPropertyFieldImportContext (SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index b369ad0bb8b9..a995279fe9a7 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -169,7 +169,6 @@ private:
public:
- TYPEINFO_OVERRIDE();
XMLVarFieldImportContext(
// for XMLTextFieldImportContext:
@@ -213,7 +212,6 @@ class XMLVariableGetFieldImportContext : public XMLVarFieldImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLVariableGetFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -238,7 +236,6 @@ class XMLExpressionFieldImportContext : public XMLVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLExpressionFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -259,7 +256,6 @@ class XMLTextInputFieldImportContext : public XMLVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextInputFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -288,7 +284,6 @@ class XMLSetVarFieldImportContext : public XMLVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLSetVarFieldImportContext(
// for XMLTextFieldImportContext:
@@ -333,7 +328,6 @@ class XMLVariableSetFieldImportContext : public XMLSetVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLVariableSetFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -358,7 +352,6 @@ class XMLVariableInputFieldImportContext : public XMLSetVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLVariableInputFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -382,7 +375,6 @@ class XMLUserFieldImportContext : public XMLSetVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLUserFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -397,7 +389,6 @@ class XMLUserFieldInputImportContext : public XMLVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLUserFieldInputImportContext(
SvXMLImport& rImport, /// XML Import
@@ -425,7 +416,6 @@ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLSequenceFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -461,7 +451,6 @@ class XMLVariableDeclsImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLVariableDeclsImportContext(
SvXMLImport& rImport, /// XML Import
@@ -495,7 +484,6 @@ class XMLVariableDeclImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLVariableDeclImportContext(
SvXMLImport& rImport, /// XML Import
@@ -529,7 +517,6 @@ class XMLTableFormulaImportContext : public XMLTextFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTableFormulaImportContext(
SvXMLImport& rImport, /// XML Import
@@ -570,7 +557,6 @@ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext
public:
- TYPEINFO_OVERRIDE();
XMLDatabaseDisplayImportContext(
SvXMLImport& rImport, /// XML Import
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index d20678ee409d..dc4034313ced 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -33,7 +33,6 @@ private:
SvxXMLTabStopArray_Impl* mpTabStops;
public:
- TYPEINFO_OVERRIDE();
SvxXMLTabStopImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index fb2c3c01f69a..5866ef13b156 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
@@ -23,7 +23,6 @@
#include "XMLSymbolImageContext.hxx"
#include "XMLLabelSeparatorContext.hxx"
-TYPEINIT1( XMLChartPropertyContext, SvXMLImportContext );
using namespace ::com::sun::star;
diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx
index bc1feb065a5c..bbe9c444c849 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.hxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.hxx
@@ -24,7 +24,6 @@
class XMLChartPropertyContext : public SvXMLPropertySetContext
{
public:
- TYPEINFO_OVERRIDE();
XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 14517754e86e..5e2322e590ac 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -37,7 +37,6 @@ using ::xmloff::token::XML_GRAPHIC_PROPERTIES;
using ::xmloff::token::XML_CHART_PROPERTIES;
-TYPEINIT1( XMLChartStyleContext, XMLPropStyleContext );
void XMLChartStyleContext::SetAttribute(
sal_uInt16 nPrefixKey,
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 49eb4f5da6c6..321f266c0f68 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -26,7 +26,6 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
-TYPEINIT1( XMLLabelSeparatorContext, XMLElementPropertyContext );
using namespace ::com::sun::star;
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index 88ec8a8b110e..da52a4bf1717 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -24,7 +24,6 @@
class XMLLabelSeparatorContext : public XMLElementPropertyContext
{
public:
- TYPEINFO_OVERRIDE();
XMLLabelSeparatorContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 92efdfc22336..f4c0b1b9308d 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -26,7 +26,6 @@
#include <xmloff/XMLBase64ImportContext.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
-TYPEINIT1( XMLSymbolImageContext, XMLElementPropertyContext );
using namespace ::com::sun::star;
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index 3eab26aa930b..ffb55f7bc8f2 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star {
class XMLSymbolImageContext : public XMLElementPropertyContext
{
public:
- TYPEINFO_OVERRIDE();
XMLSymbolImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 0090195b228d..fe73372b4fa3 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -86,7 +86,6 @@ SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper,
SchXMLDocContext::~SchXMLDocContext()
{}
-TYPEINIT1( SchXMLDocContext, SvXMLImportContext );
SvXMLImportContext* SchXMLDocContext::CreateChildContext(
sal_uInt16 nPrefix,
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index 36e0f2c449ec..091a068a379b 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -49,7 +49,6 @@ public:
const OUString& rLName );
virtual ~SchXMLDocContext();
- TYPEINFO_OVERRIDE();
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index 76b92f1bde22..ac659f0df18c 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::io;
-TYPEINIT1( XMLBase64ImportContext, SvXMLImportContext );
XMLBase64ImportContext::XMLBase64ImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index f17c59146951..66d95ade842b 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -74,7 +74,6 @@ class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext
::com::sun::star::xml::sax::XDocumentHandler > xHandler;
public:
- TYPEINFO_OVERRIDE();
XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -94,7 +93,6 @@ public:
virtual void Characters( const OUString& rChars ) override;
};
-TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext );
XMLEmbeddedObjectImportContext_Impl::XMLEmbeddedObjectImportContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -138,7 +136,6 @@ void XMLEmbeddedObjectImportContext_Impl::Characters( const OUString& rChars )
xHandler->characters( rChars );
}
-TYPEINIT1( XMLEmbeddedObjectImportContext, SvXMLImportContext );
bool XMLEmbeddedObjectImportContext::SetComponent(
Reference< XComponent >& rComp )
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index dafd6af90696..8b232e395669 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -29,7 +29,6 @@
using namespace ::com::sun::star;
-TYPEINIT0( SvXMLImportContext );
SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
const OUString& rLName ) :
mrImport( rImp ),
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index ed81d6ef4ce9..8abc0ed7185b 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -45,7 +45,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES;
using ::xmloff::token::XML_GRAPHIC_PROPERTIES;
using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
-TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext );
XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles )
: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, true )
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 24daf511706d..2a4dc6d43da6 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -125,7 +125,6 @@ protected:
bool bValid;
public:
- TYPEINFO_OVERRIDE();
XMLImageMapObjectContext(
SvXMLImport& rImport,
@@ -159,7 +158,6 @@ protected:
};
-TYPEINIT1( XMLImageMapObjectContext, SvXMLImportContext );
XMLImageMapObjectContext::XMLImageMapObjectContext(
SvXMLImport& rImport,
@@ -319,7 +317,6 @@ class XMLImageMapRectangleContext : public XMLImageMapObjectContext
bool bHeightOK;
public:
- TYPEINFO_OVERRIDE();
XMLImageMapRectangleContext(
SvXMLImport& rImport,
@@ -342,7 +339,6 @@ protected:
-TYPEINIT1(XMLImageMapRectangleContext, XMLImageMapObjectContext);
XMLImageMapRectangleContext::XMLImageMapRectangleContext(
SvXMLImport& rImport,
@@ -429,7 +425,6 @@ class XMLImageMapPolygonContext : public XMLImageMapObjectContext
bool bPointsOK;
public:
- TYPEINFO_OVERRIDE();
XMLImageMapPolygonContext(
SvXMLImport& rImport,
@@ -452,7 +447,6 @@ protected:
-TYPEINIT1(XMLImageMapPolygonContext, XMLImageMapObjectContext);
XMLImageMapPolygonContext::XMLImageMapPolygonContext(
SvXMLImport& rImport,
@@ -527,7 +521,6 @@ class XMLImageMapCircleContext : public XMLImageMapObjectContext
bool bRadiusOK;
public:
- TYPEINFO_OVERRIDE();
XMLImageMapCircleContext(
SvXMLImport& rImport,
@@ -548,7 +541,6 @@ protected:
::com::sun::star::beans::XPropertySet> & rPropertySet) override;
};
-TYPEINIT1(XMLImageMapCircleContext, XMLImageMapObjectContext);
XMLImageMapCircleContext::XMLImageMapCircleContext(
SvXMLImport& rImport,
@@ -631,7 +623,6 @@ void XMLImageMapCircleContext::Prepare(
-TYPEINIT1(XMLImageMapContext, SvXMLImportContext);
XMLImageMapContext::XMLImageMapContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 0fce93fde052..d7872d941f01 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -488,7 +488,6 @@ private:
std::shared_ptr< SvXMLImportContext > mpSlaveContext;
public:
- TYPEINFO_OVERRIDE();
SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -509,7 +508,6 @@ public:
virtual void Characters( const OUString& rChars ) override;
};
-TYPEINIT1( SdXMLNumberFormatMemberImportContext, SvXMLImportContext );
SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext )
: SvXMLImportContext(rImport, nPrfx, rLocalName),
@@ -578,7 +576,6 @@ void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars )
maText += rChars;
}
-TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext );
SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
: SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles),
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index bf70fee4cfc6..4ceca19a46ac 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -32,7 +32,6 @@ using ::com::sun::star::uno::makeAny;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::beans;
-TYPEINIT1( XMLReplacementImageContext, SvXMLImportContext );
XMLReplacementImageContext::XMLReplacementImageContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index a3e75e13008f..0b48378f1331 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-TYPEINIT1( XMLShapePropertySetContext, SvXMLPropertySetContext );
XMLShapePropertySetContext::XMLShapePropertySetContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 9a8888d9dd82..f7e97373a66e 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -43,7 +43,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES;
using ::xmloff::token::XML_GRAPHIC_PROPERTIES;
using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
-TYPEINIT1( XMLShapeStyleContext, XMLPropStyleContext );
XMLShapeStyleContext::XMLShapeStyleContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index d6f89e55d392..9d374e3a34dd 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -623,7 +623,6 @@ Any AnimationsImportHelperImpl::convertPath( const OUString& rValue )
return makeAny( rValue );
}
-TYPEINIT1( AnimationNodeContext, SvXMLImportContext );
AnimationNodeContext::AnimationNodeContext(
const Reference< XAnimationNode >& xParentNode,
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 04e910e30972..3ce0856dbc8b 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -380,7 +380,6 @@ public:
OUString maPathShapeId;
public:
- TYPEINFO_OVERRIDE();
XMLAnimationsEffectContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -400,13 +399,11 @@ class XMLAnimationsSoundContext : public SvXMLImportContext
XMLAnimationsEffectContext* mpParent;
public:
- TYPEINFO_OVERRIDE();
XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent );
virtual ~XMLAnimationsSoundContext();
};
-TYPEINIT1( XMLAnimationsSoundContext, SvXMLImportContext );
XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent )
: SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent )
@@ -443,7 +440,6 @@ XMLAnimationsSoundContext::~XMLAnimationsSoundContext()
{
}
-TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext );
XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl )
: SvXMLImportContext(rImport, nPrfx, rLocalName),
@@ -650,7 +646,6 @@ void XMLAnimationsEffectContext::EndElement()
}
}
-TYPEINIT1( XMLAnimationsContext, SvXMLImportContext );
XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& )
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index 5545edb1eb07..705528886271 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
-TYPEINIT1( SdXMLDescriptionContext, SvXMLImportContext );
SdXMLDescriptionContext::SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const Reference< XAttributeList>&, const Reference< XShape >& rxShape)
diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index d4e4065101a5..f820a830c59d 100644
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
@@ -31,7 +31,6 @@ private:
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape;
OUString msText;
public:
- TYPEINFO_OVERRIDE();
SdXMLDescriptionContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 72eed8528074..b19b343f66ec 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -76,7 +76,6 @@ private:
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape;
public:
- TYPEINFO_OVERRIDE();
SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape );
virtual ~SdXMLEventContext();
@@ -104,13 +103,11 @@ class XMLEventSoundContext : public SvXMLImportContext
SdXMLEventContext* mpParent;
public:
- TYPEINFO_OVERRIDE();
XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent );
virtual ~XMLEventSoundContext();
};
-TYPEINIT1( XMLEventSoundContext, SvXMLImportContext );
XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent )
: SvXMLImportContext( rImp, nPrfx, rLocalName ), mpParent( pParent )
@@ -147,7 +144,6 @@ XMLEventSoundContext::~XMLEventSoundContext()
{
}
-TYPEINIT1( SdXMLEventContext, SvXMLImportContext );
SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
: SvXMLImportContext(rImp, nPrfx, rLocalName)
@@ -482,7 +478,6 @@ void SdXMLEventContext::EndElement()
} while(false);
}
-TYPEINIT1( SdXMLEventsContext, SvXMLImportContext );
SdXMLEventsContext::SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const Reference< XAttributeList>&, const Reference< XShape >& rxShape)
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index 61efd8e72d64..c190d8ca14a9 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -31,7 +31,6 @@ private:
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape;
public:
- TYPEINFO_OVERRIDE();
SdXMLEventsContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 13241312d7bd..3f42d3adc61a 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -142,7 +142,6 @@ void SdXMLLayerContext::EndElement()
}
-TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext );
SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&)
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index dea7841f13d7..fe788f5cc2c2 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -31,7 +31,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager;
public:
- TYPEINFO_OVERRIDE();
SdXMLLayerSetContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index e4409d1dd955..9a34294350d9 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -101,7 +101,6 @@ public:
const uno::Reference<xml::sax::XAttributeList>& xAttrList);
virtual ~SdXMLDocContext_Impl();
- TYPEINFO_OVERRIDE();
virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -121,7 +120,6 @@ SdXMLDocContext_Impl::~SdXMLDocContext_Impl()
{
}
-TYPEINIT1( SdXMLDocContext_Impl, SvXMLImportContext );
SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 48f960eb3ae7..105b29004d96 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -38,7 +38,6 @@
using namespace ::com::sun::star;
-TYPEINIT1( SdXML3DObjectContext, SdXMLShapeContext );
SdXML3DObjectContext::SdXML3DObjectContext(
SvXMLImport& rImport,
@@ -105,7 +104,6 @@ void SdXML3DObjectContext::EndElement()
SdXMLShapeContext::EndElement();
}
-TYPEINIT1( SdXML3DCubeObjectShapeContext, SdXML3DObjectContext);
SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
SvXMLImport& rImport,
@@ -207,7 +205,6 @@ void SdXML3DCubeObjectShapeContext::EndElement()
SdXML3DObjectContext::EndElement();
}
-TYPEINIT1( SdXML3DSphereObjectShapeContext, SdXML3DObjectContext);
SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
SvXMLImport& rImport,
@@ -306,7 +303,6 @@ void SdXML3DSphereObjectShapeContext::EndElement()
SdXML3DObjectContext::EndElement();
}
-TYPEINIT1( SdXML3DPolygonBasedShapeContext, SdXML3DObjectContext );
SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
SvXMLImport& rImport,
@@ -393,7 +389,6 @@ void SdXML3DPolygonBasedShapeContext::EndElement()
SdXML3DObjectContext::EndElement();
}
-TYPEINIT1( SdXML3DLatheObjectShapeContext, SdXML3DPolygonBasedShapeContext);
SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
SvXMLImport& rImport,
@@ -428,7 +423,6 @@ void SdXML3DLatheObjectShapeContext::EndElement()
SdXML3DPolygonBasedShapeContext::EndElement();
}
-TYPEINIT1( SdXML3DExtrudeObjectShapeContext, SdXML3DPolygonBasedShapeContext);
SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 0c05f850c02e..dc4080f6ce6d 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -24,7 +24,6 @@
#include "sdxmlimp_impl.hxx"
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
-#include <tools/rtti.hxx>
#include <com/sun/star/drawing/HomogenMatrix.hpp>
#include <com/sun/star/drawing/Direction3D.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
@@ -41,7 +40,6 @@ protected:
bool mbSetTransform;
public:
- TYPEINFO_OVERRIDE();
SdXML3DObjectContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -65,7 +63,6 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext
bool mbMaxEdgeUsed;
public:
- TYPEINFO_OVERRIDE();
SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -88,7 +85,6 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
bool mbSizeUsed;
public:
- TYPEINFO_OVERRIDE();
SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -109,7 +105,6 @@ class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext
OUString maViewBox;
public:
- TYPEINFO_OVERRIDE();
SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -127,7 +122,6 @@ public:
class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext
{
public:
- TYPEINFO_OVERRIDE();
SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -145,7 +139,6 @@ public:
class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext
{
public:
- TYPEINFO_OVERRIDE();
SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 507dbbb2000f..5fc4b451b197 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -85,7 +85,6 @@ SdXML3DLightContext::~SdXML3DLightContext()
{
}
-TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext );
SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 49e82e155895..8c120acad652 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -24,7 +24,6 @@
#include "sdxmlimp_impl.hxx"
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
-#include <tools/rtti.hxx>
#include <ximpshap.hxx>
// dr3d:3dscene context
@@ -36,7 +35,6 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren;
public:
- TYPEINFO_OVERRIDE();
SdXML3DSceneShapeContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 5bb006cf9720..51aaca6cf328 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -51,7 +51,6 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token;
using namespace ::xmloff::EnhancedCustomShapeToken;
-TYPEINIT1( XMLEnhancedCustomShapeContext, SvXMLImportContext );
XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index f3ce081cec87..cdc6c4f83a3e 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -51,7 +51,6 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix,
const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry );
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 4c6eca23b826..1757a88e5816 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -27,7 +27,6 @@
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext );
SdXMLGroupShapeContext::SdXMLGroupShapeContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index 8f609ee49fbd..2ac189c85d59 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -24,7 +24,6 @@
#include "sdxmlimp_impl.hxx"
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
-#include <tools/rtti.hxx>
#include "ximpshap.hxx"
// draw:g context (RECURSIVE)
@@ -35,7 +34,6 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren;
public:
- TYPEINFO_OVERRIDE();
SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index fdea3d9c3731..18349cf43936 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -24,7 +24,6 @@
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-TYPEINIT1( SdXMLShapeLinkContext, SvXMLImportContext );
SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes)
: SvXMLShapeContext( rImport, nPrfx, rLocalName, false )
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 85f3442cdec3..e1efa062b8ae 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -24,7 +24,6 @@
#include "sdxmlimp_impl.hxx"
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
-#include <tools/rtti.hxx>
#include "ximpshap.hxx"
// draw:a context
@@ -39,7 +38,6 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext
OUString msHyperlink;
public:
- TYPEINFO_OVERRIDE();
SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index bcf1871d274f..404fa163c20f 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -198,7 +198,6 @@ void DrawAnnotationContext::EndElement()
}
}
-TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext );
SdXMLGenericPageContext::SdXMLGenericPageContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index b0677fdff4cb..8f09146431c8 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -25,7 +25,6 @@
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/office/XAnnotationAccess.hpp>
-#include <tools/rtti.hxx>
#include "ximpshap.hxx"
// draw:g context (RECURSIVE)
@@ -61,7 +60,6 @@ protected:
void SetNavigationOrder();
public:
- TYPEINFO_OVERRIDE();
SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 7ce09b5c4d8d..dee62a3312e0 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -134,8 +134,6 @@ static bool ImpIsEmptyURL( const OUString& rURL )
return false;
}
-TYPEINIT1( SvXMLShapeContext, SvXMLImportContext );
-TYPEINIT1( SdXMLShapeContext, SvXMLShapeContext );
SdXMLShapeContext::SdXMLShapeContext(
SvXMLImport& rImport,
@@ -1009,7 +1007,6 @@ void SdXMLShapeContext::onDemandRescueUsefulDataFromTemporary( const SvXMLImport
}
}
-TYPEINIT1( SdXMLRectShapeContext, SdXMLShapeContext );
SdXMLRectShapeContext::SdXMLRectShapeContext(
SvXMLImport& rImport,
@@ -1075,7 +1072,6 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-TYPEINIT1( SdXMLLineShapeContext, SdXMLShapeContext );
SdXMLLineShapeContext::SdXMLLineShapeContext(
SvXMLImport& rImport,
@@ -1191,7 +1187,6 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-TYPEINIT1( SdXMLEllipseShapeContext, SdXMLShapeContext );
SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
SvXMLImport& rImport,
@@ -1326,7 +1321,6 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-TYPEINIT1( SdXMLPolygonShapeContext, SdXMLShapeContext );
SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
SvXMLImport& rImport,
@@ -1435,7 +1429,6 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-TYPEINIT1( SdXMLPathShapeContext, SdXMLShapeContext );
SdXMLPathShapeContext::SdXMLPathShapeContext(
SvXMLImport& rImport,
@@ -1585,7 +1578,6 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-TYPEINIT1( SdXMLTextBoxShapeContext, SdXMLShapeContext );
SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
SvXMLImport& rImport,
@@ -1776,7 +1768,6 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-TYPEINIT1( SdXMLControlShapeContext, SdXMLShapeContext );
SdXMLControlShapeContext::SdXMLControlShapeContext(
SvXMLImport& rImport,
@@ -1841,7 +1832,6 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-TYPEINIT1( SdXMLConnectorShapeContext, SdXMLShapeContext );
SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
SvXMLImport& rImport,
@@ -2110,7 +2100,6 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
}
}
-TYPEINIT1( SdXMLMeasureShapeContext, SdXMLShapeContext );
SdXMLMeasureShapeContext::SdXMLMeasureShapeContext(
SvXMLImport& rImport,
@@ -2222,7 +2211,6 @@ void SdXMLMeasureShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-TYPEINIT1( SdXMLPageShapeContext, SdXMLShapeContext );
SdXMLPageShapeContext::SdXMLPageShapeContext(
SvXMLImport& rImport,
@@ -2310,7 +2298,6 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-TYPEINIT1( SdXMLCaptionShapeContext, SdXMLShapeContext );
SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
SvXMLImport& rImport,
@@ -2411,7 +2398,6 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext );
SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
SvXMLImport& rImport,
@@ -2577,7 +2563,6 @@ SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext()
}
-TYPEINIT1( SdXMLChartShapeContext, SdXMLShapeContext );
SdXMLChartShapeContext::SdXMLChartShapeContext(
SvXMLImport& rImport,
@@ -2682,7 +2667,6 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre
return nullptr;
}
-TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext );
SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -2895,7 +2879,6 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
return pContext;
}
-TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext );
SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -3057,7 +3040,6 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n
return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList );
}
-TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext );
SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -3335,7 +3317,6 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n
return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList );
}
-TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext );
SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -3429,7 +3410,6 @@ void SdXMLFloatingFrameShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext );
SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -3722,7 +3702,6 @@ void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix,
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-TYPEINIT1( SdXMLCustomShapeContext, SdXMLShapeContext );
SdXMLCustomShapeContext::SdXMLCustomShapeContext(
SvXMLImport& rImport,
@@ -3948,7 +3927,6 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext(
return pContext;
}
-TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext );
SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes )
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false )
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 972a03a6d3a9..e2f6b9b8e384 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/awt/Point.hpp>
-#include <tools/rtti.hxx>
#include "xexptran.hxx"
#include <vector>
#include <xmloff/shapeimport.hxx>
@@ -102,7 +101,6 @@ protected:
bool isPresentationShape() const;
public:
- TYPEINFO_OVERRIDE();
SdXMLShapeContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -133,7 +131,6 @@ class SdXMLRectShapeContext : public SdXMLShapeContext
sal_Int32 mnRadius;
public:
- TYPEINFO_OVERRIDE();
SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -157,7 +154,6 @@ class SdXMLLineShapeContext : public SdXMLShapeContext
sal_Int32 mnY2;
public:
- TYPEINFO_OVERRIDE();
SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -184,7 +180,6 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext
sal_Int32 mnStartAngle;
sal_Int32 mnEndAngle;
public:
- TYPEINFO_OVERRIDE();
SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -207,7 +202,6 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext
bool mbClosed;
public:
- TYPEINFO_OVERRIDE();
SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -228,7 +222,6 @@ class SdXMLPathShapeContext : public SdXMLShapeContext
OUString maViewBox;
public:
- TYPEINFO_OVERRIDE();
SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -250,7 +243,6 @@ class SdXMLTextBoxShapeContext : public SdXMLShapeContext
OUString maChainNextName;
public:
- TYPEINFO_OVERRIDE();
SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -272,7 +264,6 @@ private:
OUString maFormId;
public:
- TYPEINFO_OVERRIDE();
SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -308,7 +299,6 @@ private:
com::sun::star::uno::Any maPath;
public:
- TYPEINFO_OVERRIDE();
SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -331,7 +321,6 @@ private:
::com::sun::star::awt::Point maEnd;
public:
- TYPEINFO_OVERRIDE();
SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -353,7 +342,6 @@ class SdXMLPageShapeContext : public SdXMLShapeContext
private:
sal_Int32 mnPageNumber;
public:
- TYPEINFO_OVERRIDE();
SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -376,7 +364,6 @@ private:
sal_Int32 mnRadius;
public:
- TYPEINFO_OVERRIDE();
SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -399,7 +386,6 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream;
public:
- TYPEINFO_OVERRIDE();
SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -424,7 +410,6 @@ class SdXMLChartShapeContext : public SdXMLShapeContext
SvXMLImportContext* mpChartContext;
public:
- TYPEINFO_OVERRIDE();
SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -451,7 +436,6 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream;
public:
- TYPEINFO_OVERRIDE();
SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -483,7 +467,6 @@ private:
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams;
public:
- TYPEINFO_OVERRIDE();
SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -514,7 +497,6 @@ private:
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams;
public:
- TYPEINFO_OVERRIDE();
SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -546,7 +528,6 @@ private:
OUString maHref;
public:
- TYPEINFO_OVERRIDE();
SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -577,7 +558,6 @@ protected:
virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const override;
public:
- TYPEINFO_OVERRIDE();
SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
@@ -607,7 +587,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -630,7 +609,6 @@ public:
class SdXMLTableShapeContext : public SdXMLShapeContext
{
public:
- TYPEINFO_OVERRIDE();
SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index 2ecde45c2f2c..4175ff79248b 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -61,7 +61,6 @@ public:
{}
};
-TYPEINIT1( SdXMLShowsContext, SvXMLImportContext );
SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
: SvXMLImportContext(rImport, nPrfx, rLocalName)
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index dd73785d51f6..0eb6c9a52af8 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -32,7 +32,6 @@ class SdXMLShowsContext : public SvXMLImportContext
ShowsImpImpl* mpImpl;
public:
- TYPEINFO_OVERRIDE();
SdXMLShowsContext( SdXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index dc2de24d8d8b..a45d36af00e1 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -55,7 +55,6 @@ class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext
{
public:
- TYPEINFO_OVERRIDE();
SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -74,7 +73,6 @@ public:
const XMLPropertyState& rProp) override;
};
-TYPEINIT1( SdXMLDrawingPagePropertySetContext, SvXMLPropertySetContext );
SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -132,7 +130,6 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
class SdXMLDrawingPageStyleContext : public XMLPropStyleContext
{
public:
- TYPEINFO_OVERRIDE();
SdXMLDrawingPageStyleContext(
SvXMLImport& rImport,
@@ -156,7 +153,6 @@ public:
::com::sun::star::beans::XPropertySet > & rPropSet ) override;
};
-TYPEINIT1( SdXMLDrawingPageStyleContext, XMLPropStyleContext );
SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(
SvXMLImport& rImport,
@@ -299,7 +295,6 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
}
}
-TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext );
SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
SdXMLImport& rImport,
@@ -381,7 +376,6 @@ SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext()
{
}
-TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext );
SdXMLPageMasterContext::SdXMLPageMasterContext(
SdXMLImport& rImport,
@@ -448,7 +442,6 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
return pContext;
}
-TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext );
SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
SdXMLImport& rImport,
@@ -775,7 +768,6 @@ SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext()
{
}
-TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext );
SdXMLMasterPageContext::SdXMLMasterPageContext(
SdXMLImport& rImport,
@@ -944,7 +936,6 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
return pContext;
}
-TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext );
SdXMLStylesContext::SdXMLStylesContext(
SdXMLImport& rImport,
@@ -1469,7 +1460,6 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
}
-TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext );
SdXMLMasterStylesContext::SdXMLMasterStylesContext(
SdXMLImport& rImport,
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index b342b76c57a4..dc19de9db795 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -46,7 +46,6 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
- TYPEINFO_OVERRIDE();
SdXMLPageMasterStyleContext(
SdXMLImport& rImport,
@@ -75,7 +74,6 @@ class SdXMLPageMasterContext: public SvXMLStyleContext
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
- TYPEINFO_OVERRIDE();
SdXMLPageMasterContext(
SdXMLImport& rImport,
@@ -101,7 +99,6 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext
OUString msStyleName;
public:
- TYPEINFO_OVERRIDE();
SdXMLMasterPageContext(
SdXMLImport& rImport,
@@ -159,7 +156,6 @@ class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
- TYPEINFO_OVERRIDE();
SdXMLPresentationPageLayoutContext(
SdXMLImport& rImport,
@@ -211,7 +207,6 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
public:
- TYPEINFO_OVERRIDE();
SdXMLStylesContext(
SdXMLImport& rImport,
@@ -240,7 +235,6 @@ class SdXMLMasterStylesContext : public SvXMLImportContext
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
- TYPEINFO_OVERRIDE();
SdXMLMasterStylesContext(
SdXMLImport& rImport,
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index a295ae7a9a33..bf272678c215 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -40,7 +40,6 @@ namespace xmloff
using ::com::sun::star::xml::sax::XAttributeList;
//= OFormsRootImport
- TYPEINIT1(OFormsRootImport, SvXMLImportContext);
OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName )
:SvXMLImportContext(rImport, nPrfx, rLocalName)
{
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index e245ba2669f9..e672d71e905e 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -36,7 +36,6 @@ namespace xmloff
,public OStackedLogging
{
public:
- TYPEINFO_OVERRIDE();
OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const OUString& _rLocalName);
virtual ~OFormsRootImport();
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index 3dd67b0ecd74..16bbd7943caf 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -37,7 +37,6 @@ using ::com::sun::star::container::XNameReplace;
using ::com::sun::star::document::XEventsSupplier;
using ::com::sun::star::lang::IllegalArgumentException;
-TYPEINIT1(XMLEventsImportContext, SvXMLImportContext);
XMLEventsImportContext::XMLEventsImportContext(
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 76f9dbeb24ad..67e883a08250 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -33,7 +33,6 @@
using namespace ::com::sun::star;
-TYPEINIT1( XMLGradientStyleContext, SvXMLStyleContext );
XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -77,7 +76,6 @@ bool XMLGradientStyleContext::IsTransient() const
return true;
}
-TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext );
XMLHatchStyleContext::XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -120,7 +118,6 @@ bool XMLHatchStyleContext::IsTransient() const
return true;
}
-TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext );
XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -197,7 +194,6 @@ bool XMLBitmapStyleContext::IsTransient() const
return true;
}
-TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext );
XMLTransGradientStyleContext::XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -240,7 +236,6 @@ bool XMLTransGradientStyleContext::IsTransient() const
return true;
}
-TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext );
XMLMarkerStyleContext::XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -283,7 +278,6 @@ bool XMLMarkerStyleContext::IsTransient() const
return true;
}
-TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext );
XMLDashStyleContext::XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 97bcf7807e0a..afb8ac3c311c 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -33,7 +33,6 @@ private:
OUString maStrName;
public:
- TYPEINFO_OVERRIDE();
XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -53,7 +52,6 @@ private:
OUString maStrName;
public:
- TYPEINFO_OVERRIDE();
XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -74,7 +72,6 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream;
public:
- TYPEINFO_OVERRIDE();
XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -99,7 +96,6 @@ private:
OUString maStrName;
public:
- TYPEINFO_OVERRIDE();
XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -119,7 +115,6 @@ private:
OUString maStrName;
public:
- TYPEINFO_OVERRIDE();
XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -139,7 +134,6 @@ private:
OUString maStrName;
public:
- TYPEINFO_OVERRIDE();
XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index f1f6fa31da4e..5c93fe68bd34 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -57,7 +57,6 @@ void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
}
-TYPEINIT1( PageStyleContext, XMLPropStyleContext );
PageStyleContext::PageStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 06c736422785..27249882f56c 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -166,7 +166,6 @@ static void lcl_xmlbic_MergeVertPos( GraphicLocation& ePos,
}
}
-TYPEINIT1( XMLBackgroundImageContext, XMLElementPropertyContext );
void XMLBackgroundImageContext::ProcessAttrs(
const Reference< xml::sax::XAttributeList >& xAttrList )
diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx
index 79198a74dbe2..8127ba5163ea 100644
--- a/xmloff/source/style/XMLElementPropertyContext.cxx
+++ b/xmloff/source/style/XMLElementPropertyContext.cxx
@@ -20,7 +20,6 @@
#include "XMLElementPropertyContext.hxx"
-TYPEINIT1( XMLElementPropertyContext , SvXMLImportContext );
XMLElementPropertyContext::XMLElementPropertyContext (
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index ebae761711e9..75f48c595739 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -81,7 +81,6 @@ static const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
return aFontStyleAttrTokenMap;
}
-TYPEINIT1( XMLFontStyleContextFontFace, SvXMLStyleContext );
XMLFontStyleContextFontFace::XMLFontStyleContextFontFace( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -192,7 +191,6 @@ OUString XMLFontStyleContextFontFace::familyName() const
return ret;
}
-TYPEINIT1( XMLFontStyleContextFontFaceFormat, SvXMLStyleContext );
XMLFontStyleContextFontFaceFormat::XMLFontStyleContextFontFaceFormat( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -213,7 +211,6 @@ void XMLFontStyleContextFontFaceFormat::SetAttribute( sal_uInt16 nPrefixKey, con
SvXMLStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
}
-TYPEINIT1( XMLFontStyleContextFontFaceSrc, SvXMLImportContext );
XMLFontStyleContextFontFaceSrc::XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -234,7 +231,6 @@ SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext(
}
-TYPEINIT1( XMLFontStyleContextFontFaceUri, SvXMLImportContext );
XMLFontStyleContextFontFaceUri::XMLFontStyleContextFontFaceUri( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -370,7 +366,6 @@ SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext(
return pStyle;
}
-TYPEINIT1( XMLFontStylesContext, SvXMLStylesContext );
XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 8a6254ff26c5..c5e562537b44 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -44,7 +44,6 @@ class XMLFontStyleContextFontFace : public SvXMLStyleContext
public:
- TYPEINFO_OVERRIDE();
XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -77,7 +76,6 @@ class XMLFontStyleContextFontFaceSrc : public SvXMLImportContext
const XMLFontStyleContextFontFace& font;
public:
- TYPEINFO_OVERRIDE();
XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -102,7 +100,6 @@ class XMLFontStyleContextFontFaceUri : public SvXMLStyleContext
void handleEmbeddedFont( const ::css::uno::Sequence< sal_Int8 >& rData, bool eot );
public:
- TYPEINFO_OVERRIDE();
XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -125,7 +122,6 @@ class XMLFontStyleContextFontFaceFormat : public SvXMLStyleContext
{
XMLFontStyleContextFontFaceUri& uri;
public:
- TYPEINFO_OVERRIDE();
XMLFontStyleContextFontFaceFormat( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index 0c0e1bd068ba..4a8383baa6d2 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -52,7 +52,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1(XMLFootnoteSeparatorImport, SvXMLImportContext);
XMLFootnoteSeparatorImport::XMLFootnoteSeparatorImport(
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index 827c8d3f1139..744b9a4a9402 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -45,7 +45,6 @@ class XMLFootnoteSeparatorImport : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLFootnoteSeparatorImport(
SvXMLImport& rImport,
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 123ef7efc8f7..b939c8f70d4b 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -66,7 +66,6 @@ void XMLPropStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
}
-TYPEINIT1( XMLPropStyleContext, SvXMLStyleContext );
//UUUU
OldFillStyleDefinitionSet XMLPropStyleContext::maStandardSet;
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 80d1419ca173..4239164ac0bd 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1047,7 +1047,6 @@ SvxXMLListStyleContext::~SvxXMLListStyleContext()
delete pLevelStyles;
}
-TYPEINIT1( SvxXMLListStyleContext, SvXMLStyleContext );
SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
sal_uInt16 nPrefix,
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index e7b17eca94bd..93277781b913 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -139,7 +139,6 @@ void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
}
-TYPEINIT1( SvXMLStyleContext, SvXMLImportContext );
SvXMLStyleContext::SvXMLStyleContext(
SvXMLImport& rImp, sal_uInt16 nPrfx,
@@ -358,7 +357,6 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uIn
return pStyle;
}
-TYPEINIT1( SvXMLStylesContext, SvXMLImportContext );
sal_uInt32 SvXMLStylesContext::GetStyleCount() const
{
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 75c6d8d22113..4d6445f9ee06 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -61,7 +61,6 @@ private:
style::TabStop aTabStop;
public:
- TYPEINFO_OVERRIDE();
SvxXMLTabStopContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -76,7 +75,6 @@ public:
const style::TabStop& getTabStop() const { return aTabStop; }
};
-TYPEINIT1( SvxXMLTabStopContext_Impl, SvXMLImportContext );
SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -169,7 +167,6 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext(
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
-TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext );
SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx
index b2f3a36ce998..0fae935e9da5 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.cxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx
@@ -38,7 +38,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_HREF;
-TYPEINIT1( XMLAutoMarkFileContext, SvXMLImportContext );
XMLAutoMarkFileContext::XMLAutoMarkFileContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx
index b6aa447ead18..c98a8eec656b 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.hxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -36,7 +36,6 @@ class XMLAutoMarkFileContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLAutoMarkFileContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index a35b01189533..ad8babb73adf 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -38,7 +38,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_EVENT_LISTENERS;
-TYPEINIT1(XMLAutoTextContainerEventImport, SvXMLImportContext);
XMLAutoTextContainerEventImport::XMLAutoTextContainerEventImport(
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index a6e7d769dcc6..382e558625d6 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -42,7 +42,6 @@ class XMLAutoTextContainerEventImport : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLAutoTextContainerEventImport(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 3acd3a62f6c6..ad97de857083 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -33,7 +33,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_P;
using ::xmloff::token::XML_CHANGE_INFO;
-TYPEINIT1( XMLChangeElementImportContext, SvXMLImportContext );
XMLChangeElementImportContext::XMLChangeElementImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index 6562dd59da40..3ee0bd4e7f58 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -59,7 +59,6 @@ class XMLChangeElementImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLChangeElementImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index 857809f0f24c..f3276d50bdbf 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -31,7 +31,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_CHANGE_ID;
-TYPEINIT1( XMLChangeImportContext, SvXMLImportContext );
XMLChangeImportContext::XMLChangeImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx
index 7a41ccb0691e..da97ddf420a3 100644
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
@@ -45,7 +45,6 @@ class XMLChangeImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
/**
* import a change mark
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 9b4f7959cb34..c8c85d4d479e 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -34,7 +34,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1(XMLChangeInfoContext, SvXMLImportContext);
XMLChangeInfoContext::XMLChangeInfoContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx
index ff795701a565..729aa7a810b8 100644
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -51,7 +51,6 @@ class XMLChangeInfoContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLChangeInfoContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index b63ea3d8fefb..fc10bbf58b57 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -40,7 +40,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1(XMLChangedRegionImportContext, SvXMLImportContext);
XMLChangedRegionImportContext::XMLChangedRegionImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx
index 4dbf8580d60a..6a81cf0d0f45 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.hxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx
@@ -53,7 +53,6 @@ class XMLChangedRegionImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLChangedRegionImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index 11e975cb8fbf..a7f124bdd6aa 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -31,7 +31,6 @@ using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1( XMLFootnoteBodyImportContext, SvXMLImportContext );
XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 10870a660417..bdfcb73749e5 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
@@ -37,7 +37,6 @@ class XMLFootnoteBodyImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLFootnoteBodyImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 67fafeba9212..c38d7f978777 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -62,7 +62,6 @@ class XMLFootnoteConfigHelper : public SvXMLImportContext
bool bIsBegin;
public:
- TYPEINFO_OVERRIDE();
XMLFootnoteConfigHelper(
SvXMLImport& rImport,
@@ -76,7 +75,6 @@ public:
virtual void Characters( const OUString& rChars ) override;
};
-TYPEINIT1( XMLFootnoteConfigHelper, SvXMLImportContext );
XMLFootnoteConfigHelper::XMLFootnoteConfigHelper(
SvXMLImport& rImport,
@@ -115,7 +113,6 @@ void XMLFootnoteConfigHelper::Characters( const OUString& rChars )
-TYPEINIT1( XMLFootnoteConfigurationImportContext, SvXMLStyleContext );
XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 723b2ed4a228..e85d90e155ba 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
-TYPEINIT1(XMLFootnoteImportContext, SvXMLImportContext);
const sal_Char sAPI_service_footnote[] = "com.sun.star.text.Footnote";
const sal_Char sAPI_service_endnote[] = "com.sun.star.text.Endnote";
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx
index 29e1671eb80b..49aa57b868f5 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.hxx
@@ -56,7 +56,6 @@ class XMLFootnoteImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLFootnoteImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index 8568eb097ea8..71620c156cfb 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -60,7 +60,6 @@ const sal_Char sAPI_SortAlgorithm[] = "SortAlgorithm";
const sal_Char sAPI_Locale[] = "Locale";
-TYPEINIT1( XMLIndexAlphabeticalSourceContext, XMLIndexSourceBaseContext );
XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index 9572562c4ac5..042e1054eb48 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -66,7 +66,6 @@ class XMLIndexAlphabeticalSourceContext : public XMLIndexSourceBaseContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexAlphabeticalSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 108b49d55b47..7ea90a7066d4 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -44,7 +44,6 @@ const sal_Char sAPI_FieldMaster_Bibliography[] =
"com.sun.star.text.FieldMaster.Bibliography";
-TYPEINIT1( XMLIndexBibliographyConfigurationContext, SvXMLStyleContext );
XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index 9ea51eec733f..f775857c77fe 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -39,7 +39,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1( XMLIndexBibliographyEntryContext, XMLIndexSimpleEntryContext);
XMLIndexBibliographyEntryContext::XMLIndexBibliographyEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index 6b97c1d8e407..3c44bd3ea5f1 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
@@ -45,7 +45,6 @@ class XMLIndexBibliographyEntryContext : public XMLIndexSimpleEntryContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexBibliographyEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index 93461732086c..301ec6185234 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -41,7 +41,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1(XMLIndexBibliographySourceContext, XMLIndexSourceBaseContext);
XMLIndexBibliographySourceContext::XMLIndexBibliographySourceContext(
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index 2098a7541c29..2d648093242f 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
@@ -38,7 +38,6 @@ class XMLIndexBibliographySourceContext : public XMLIndexSourceBaseContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexBibliographySourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx
index b3ffb8a00256..f5752a21b03c 100644
--- a/xmloff/source/text/XMLIndexBodyContext.cxx
+++ b/xmloff/source/text/XMLIndexBodyContext.cxx
@@ -27,7 +27,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1( XMLIndexBodyContext, SvXMLImportContext);
XMLIndexBodyContext::XMLIndexBodyContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx
index ea470da5a6fd..94364694092e 100644
--- a/xmloff/source/text/XMLIndexBodyContext.hxx
+++ b/xmloff/source/text/XMLIndexBodyContext.hxx
@@ -41,7 +41,6 @@ class XMLIndexBodyContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexBodyContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index ec01622ceee1..9124d142df6c 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -46,7 +46,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1( XMLIndexChapterInfoEntryContext, XMLIndexSimpleEntryContext);
XMLIndexChapterInfoEntryContext::XMLIndexChapterInfoEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index f074dd41507e..a1e8a655ebcb 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -45,7 +45,6 @@ class XMLIndexChapterInfoEntryContext : public XMLIndexSimpleEntryContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexChapterInfoEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index 0bc5ddca08d1..81d2a88d43a0 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -37,7 +37,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_ILLUSTRATION_INDEX_ENTRY_TEMPLATE;
using ::xmloff::token::XML_TOKEN_INVALID;
-TYPEINIT1(XMLIndexIllustrationSourceContext, XMLIndexTableSourceContext);
XMLIndexIllustrationSourceContext::XMLIndexIllustrationSourceContext(
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
index d7608e5edc91..1d0d47377a24 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
@@ -40,7 +40,6 @@ class XMLIndexIllustrationSourceContext : public XMLIndexTableSourceContext
{
public:
- TYPEINFO_OVERRIDE();
XMLIndexIllustrationSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 8b8eb5032f13..5bd8eaf1dfc3 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -53,7 +53,6 @@ const sal_Char sAPI_CreateFromStarMath[] = "CreateFromStarMath";
const sal_Char sAPI_CreateFromOtherEmbeddedObjects[] = "CreateFromOtherEmbeddedObjects";
-TYPEINIT1( XMLIndexObjectSourceContext, XMLIndexSourceBaseContext );
XMLIndexObjectSourceContext::XMLIndexObjectSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index 46d3434f4d66..71273e4808c9 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
@@ -49,7 +49,6 @@ class XMLIndexObjectSourceContext : public XMLIndexSourceBaseContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexObjectSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index 9d900de7067a..3267404f54ba 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -36,7 +36,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_STYLE_NAME;
-TYPEINIT1( XMLIndexSimpleEntryContext, SvXMLImportContext);
XMLIndexSimpleEntryContext::XMLIndexSimpleEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
index b7a106dd7e36..2bc713c7e8d2 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
@@ -53,7 +53,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLIndexSimpleEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 8c318807ba56..41c17c527afb 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -145,7 +145,6 @@ static const SvXMLTokenMapEntry aIndexSourceTokenMap[] =
};
-TYPEINIT1( XMLIndexSourceBaseContext, SvXMLImportContext );
XMLIndexSourceBaseContext::XMLIndexSourceBaseContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index cfba493cb16e..2e80e476a94b 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
@@ -91,7 +91,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLIndexSourceBaseContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
index 3c3ca1c76231..19b35714450c 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
@@ -28,7 +28,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::beans::PropertyValue;
-TYPEINIT1( XMLIndexSpanEntryContext, XMLIndexSimpleEntryContext);
XMLIndexSpanEntryContext::XMLIndexSpanEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
index de6cac84070e..a3010e117818 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
@@ -39,7 +39,6 @@ class XMLIndexSpanEntryContext : public XMLIndexSimpleEntryContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexSpanEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index a5b054586440..bdadb2d28155 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -58,7 +58,6 @@ using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::lang::IllegalArgumentException;
-TYPEINIT1(XMLIndexTOCContext, SvXMLImportContext);
static const sal_Char* aIndexServiceMap[] =
{
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx
index 91a8eab4762e..0c4cba2479a3 100644
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
@@ -69,7 +69,6 @@ class XMLIndexTOCContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexTOCContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index 4ee9095a4969..5c697ff2f0cb 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -47,7 +47,6 @@ const sal_Char sAPI_Level[] = "Level";
const sal_Char sAPI_CreateFromLevelParagraphStyles[] = "CreateFromLevelParagraphStyles";
-TYPEINIT1( XMLIndexTOCSourceContext, XMLIndexSourceBaseContext );
XMLIndexTOCSourceContext::XMLIndexTOCSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index 84d72514a579..12f7b81f0e41 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
@@ -47,7 +47,6 @@ class XMLIndexTOCSourceContext : public XMLIndexSourceBaseContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexTOCSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index 25d02390626c..aabd907ab7f9 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -43,7 +43,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
const sal_Char sAPI_LevelParagraphStyles[] = "LevelParagraphStyles";
-TYPEINIT1( XMLIndexTOCStylesContext, SvXMLImportContext );
XMLIndexTOCStylesContext::XMLIndexTOCStylesContext(
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index 5422f1915d82..ae9654b73c05 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -56,7 +56,6 @@ class XMLIndexTOCStylesContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexTOCStylesContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 4669da3d0f36..c5ae4f36f3f3 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -42,7 +42,6 @@ using ::com::sun::star::beans::PropertyValue;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1( XMLIndexTabStopEntryContext, XMLIndexSimpleEntryContext );
XMLIndexTabStopEntryContext::XMLIndexTabStopEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
index 183c4d31e568..6960c6b97bf6 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
@@ -46,7 +46,6 @@ class XMLIndexTabStopEntryContext : public XMLIndexSimpleEntryContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexTabStopEntryContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index ba66fd5705c2..6e88ad50ad53 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -52,7 +52,6 @@ const sal_Char sAPI_LabelCategory[] = "LabelCategory";
const sal_Char sAPI_LabelDisplayType[] = "LabelDisplayType";
-TYPEINIT1(XMLIndexTableSourceContext, XMLIndexSourceBaseContext);
XMLIndexTableSourceContext::XMLIndexTableSourceContext(
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx
index a0c073d3f70d..fe42e7fb64aa 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx
@@ -48,7 +48,6 @@ class XMLIndexTableSourceContext : public XMLIndexSourceBaseContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexTableSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 30cdc6751699..e4bce4d9cb50 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -60,7 +60,6 @@ const sal_Char sAPI_TokenBibliographyDataField[] =
"TokenBibliographyDataField";
-TYPEINIT1( XMLIndexTemplateContext, SvXMLImportContext);
XMLIndexTemplateContext::XMLIndexTemplateContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 1c04a1b578c3..01ae06e3742e 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -112,7 +112,6 @@ public:
const OUString sParaStyleLevel;
- TYPEINFO_OVERRIDE();
XMLIndexTemplateContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
index 3a780ac2e692..4a7e2267d585 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
@@ -33,7 +33,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_STYLE_NAME;
-TYPEINIT1( XMLIndexTitleTemplateContext, SvXMLImportContext );
XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
index 982c91ddc199..612c3306922e 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
@@ -54,7 +54,6 @@ class XMLIndexTitleTemplateContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexTitleTemplateContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 214c2d9ad337..a08db5c5510e 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -52,7 +52,6 @@ const sal_Char sAPI_CreateFromLevelParagraphStyles[] = "CreateFromLevelParagraph
const sal_Char sAPI_UserIndexName[] = "UserIndexName";
-TYPEINIT1(XMLIndexUserSourceContext, XMLIndexSourceBaseContext);
XMLIndexUserSourceContext::XMLIndexUserSourceContext(
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index 7d43a04d24d5..2cf1a6e5de2c 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
@@ -55,7 +55,6 @@ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext
public:
- TYPEINFO_OVERRIDE();
XMLIndexUserSourceContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 9f0ca2e5b643..999c689b0ea8 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -41,7 +41,6 @@ using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::xml::sax::XAttributeList;
using ::com::sun::star::text::XLineNumberingProperties;
-TYPEINIT1( XMLLineNumberingImportContext, SvXMLStyleContext );
XMLLineNumberingImportContext::XMLLineNumberingImportContext(
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
index 50235ef7bb99..b502be2b15ab 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
@@ -34,7 +34,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_INCREMENT;
-TYPEINIT1( XMLLineNumberingSeparatorImportContext, SvXMLImportContext );
XMLLineNumberingSeparatorImportContext::XMLLineNumberingSeparatorImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
index 7211171403f5..406b38b79ad4 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -40,7 +40,6 @@ class XMLLineNumberingSeparatorImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLLineNumberingSeparatorImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 3a705e68f079..3dfc1c671549 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -46,7 +46,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
-TYPEINIT1(XMLSectionFootnoteConfigImport, SvXMLImportContext);
XMLSectionFootnoteConfigImport::XMLSectionFootnoteConfigImport(
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
index 48f7d7d1ed35..d00d5259065c 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
@@ -45,7 +45,6 @@ class XMLSectionFootnoteConfigImport : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLSectionFootnoteConfigImport(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index fad99419775f..181ba7055dab 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-TYPEINIT1( XMLSectionImportContext, SvXMLImportContext );
const sal_Char sAPI_TextSection[] = "com.sun.star.text.TextSection";
const sal_Char sAPI_IndexHeaderSection[] = "com.sun.star.text.IndexHeaderSection";
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index 013743031257..838a0ecac027 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -76,7 +76,6 @@ class XMLSectionImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLSectionImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index cd68fae5ed20..912be2b72ada 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -47,7 +47,6 @@ const sal_Char sAPI_DDECommandElement[] = "DDECommandElement";
const sal_Char sAPI_IsAutomaticUpdate[] = "IsAutomaticUpdate";
-TYPEINIT1(XMLSectionSourceDDEImportContext, SvXMLImportContext);
XMLSectionSourceDDEImportContext::XMLSectionSourceDDEImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index b309ce7d61c8..7f090083c015 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
@@ -40,7 +40,6 @@ class XMLSectionSourceDDEImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLSectionSourceDDEImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 9a3e757efe1c..8a6aefb5a98a 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-TYPEINIT1(XMLSectionSourceImportContext, SvXMLImportContext);
XMLSectionSourceImportContext::XMLSectionSourceImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index fb3b1255f7e0..21f9e148286c 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -35,7 +35,6 @@ class XMLSectionSourceImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLSectionSourceImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index a74724537a90..bce6533a82d8 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -28,7 +28,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_P;
-TYPEINIT1(XMLStringBufferImportContext, SvXMLImportContext);
XMLStringBufferImportContext::XMLStringBufferImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index c52afc85c945..b99a4506e6e2 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -97,7 +97,6 @@ class XMLTextColumnContext_Impl: public SvXMLImportContext
text::TextColumn aColumn;
public:
- TYPEINFO_OVERRIDE();
XMLTextColumnContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -110,7 +109,6 @@ public:
text::TextColumn& getTextColumn() { return aColumn; }
};
-TYPEINIT1( XMLTextColumnContext_Impl, SvXMLImportContext );
XMLTextColumnContext_Impl::XMLTextColumnContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -179,7 +177,6 @@ class XMLTextColumnSepContext_Impl: public SvXMLImportContext
VerticalAlignment eVertAlign;
public:
- TYPEINFO_OVERRIDE();
XMLTextColumnSepContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -196,7 +193,6 @@ public:
VerticalAlignment GetVertAlign() const { return eVertAlign; }
};
-TYPEINIT1( XMLTextColumnSepContext_Impl, SvXMLImportContext );
XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -263,7 +259,6 @@ XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl()
{
}
-TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext );
XMLTextColumnsContext::XMLTextColumnsContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 4e2328669905..7df2aa568acb 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -116,7 +116,6 @@ class XMLTextFrameTitleOrDescContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextFrameTitleOrDescContext_Impl( SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -127,7 +126,6 @@ public:
virtual void Characters( const OUString& rText ) override;
};
-TYPEINIT1( XMLTextFrameTitleOrDescContext_Impl, SvXMLImportContext );
XMLTextFrameTitleOrDescContext_Impl::XMLTextFrameTitleOrDescContext_Impl(
SvXMLImport& rImport,
@@ -152,7 +150,6 @@ class XMLTextFrameParam_Impl : public SvXMLImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -163,7 +160,6 @@ public:
virtual ~XMLTextFrameParam_Impl();
};
-TYPEINIT1( XMLTextFrameParam_Impl, SvXMLImportContext );
XMLTextFrameParam_Impl::~XMLTextFrameParam_Impl()
{
@@ -210,7 +206,6 @@ class XMLTextFrameContourContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -221,7 +216,6 @@ public:
virtual ~XMLTextFrameContourContext_Impl();
};
-TYPEINIT1( XMLTextFrameContourContext_Impl, SvXMLImportContext );
XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
SvXMLImport& rImport,
@@ -430,7 +424,6 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
bool CreateIfNotThere();
const OUString& GetHRef() const { return sHRef; }
@@ -473,7 +466,6 @@ public:
::com::sun::star::beans::XPropertySet >& GetPropSet() const { return xPropSet; }
};
-TYPEINIT1( XMLTextFrameContext_Impl, SvXMLImportContext );
void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
{
@@ -1355,7 +1347,6 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc )
}
}
-TYPEINIT1( XMLTextFrameContext, SvXMLImportContext );
bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet )
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 6de7f7e02a0a..fea47ae5423d 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -64,7 +64,6 @@ protected:
public:
- TYPEINFO_OVERRIDE();
XMLTextFrameContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 05a9a0374c1f..6b5fcd24537f 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -36,7 +36,6 @@ using namespace ::xmloff::token;
namespace drawing = com::sun::star::drawing;
-TYPEINIT1( XMLTextFrameHyperlinkContext, SvXMLImportContext );
XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index b0a53e1ce49f..bbc091bdd0c7 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -40,7 +40,6 @@ class XMLTextFrameHyperlinkContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextFrameHyperlinkContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 443b251ecf41..a5bbb0510f51 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::beans;
-TYPEINIT1( XMLTextHeaderFooterContext, SvXMLImportContext );
XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index afa975922ecc..c2cb21b9ab2f 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
-TYPEINIT1( XMLTextListBlockContext, SvXMLImportContext );
// OD 2008-05-07 #refactorlists#
// add optional parameter <bRestartNumberingAtSubList> and its handling
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index b5df955871c8..2f01606ebfca 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
@@ -49,7 +49,6 @@ class XMLTextListBlockContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
// add optional parameter <bRestartNumberingAtSubList>
XMLTextListBlockContext(
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 387dc1a92769..d95fca4a0794 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-TYPEINIT1( XMLTextListItemContext, SvXMLImportContext );
XMLTextListItemContext::XMLTextListItemContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index eabf3b34b6f9..f52e4c40082f 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
@@ -38,7 +38,6 @@ class XMLTextListItemContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextListItemContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 35e54fff774a..e28170c1ee71 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -95,7 +95,6 @@ void XMLFieldParamImportContext::StartElement(const ::com::sun::star::uno::Refer
}
-TYPEINIT1( XMLTextMarkImportContext, SvXMLImportContext);
XMLTextMarkImportContext::XMLTextMarkImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index 8de84d6ca933..faa963feed28 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -75,7 +75,6 @@ class XMLTextMarkImportContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLTextMarkImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 514505d748f4..4d09587f1aa6 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -58,7 +58,6 @@ Reference < XStyle > XMLTextMasterPageContext::Create()
return xNewStyle;
}
-TYPEINIT1( XMLTextMasterPageContext, SvXMLStyleContext );
XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index b86135651869..fa99ec7ba5b3 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star::xml::sax;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_MASTER_PAGE;
-TYPEINIT1( XMLTextMasterStylesContext, SvXMLStylesContext );
bool XMLTextMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const
{
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 9b595ae888c2..1239c0bbdf88 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -139,7 +139,6 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
}
-TYPEINIT1( XMLTextShapeStyleContext, XMLShapeStyleContext );
XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx
index 51f07557857f..b51a91ca6fd1 100644
--- a/xmloff/source/text/XMLTextTableContext.cxx
+++ b/xmloff/source/text/XMLTextTableContext.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
-TYPEINIT1( XMLTextTableContext, SvXMLImportContext );
XMLTextTableContext::XMLTextTableContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index 94f03e4b03f3..07677ad11b4d 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -35,7 +35,6 @@ using namespace ::xmloff::token;
-TYPEINIT1( XMLTrackedChangesImportContext, SvXMLImportContext );
XMLTrackedChangesImportContext::XMLTrackedChangesImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index c31d5cf37a81..b47d1a296012 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
@@ -37,7 +37,6 @@ class XMLTrackedChangesImportContext : public SvXMLImportContext
{
public:
- TYPEINFO_OVERRIDE();
XMLTrackedChangesImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 53edb1bc0dd8..0694977441d4 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -56,7 +56,6 @@ static const SvXMLTokenMapEntry aDropAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-TYPEINIT1( XMLTextDropCapImportContext, XMLElementPropertyContext );
void XMLTextDropCapImportContext::ProcessAttrs(
const Reference< xml::sax::XAttributeList >& xAttrList )
{
diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx
index 478fe6ce4d2a..0ea6bd3ad67b 100644
--- a/xmloff/source/text/txtdropi.hxx
+++ b/xmloff/source/text/txtdropi.hxx
@@ -35,7 +35,6 @@ private:
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
public:
- TYPEINFO_OVERRIDE();
XMLTextDropCapImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 605b78c9f531..002fee83985b 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -193,7 +193,6 @@ const sal_Char sAPI_TextRange[] = "TextRange";
const sal_Char sAPI_true[] = "TRUE";
-TYPEINIT1( XMLTextFieldImportContext, SvXMLImportContext);
XMLTextFieldImportContext::XMLTextFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -619,7 +618,6 @@ void XMLTextFieldImportContext::ForceUpdate(
// XMLSenderFieldImportContext
-TYPEINIT1( XMLSenderFieldImportContext, XMLTextFieldImportContext);
XMLSenderFieldImportContext::XMLSenderFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -746,7 +744,6 @@ void XMLSenderFieldImportContext::PrepareField(
// XMLAuthorFieldImportContext
-TYPEINIT1( XMLAuthorFieldImportContext, XMLSenderFieldImportContext);
XMLAuthorFieldImportContext::XMLAuthorFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -806,7 +803,6 @@ void XMLAuthorFieldImportContext::PrepareField(
// page continuation string
-TYPEINIT1( XMLPageContinuationImportContext, XMLTextFieldImportContext );
static SvXMLEnumMapEntry const lcl_aSelectPageAttrMap[] =
{
@@ -873,7 +869,6 @@ void XMLPageContinuationImportContext::PrepareField(
// page number field
-TYPEINIT1( XMLPageNumberImportContext, XMLTextFieldImportContext );
XMLPageNumberImportContext::XMLPageNumberImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -984,7 +979,6 @@ void XMLPageNumberImportContext::PrepareField(
// Placeholder
-TYPEINIT1( XMLPlaceholderFieldImportContext, XMLTextFieldImportContext);
XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1071,7 +1065,6 @@ void XMLPlaceholderFieldImportContext::PrepareField(
// time field
-TYPEINIT1( XMLTimeFieldImportContext, XMLTextFieldImportContext);
XMLTimeFieldImportContext::XMLTimeFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1216,7 +1209,6 @@ void XMLTimeFieldImportContext::PrepareField(
// date field
-TYPEINIT1( XMLDateFieldImportContext, XMLTimeFieldImportContext );
XMLDateFieldImportContext::XMLDateFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1265,7 +1257,6 @@ void XMLDateFieldImportContext::ProcessAttribute(
// database field superclass
-TYPEINIT1( XMLDatabaseFieldImportContext, XMLTextFieldImportContext );
XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1409,7 +1400,6 @@ void XMLDatabaseFieldImportContext::PrepareField(
// database name field
-TYPEINIT1( XMLDatabaseNameImportContext, XMLDatabaseFieldImportContext );
XMLDatabaseNameImportContext::XMLDatabaseNameImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1433,7 +1423,6 @@ void XMLDatabaseNameImportContext::ProcessAttribute(
// database next field
-TYPEINIT1( XMLDatabaseNextImportContext, XMLDatabaseFieldImportContext );
XMLDatabaseNextImportContext::XMLDatabaseNextImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1500,7 +1489,6 @@ void XMLDatabaseNextImportContext::PrepareField(
// database select field
-TYPEINIT1( XMLDatabaseSelectImportContext, XMLDatabaseNextImportContext );
XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1552,7 +1540,6 @@ void XMLDatabaseSelectImportContext::PrepareField(
// database display row number field
-TYPEINIT1( XMLDatabaseNumberImportContext, XMLDatabaseFieldImportContext );
XMLDatabaseNumberImportContext::XMLDatabaseNumberImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1627,7 +1614,6 @@ void XMLDatabaseNumberImportContext::PrepareField(
// Simple doc info fields
-TYPEINIT1( XMLSimpleDocInfoImportContext, XMLTextFieldImportContext );
XMLSimpleDocInfoImportContext::XMLSimpleDocInfoImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1771,7 +1757,6 @@ const sal_Char* XMLSimpleDocInfoImportContext::MapTokenToServiceName(
// revision field
-TYPEINIT1( XMLRevisionDocInfoImportContext, XMLSimpleDocInfoImportContext );
XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -1816,7 +1801,6 @@ void XMLRevisionDocInfoImportContext::PrepareField(
// DocInfo fields with date/time attributes
-TYPEINIT1( XMLDateTimeDocInfoImportContext, XMLSimpleDocInfoImportContext );
XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -1925,7 +1909,6 @@ void XMLDateTimeDocInfoImportContext::PrepareField(
// user defined docinfo fields
-TYPEINIT1( XMLUserDocInfoImportContext, XMLSimpleDocInfoImportContext );
XMLUserDocInfoImportContext::XMLUserDocInfoImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2013,7 +1996,6 @@ void XMLUserDocInfoImportContext::PrepareField(
// import hidden paragraph fields
-TYPEINIT1( XMLHiddenParagraphImportContext, XMLTextFieldImportContext );
XMLHiddenParagraphImportContext::XMLHiddenParagraphImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2071,7 +2053,6 @@ void XMLHiddenParagraphImportContext::PrepareField(
// import conditional text (<text:conditional-text>)
-TYPEINIT1( XMLConditionalTextImportContext, XMLTextFieldImportContext );
XMLConditionalTextImportContext::XMLConditionalTextImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2159,7 +2140,6 @@ void XMLConditionalTextImportContext::PrepareField(
// hidden text
-TYPEINIT1( XMLHiddenTextImportContext, XMLTextFieldImportContext);
XMLHiddenTextImportContext::XMLHiddenTextImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2234,7 +2214,6 @@ void XMLHiddenTextImportContext::PrepareField(
// file name fields
-TYPEINIT1( XMLFileNameImportContext, XMLTextFieldImportContext );
static const SvXMLEnumMapEntry aFilenameDisplayMap[] =
{
@@ -2335,7 +2314,6 @@ static const SvXMLEnumMapEntry aTemplateDisplayMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-TYPEINIT1( XMLTemplateNameImportContext, XMLTextFieldImportContext );
XMLTemplateNameImportContext::XMLTemplateNameImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -2384,7 +2362,6 @@ void XMLTemplateNameImportContext::PrepareField(
// import chapter fields
-TYPEINIT1( XMLChapterImportContext, XMLTextFieldImportContext );
static const SvXMLEnumMapEntry aChapterDisplayMap[] =
{
@@ -2463,7 +2440,6 @@ void XMLChapterImportContext::PrepareField(
// counting fields
-TYPEINIT1( XMLCountFieldImportContext, XMLTextFieldImportContext );
XMLCountFieldImportContext::XMLCountFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2564,7 +2540,6 @@ const sal_Char* XMLCountFieldImportContext::MapTokenToServiceName(
// page variable import
-TYPEINIT1( XMLPageVarGetFieldImportContext, XMLTextFieldImportContext );
XMLPageVarGetFieldImportContext::XMLPageVarGetFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2625,7 +2600,6 @@ void XMLPageVarGetFieldImportContext::PrepareField(
// page variable set fields
-TYPEINIT1(XMLPageVarSetFieldImportContext, XMLTextFieldImportContext);
XMLPageVarSetFieldImportContext::XMLPageVarSetFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -2687,7 +2661,6 @@ void XMLPageVarSetFieldImportContext::PrepareField(
// macro fields
-TYPEINIT1( XMLMacroFieldImportContext, XMLTextFieldImportContext );
XMLMacroFieldImportContext::XMLMacroFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -2827,7 +2800,6 @@ void XMLMacroFieldImportContext::PrepareField(
// reference field import
-TYPEINIT1( XMLReferenceFieldImportContext, XMLTextFieldImportContext );
XMLReferenceFieldImportContext::XMLReferenceFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2986,7 +2958,6 @@ static const SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-TYPEINIT1( XMLDdeFieldDeclsImportContext, SvXMLImportContext );
XMLDdeFieldDeclsImportContext::XMLDdeFieldDeclsImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& sLocalName) :
@@ -3020,7 +2991,6 @@ SvXMLImportContext * XMLDdeFieldDeclsImportContext::CreateChildContext(
// import dde field declaration
-TYPEINIT1( XMLDdeFieldDeclImportContext, SvXMLImportContext );
XMLDdeFieldDeclImportContext::XMLDdeFieldDeclImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -3161,7 +3131,6 @@ void XMLDdeFieldDeclImportContext::StartElement(
// DDE field import
-TYPEINIT1( XMLDdeFieldImportContext, XMLTextFieldImportContext );
XMLDdeFieldImportContext::XMLDdeFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -3245,7 +3214,6 @@ void XMLDdeFieldImportContext::PrepareField(
// sheet name fields
-TYPEINIT1(XMLSheetNameImportContext, XMLTextFieldImportContext);
XMLSheetNameImportContext::XMLSheetNameImportContext(
SvXMLImport& rImport,
@@ -3272,7 +3240,6 @@ void XMLSheetNameImportContext::PrepareField(
}
/** import page|slide name fields (<text:page-name>) */
-TYPEINIT1( XMLPageNameFieldImportContext, XMLTextFieldImportContext );
XMLPageNameFieldImportContext::XMLPageNameFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -3301,7 +3268,6 @@ void XMLPageNameFieldImportContext::PrepareField(
// URL fields (Calc, Impress, Draw)
-TYPEINIT1(XMLUrlFieldImportContext, XMLTextFieldImportContext);
XMLUrlFieldImportContext::XMLUrlFieldImportContext(
SvXMLImport& rImport,
@@ -3357,7 +3323,6 @@ void XMLUrlFieldImportContext::PrepareField(
}
-TYPEINIT1(XMLBibliographyFieldImportContext, XMLTextFieldImportContext);
XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext(
@@ -3622,7 +3587,6 @@ const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName(
// Annotation Field
-TYPEINIT1(XMLAnnotationImportContext, XMLTextFieldImportContext);
XMLAnnotationImportContext::XMLAnnotationImportContext(
SvXMLImport& rImport,
@@ -3850,7 +3814,6 @@ void XMLAnnotationImportContext::PrepareField(
// script field
-TYPEINIT1(XMLScriptImportContext, XMLTextFieldImportContext);
XMLScriptImportContext::XMLScriptImportContext(
SvXMLImport& rImport,
@@ -3916,7 +3879,6 @@ void XMLScriptImportContext::PrepareField(
// measure field
-TYPEINIT1(XMLMeasureFieldImportContext, XMLTextFieldImportContext);
XMLMeasureFieldImportContext::XMLMeasureFieldImportContext(
SvXMLImport& rImport,
@@ -3967,7 +3929,6 @@ void XMLMeasureFieldImportContext::PrepareField(
-TYPEINIT1( XMLDropDownFieldImportContext, XMLTextFieldImportContext );
XMLDropDownFieldImportContext::XMLDropDownFieldImportContext(
SvXMLImport& rImport,
@@ -4108,7 +4069,6 @@ void XMLDropDownFieldImportContext::PrepareField(
}
/** import header fields (<draw:header>) */
-TYPEINIT1( XMLHeaderFieldImportContext, XMLTextFieldImportContext );
XMLHeaderFieldImportContext::XMLHeaderFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -4132,7 +4092,6 @@ void XMLHeaderFieldImportContext::PrepareField(const Reference<XPropertySet> &)
}
/** import footer fields (<draw:footer>) */
-TYPEINIT1( XMLFooterFieldImportContext, XMLTextFieldImportContext );
XMLFooterFieldImportContext::XMLFooterFieldImportContext(
SvXMLImport& rImport, /// XML Import
@@ -4157,7 +4116,6 @@ void XMLFooterFieldImportContext::PrepareField(const Reference<XPropertySet> &)
/** import footer fields (<draw:date-and-time>) */
-TYPEINIT1( XMLDateTimeFieldImportContext, XMLTextFieldImportContext );
XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext(
SvXMLImport& rImport, /// XML Import
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 0c227ddabb2e..ffceba4cfbbf 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -70,7 +70,6 @@ using ::com::sun::star::container::XEnumeration;
class XMLHints_Impl : public std::vector<std::unique_ptr<XMLHint_Impl>> {};
-TYPEINIT1( XMLCharContext, SvXMLImportContext );
XMLCharContext::XMLCharContext(
SvXMLImport& rImport,
@@ -160,7 +159,6 @@ void XMLCharContext::InsertString(const OUString& _sString)
class XMLStartReferenceContext_Impl : public SvXMLImportContext
{
public:
- TYPEINFO_OVERRIDE();
// Do everything in constructor. Well ...
XMLStartReferenceContext_Impl (
@@ -176,7 +174,6 @@ public:
OUString& rName);
};
-TYPEINIT1( XMLStartReferenceContext_Impl, SvXMLImportContext );
XMLStartReferenceContext_Impl::XMLStartReferenceContext_Impl(
SvXMLImport& rImport,
@@ -231,7 +228,6 @@ bool XMLStartReferenceContext_Impl::FindName(
class XMLEndReferenceContext_Impl : public SvXMLImportContext
{
public:
- TYPEINFO_OVERRIDE();
// Do everything in constructor. Well ...
XMLEndReferenceContext_Impl(
@@ -242,7 +238,6 @@ public:
const Reference<xml::sax::XAttributeList> & xAttrList);
};
-TYPEINIT1( XMLEndReferenceContext_Impl, SvXMLImportContext );
XMLEndReferenceContext_Impl::XMLEndReferenceContext_Impl(
SvXMLImport& rImport,
@@ -286,7 +281,6 @@ class XMLImpSpanContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLImpSpanContext_Impl(
SvXMLImport& rImport,
@@ -324,7 +318,6 @@ class XMLImpHyperlinkContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLImpHyperlinkContext_Impl(
SvXMLImport& rImport,
@@ -343,7 +336,6 @@ public:
virtual void Characters( const OUString& rChars ) override;
};
-TYPEINIT1( XMLImpHyperlinkContext_Impl, SvXMLImportContext );
XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
SvXMLImport& rImport,
@@ -457,7 +449,6 @@ class XMLImpRubyBaseContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLImpRubyBaseContext_Impl(
SvXMLImport& rImport,
@@ -476,7 +467,6 @@ public:
virtual void Characters( const OUString& rChars ) override;
};
-TYPEINIT1( XMLImpRubyBaseContext_Impl, SvXMLImportContext );
XMLImpRubyBaseContext_Impl::XMLImpRubyBaseContext_Impl(
SvXMLImport& rImport,
@@ -526,7 +516,6 @@ class XMLImpRubyContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLImpRubyContext_Impl(
SvXMLImport& rImport,
@@ -552,7 +541,6 @@ class XMLImpRubyTextContext_Impl : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLImpRubyTextContext_Impl(
SvXMLImport& rImport,
@@ -566,7 +554,6 @@ public:
virtual void Characters( const OUString& rChars ) override;
};
-TYPEINIT1( XMLImpRubyTextContext_Impl, SvXMLImportContext );
XMLImpRubyTextContext_Impl::XMLImpRubyTextContext_Impl(
SvXMLImport& rImport,
@@ -605,7 +592,6 @@ void XMLImpRubyTextContext_Impl::Characters( const OUString& rChars )
m_rRubyContext.AppendText( rChars );
}
-TYPEINIT1( XMLImpRubyContext_Impl, SvXMLImportContext );
XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
SvXMLImport& rImport,
@@ -694,7 +680,6 @@ protected:
OUString m_XmlId;
public:
- TYPEINFO_OVERRIDE();
XMLMetaImportContextBase(
SvXMLImport& i_rImport,
@@ -723,7 +708,6 @@ public:
= 0;
};
-TYPEINIT1( XMLMetaImportContextBase, SvXMLImportContext );
XMLMetaImportContextBase::XMLMetaImportContextBase(
SvXMLImport& i_rImport,
@@ -813,7 +797,6 @@ class XMLMetaImportContext : public XMLMetaImportContextBase
OUString m_sDatatype;
public:
- TYPEINFO_OVERRIDE();
XMLMetaImportContext(
SvXMLImport& i_rImport,
@@ -828,7 +811,6 @@ public:
virtual void InsertMeta(const Reference<XTextRange> & i_xInsertionRange) override;
};
-TYPEINIT1( XMLMetaImportContext, XMLMetaImportContextBase );
XMLMetaImportContext::XMLMetaImportContext(
SvXMLImport& i_rImport,
@@ -907,7 +889,6 @@ class XMLMetaFieldImportContext : public XMLMetaImportContextBase
OUString m_DataStyleName;
public:
- TYPEINFO_OVERRIDE();
XMLMetaFieldImportContext(
SvXMLImport& i_rImport,
@@ -922,7 +903,6 @@ public:
virtual void InsertMeta(const Reference<XTextRange> & i_xInsertionRange) override;
};
-TYPEINIT1( XMLMetaFieldImportContext, XMLMetaImportContextBase );
XMLMetaFieldImportContext::XMLMetaFieldImportContext(
SvXMLImport& i_rImport,
@@ -1012,7 +992,6 @@ class XMLIndexMarkImportContext_Impl : public SvXMLImportContext
OUString sID;
public:
- TYPEINFO_OVERRIDE();
XMLIndexMarkImportContext_Impl(
SvXMLImport& rImport,
@@ -1049,7 +1028,6 @@ protected:
const OUString& rServiceName);
};
-TYPEINIT1( XMLIndexMarkImportContext_Impl, SvXMLImportContext );
XMLIndexMarkImportContext_Impl::XMLIndexMarkImportContext_Impl(
SvXMLImport& rImport,
@@ -1284,7 +1262,6 @@ class XMLTOCMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl
const OUString sLevel;
public:
- TYPEINFO_OVERRIDE();
XMLTOCMarkImportContext_Impl(
SvXMLImport& rImport,
@@ -1302,7 +1279,6 @@ protected:
Reference<beans::XPropertySet>& rPropSet) override;
};
-TYPEINIT1( XMLTOCMarkImportContext_Impl, XMLIndexMarkImportContext_Impl );
XMLTOCMarkImportContext_Impl::XMLTOCMarkImportContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -1349,7 +1325,6 @@ class XMLUserIndexMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl
const OUString sLevel;
public:
- TYPEINFO_OVERRIDE();
XMLUserIndexMarkImportContext_Impl(
SvXMLImport& rImport,
@@ -1367,7 +1342,6 @@ protected:
Reference<beans::XPropertySet>& rPropSet) override;
};
-TYPEINIT1( XMLUserIndexMarkImportContext_Impl, XMLIndexMarkImportContext_Impl);
XMLUserIndexMarkImportContext_Impl::XMLUserIndexMarkImportContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -1426,7 +1400,6 @@ class XMLAlphaIndexMarkImportContext_Impl : public XMLIndexMarkImportContext_Imp
const OUString sMainEntry;
public:
- TYPEINFO_OVERRIDE();
XMLAlphaIndexMarkImportContext_Impl(
SvXMLImport& rImport,
@@ -1444,8 +1417,6 @@ protected:
Reference<beans::XPropertySet>& rPropSet) override;
};
-TYPEINIT1( XMLAlphaIndexMarkImportContext_Impl,
- XMLIndexMarkImportContext_Impl );
XMLAlphaIndexMarkImportContext_Impl::XMLAlphaIndexMarkImportContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -1510,7 +1481,6 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute(
}
}
-TYPEINIT1( XMLImpSpanContext_Impl, SvXMLImportContext );
XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
SvXMLImport& rImport,
@@ -1825,7 +1795,6 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
}
-TYPEINIT1( XMLParaContext, SvXMLImportContext );
XMLParaContext::XMLParaContext(
SvXMLImport& rImport,
@@ -2249,7 +2218,6 @@ void XMLParaContext::Characters( const OUString& rChars )
GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
}
-TYPEINIT1( XMLNumberedParaContext, SvXMLImportContext );
XMLNumberedParaContext::XMLNumberedParaContext(
SvXMLImport& i_rImport,
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 5f623c5eb604..efbb8d69dea5 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -57,7 +57,6 @@ class XMLParaContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLParaContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -93,7 +92,6 @@ class XMLNumberedParaContext : public SvXMLImportContext
public:
- TYPEINFO_OVERRIDE();
XMLNumberedParaContext( SvXMLImport& i_rImport,
sal_uInt16 i_nPrefix,
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index e7495a26ddbf..9e2f8a93e397 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -125,7 +125,6 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
}
-TYPEINIT1( XMLTextStyleContext, XMLPropStyleContext );
XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 0a35e2d7eb99..3a6900b9fc76 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -97,7 +97,6 @@ using namespace ::xmloff::token;
// XMLVarFieldImportContext: superclass for all variable related fields
-TYPEINIT1( XMLVarFieldImportContext, XMLTextFieldImportContext );
XMLVarFieldImportContext::XMLVarFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -291,7 +290,6 @@ void XMLVarFieldImportContext::PrepareField(
// variable set fields
-TYPEINIT1( XMLSetVarFieldImportContext, XMLVarFieldImportContext );
XMLSetVarFieldImportContext::XMLSetVarFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -379,7 +377,6 @@ bool XMLSetVarFieldImportContext::FindFieldMaster(
// sequence field
-TYPEINIT1( XMLSequenceFieldImportContext, XMLSetVarFieldImportContext );
XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -452,7 +449,6 @@ void XMLSequenceFieldImportContext::PrepareField(
// variable set field
-TYPEINIT1( XMLVariableSetFieldImportContext, XMLSetVarFieldImportContext );
XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -488,7 +484,6 @@ void XMLVariableSetFieldImportContext::PrepareField(
// variable input field
-TYPEINIT1( XMLVariableInputFieldImportContext, XMLSetVarFieldImportContext );
XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -530,7 +525,6 @@ void XMLVariableInputFieldImportContext::PrepareField(
// user field
-TYPEINIT1( XMLUserFieldImportContext, XMLSetVarFieldImportContext );
XMLUserFieldImportContext::XMLUserFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -552,7 +546,6 @@ XMLUserFieldImportContext::XMLUserFieldImportContext(
// user input field
-TYPEINIT1( XMLUserFieldInputImportContext, XMLVarFieldImportContext );
// bug: doesn't work (SO API lacking)
XMLUserFieldInputImportContext::XMLUserFieldInputImportContext(
@@ -585,7 +578,6 @@ void XMLUserFieldInputImportContext::PrepareField(
// variable get field
-TYPEINIT1( XMLVariableGetFieldImportContext, XMLVarFieldImportContext );
XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -619,7 +611,6 @@ void XMLVariableGetFieldImportContext::PrepareField(
// expression field
-TYPEINIT1( XMLExpressionFieldImportContext, XMLVarFieldImportContext );
XMLExpressionFieldImportContext::XMLExpressionFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -656,7 +647,6 @@ void XMLExpressionFieldImportContext::PrepareField(
// text input field
-TYPEINIT1( XMLTextInputFieldImportContext, XMLVarFieldImportContext );
XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -689,7 +679,6 @@ void XMLTextInputFieldImportContext::PrepareField(
// table formula field
-TYPEINIT1( XMLTableFormulaImportContext, XMLTextFieldImportContext );
XMLTableFormulaImportContext::XMLTableFormulaImportContext(
SvXMLImport& rImport,
@@ -764,7 +753,6 @@ void XMLTableFormulaImportContext::PrepareField(
// declaration containter import (<variable/user-field/sequence-decls>)
-TYPEINIT1( XMLVariableDeclsImportContext, SvXMLImportContext );
XMLVariableDeclsImportContext::XMLVariableDeclsImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -825,7 +813,6 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext(
// declaration import (<variable/user-field/sequence-decl> elements)
-TYPEINIT1( XMLVariableDeclImportContext, SvXMLImportContext );
XMLVariableDeclImportContext::XMLVariableDeclImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1078,7 +1065,6 @@ bool XMLVariableDeclImportContext::FindFieldMaster(
-TYPEINIT1( XMLDatabaseDisplayImportContext, XMLDatabaseFieldImportContext );
XMLDatabaseDisplayImportContext::XMLDatabaseDisplayImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx
index df6308625329..3b8dd90ec1b8 100644
--- a/xmloff/source/transform/TransformerContext.hxx
+++ b/xmloff/source/transform/TransformerContext.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <salhelper/simplereferenceobject.hxx>
#include <rtl/ustring.hxx>
-#include <tools/rtti.hxx>
#include <xmloff/xmltoken.hxx>
class SvXMLNamespaceMap;