diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-11-07 14:43:19 +0100 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2015-11-11 10:49:30 +0000 |
commit | fa91dd31f39a24329d288d4e1cda28db3a16af0d (patch) | |
tree | 603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /basctl | |
parent | c21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (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>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/basdoc.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/basdoc.hxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/sbxitem.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedmod.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedpage.cxx | 1 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedview.cxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/dlgedmod.hxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedpage.hxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/dlgedview.hxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/sbxitem.hxx | 2 |
15 files changed, 2 insertions, 20 deletions
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); |