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 /reportdesign | |
parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/inc/RptModel.hxx | 2 | ||||
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 8 | ||||
-rw-r--r-- | reportdesign/inc/RptPage.hxx | 2 | ||||
-rw-r--r-- | reportdesign/inc/UndoActions.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlStyleImport.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/RptUndo.hxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/SectionView.hxx | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 66a229a3081f..01b773622257 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -53,7 +53,7 @@ private: void operator=(const OReportModel& rSrcModel); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OReportModel(::reportdesign::OReportDefinition* _pReportDefinition); virtual ~OReportModel(); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 48cf539ffc08..c6f39e7fa1f1 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -57,7 +57,7 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo DlgEdHint(DlgEdHint&); void operator =(DlgEdHint&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint(); @@ -158,7 +158,7 @@ protected: void SetObjectItemHelper(const SfxPoolItem& rItem); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~OCustomShape(); @@ -205,7 +205,7 @@ protected: virtual SdrPage* GetImplPage() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~OOle2Obj(); @@ -253,7 +253,7 @@ protected: virtual SdrPage* GetImplPage() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_Int32 GetStep() const; virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 2d7ec6e6f064..dd4d99e1cffb 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -50,7 +50,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OReportPage( OReportModel& rModel ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 3b92fec6d0fa..b40733debb5d 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -157,7 +157,7 @@ namespace rptui ::dbaui::IController* m_pController; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OCommentUndoAction( SdrModel& rMod ,sal_uInt16 nCommentID); virtual ~OCommentUndoAction(); diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 00868d55124d..896d248262cd 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -61,7 +61,7 @@ namespace rptxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -128,7 +128,7 @@ namespace rptxml public: - TYPEINFO(); + 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 75426d59c95f..6804d8aa087e 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -84,7 +84,7 @@ class RptMLMasterStylesContext_Impl : public XMLTextMasterStylesContext void operator =(const RptMLMasterStylesContext_Impl&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); RptMLMasterStylesContext_Impl( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index b4d47c7fcc37..8612b2a24b76 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -51,7 +51,7 @@ namespace rptui void collectControls(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,Action _eAction @@ -75,7 +75,7 @@ namespace rptui OReportSectionUndo(const OReportSectionUndo&); void operator =(const OReportSectionUndo&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection OReportSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot @@ -102,7 +102,7 @@ namespace rptui OGroupSectionUndo(const OGroupSectionUndo&); void operator =(const OGroupSectionUndo&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection OGroupSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot @@ -128,7 +128,7 @@ namespace rptui void implReInsert( ); void implReRemove( ); public: - TYPEINFO(); + 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 5c6a3b101835..77c3c0638873 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -41,7 +41,7 @@ private: OSectionView(const OSectionView&); void operator =(const OSectionView&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, OReportWindow* pEditor ); virtual ~OSectionView(); |