Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

8 files changed, 49 insertions, 49 deletions

diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index a31189540b94..0b2b6ef95a8b 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -72,7 +72,7 @@ protected:
     bool                                mbMovedAtAll;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     E3dDragMethod(
         SdrDragView &rView,
         const SdrMarkList& rMark,
@@ -103,7 +103,7 @@ class E3dDragRotate : public E3dDragMethod
     basegfx::B3DPoint                   maGlobalCenter;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     E3dDragRotate(
         SdrDragView &rView,
         const SdrMarkList& rMark,
@@ -127,7 +127,7 @@ class E3dDragMove : public E3dDragMethod
     Point                   maScaleFixPos;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     E3dDragMove(
         SdrDragView &rView,
         const SdrMarkList& rMark,
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index b930613fec6f..ff77ca9af5ee 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -232,7 +232,7 @@ class FmFilterHint : public SfxHint
     FmFilterData*   m_pData;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterHint(FmFilterData* pData):m_pData(pData){}
     FmFilterData* GetData() const { return m_pData; }
 };
@@ -244,7 +244,7 @@ class FmFilterInsertedHint : public FmFilterHint
     sal_uLong m_nPos;   // Position relative to the parent of the data
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterInsertedHint(FmFilterData* pData, sal_uLong nRelPos)
         :FmFilterHint(pData)
         ,m_nPos(nRelPos){}
@@ -257,7 +257,7 @@ TYPEINIT1( FmFilterInsertedHint, FmFilterHint );
 class FmFilterRemovedHint : public FmFilterHint
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterRemovedHint(FmFilterData* pData)
         :FmFilterHint(pData){}
 
@@ -268,7 +268,7 @@ TYPEINIT1( FmFilterRemovedHint, FmFilterHint );
 class FmFilterTextChangedHint : public FmFilterHint
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterTextChangedHint(FmFilterData* pData)
         :FmFilterHint(pData){}
 
@@ -279,7 +279,7 @@ TYPEINIT1( FmFilterTextChangedHint, FmFilterHint );
 class FilterClearingHint : public SfxHint
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FilterClearingHint(){}
 };
 TYPEINIT1( FilterClearingHint, SfxHint );
@@ -288,7 +288,7 @@ TYPEINIT1( FilterClearingHint, SfxHint );
 class FmFilterCurrentChangedHint : public SfxHint
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterCurrentChangedHint(){}
 };
 TYPEINIT1( FmFilterCurrentChangedHint, SfxHint );
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index c5a813cad1c8..82189af99706 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -83,7 +83,7 @@ protected:
     ::std::vector< FmFilterData* >  m_aChildren;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmParentData(FmParentData* pParent, const OUString& rText)
         : FmFilterData(pParent, rText)
     {}
@@ -100,7 +100,7 @@ class FmFormItem : public FmParentData
     ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController >  m_xFilterController;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     FmFormItem(  FmParentData* _pParent,
                  const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController,
@@ -124,7 +124,7 @@ public:
 class FmFilterItems : public FmParentData
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterItems() : FmParentData(NULL, OUString()) {}
     FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {}
 
@@ -139,7 +139,7 @@ class FmFilterItem : public FmFilterData
     const sal_Int32     m_nComponentIndex;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterItem(
         FmFilterItems* pParent,
         const OUString& aFieldName,
@@ -166,7 +166,7 @@ class FmFilterModel : public FmParentData
     FmFilterItems*          m_pCurrentItems;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmFilterModel();
     virtual ~FmFilterModel();
 
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index e305515bc0ae..f84554977544 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -67,7 +67,7 @@ class FmNavInsertedHint : public SfxHint
     sal_uInt32 nPos;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos );
     virtual ~FmNavInsertedHint();
 
@@ -81,7 +81,7 @@ class FmNavModelReplacedHint : public SfxHint
     FmEntryData* pEntryData;    // die Daten des Eintrages, der ein neues Model bekommen hat
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavModelReplacedHint( FmEntryData* pAffectedEntryData );
     virtual ~FmNavModelReplacedHint();
 
@@ -94,7 +94,7 @@ class FmNavRemovedHint : public SfxHint
     FmEntryData* pEntryData;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavRemovedHint( FmEntryData* pInsertedEntryData );
     virtual ~FmNavRemovedHint();
 
@@ -108,7 +108,7 @@ class FmNavNameChangedHint : public SfxHint
     OUString          aNewName;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName );
     virtual ~FmNavNameChangedHint();
 
@@ -120,7 +120,7 @@ public:
 class FmNavClearedHint : public SfxHint
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavClearedHint();
     virtual ~FmNavClearedHint();
 };
@@ -130,7 +130,7 @@ class FmNavViewMarksChanged : public SfxHint
 {
     FmFormView* pView;
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavViewMarksChanged(FmFormView* pWhichView) { pView = pWhichView; }
     virtual ~FmNavViewMarksChanged() {}
 
@@ -225,7 +225,7 @@ class FmNavRequestSelectHint : public SfxHint
     FmEntryDataArray    m_arredToSelect;
     sal_Bool                m_bMixedSelection;
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmNavRequestSelectHint() { }
     virtual ~FmNavRequestSelectHint() {}
 
@@ -243,7 +243,7 @@ class FmFormData : public FmEntryData
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     FmFormData(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
@@ -277,7 +277,7 @@ class FmControlData : public FmEntryData
     Image GetImage(const ImageList& ilNavigatorImages) const;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     FmControlData(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent,
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 72a9e3156d3c..021ec4d1a58c 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -29,7 +29,7 @@ class FmInterfaceItem : public SfxPoolItem
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xInterface;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     FmInterfaceItem( const sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxInterface )
         :SfxPoolItem( nId )
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 8f6a755c2f16..35bd0ec01318 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -48,7 +48,7 @@ public:
     SVX_DLLPUBLIC FmFormObj(const OUString& rModelName);
     SVX_DLLPUBLIC FmFormObj();
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>&
         GetOriginalParent() const { return m_xParent; }
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 66f9facdfc5a..f92da990f01b 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -371,7 +371,7 @@ inline  void        DbCellControl::unlockValueProperty()
 class DbLimitedLengthField : public DbCellControl
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
 protected:
     DbLimitedLengthField( DbGridColumn& _rColumn );
@@ -400,7 +400,7 @@ protected:
     ~DbTextField( );
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbTextField(DbGridColumn& _rColumn);
 
     ::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; }
@@ -431,7 +431,7 @@ protected:
 
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbFormattedField(DbGridColumn& _rColumn);
     virtual ~DbFormattedField();
 
@@ -454,7 +454,7 @@ protected:
 class DbCheckBox : public DbCellControl
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbCheckBox(DbGridColumn& _rColumn);
 
     virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor );
@@ -477,7 +477,7 @@ class DbComboBox : public DbCellControl
     sal_Int16         m_nKeyType;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbComboBox(DbGridColumn& _rColumn);
 
     virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor );
@@ -505,7 +505,7 @@ class DbListBox     :public DbCellControl
     ::com::sun::star::uno::Sequence< OUString > m_aValueList;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbListBox(DbGridColumn& _rColumn);
 
     virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor );
@@ -530,7 +530,7 @@ protected:
 class DbPatternField : public DbCellControl
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext );
     virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor );
     virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL);
@@ -562,7 +562,7 @@ private:
     sal_Int16   m_nStandardAlign;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
 protected:
     DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = com::sun::star::awt::TextAlign::RIGHT );
@@ -583,7 +583,7 @@ protected:
 class DbDateField : public DbSpinField
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbDateField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL);
     virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter);
@@ -608,7 +608,7 @@ protected:
 class DbTimeField : public DbSpinField
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbTimeField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL);
     virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter);
@@ -635,7 +635,7 @@ class DbCurrencyField : public DbSpinField
     sal_Int16  m_nScale;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbCurrencyField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL);
     virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter);
@@ -662,7 +662,7 @@ protected:
 class DbNumericField : public DbSpinField
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbNumericField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL);
     virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter);
@@ -697,7 +697,7 @@ class DbFilterField
     sal_Bool    m_bBound : 1;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn);
     virtual ~DbFilterField();
 
@@ -836,7 +836,7 @@ private:
 class FmXDataCell : public FmXGridCell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmXDataCell( DbGridColumn* pColumn, DbCellControl& _rControl )
         :FmXGridCell( pColumn, &_rControl )
     {
@@ -875,7 +875,7 @@ protected:
     sal_Bool    m_bFastPaint;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl );
 
     virtual void PaintFieldToCell(OutputDevice& rDev,
@@ -1101,7 +1101,7 @@ class FmXFilterCell :public FmXGridCell
 protected:
     virtual ~FmXFilterCell();
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     FmXFilterCell(DbGridColumn* pColumn = NULL, DbCellControl* pControl = NULL);
 
 
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index b2282bd28ee5..d77268ecd25f 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -40,7 +40,7 @@ protected:
     virtual void createSdrDragEntries();
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragMovHdl(SdrDragView& rNewView);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -64,7 +64,7 @@ private:
     bool                        bRight;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragRotate(SdrDragView& rNewView);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -93,7 +93,7 @@ private:
     bool                        bSlant;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragShear(SdrDragView& rNewView,bool bSlant1);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -120,7 +120,7 @@ private:
     bool ImpCheckSide(const Point& rPnt) const;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragMirror(SdrDragView& rNewView);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -146,7 +146,7 @@ private:
     bool                        bIsGradient : 1;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragGradient(SdrDragView& rNewView, bool bGrad = true);
 
     bool IsGradient() const { return bIsGradient; }
@@ -198,7 +198,7 @@ protected:
     virtual void createSdrDragEntries();
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragCrook(SdrDragView& rNewView);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -232,7 +232,7 @@ protected:
     virtual void createSdrDragEntries();
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragDistort(SdrDragView& rNewView);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -253,7 +253,7 @@ public:
 class SdrDragCrop : public SdrDragObjOwn
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdrDragCrop(SdrDragView& rNewView);
 
     virtual void TakeSdrDragComment(OUString& rStr) const;