diff options
Diffstat (limited to 'sc')
84 files changed, 22 insertions, 276 deletions
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) |