diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:55 +0100 |
commit | 5fb78604c1c3e91beb867c352928af9e1ef57a26 (patch) | |
tree | 7d6a0f7c1bfe2f2803f5f2ffb5741dd3c05c5818 /basctl/source | |
parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'basctl/source')
-rw-r--r-- | basctl/source/basicide/basdoc.hxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/baside3.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlged.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedmod.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/dlgedpage.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedview.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/sbxitem.hxx | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 0606e7ff2ed0..d70296a25192 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -48,7 +48,7 @@ protected: bool bTemplate = false ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); using SotObject::GetInterface; SFX_DECL_OBJECTFACTORY(); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index d7495b894c91..3201d2c6f799 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -335,7 +335,7 @@ protected: virtual void DoScroll( ScrollBar* pCurScrollBar ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, OUString& aModule ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 01e1b3c18749..f66bda4f68c9 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -77,7 +77,7 @@ protected: void InitSettings(bool bFont, bool bForeground, bool bBackground); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel); DialogWindow( DialogWindow* pCurView ); // never implemented ~DialogWindow(); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 6a75f159d2dd..0084f33d4ad4 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -148,7 +148,7 @@ private: virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_VIEWSH ) SFX_DECL_VIEWFACTORY(Shell); diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 6d1d4a679f10..3975cb9ebbc7 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -69,7 +69,7 @@ private: DlgEdObj* pDlgEdObj; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdHint (Kind); DlgEdHint (Kind, DlgEdObj* pObj); virtual ~DlgEdHint(); diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index c7d737558fe6..2aa31ba51187 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -38,7 +38,7 @@ private: void operator=(const DlgEdModel& rSrcModel); // not implemented public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdModel(); virtual ~DlgEdModel(); diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index dedd56699810..6208b7dfe704 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -86,7 +86,7 @@ protected: sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~DlgEdObj(); virtual void SetPage(SdrPage* pNewPage); @@ -157,7 +157,7 @@ protected: virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~DlgEdForm(); diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index 370b4127a398..4083616720d7 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -38,7 +38,7 @@ private: DlgEdForm* pDlgEdForm; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false ); virtual ~DlgEdPage(); diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 59a727c4c086..1e14329df655 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -38,7 +38,7 @@ private: DlgEditor& rDlgEditor; public: - TYPEINFO(); + 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 c3c02cc2b64e..66c358196d77 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(); + TYPEINFO_OVERRIDE(); 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); |