diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-03 13:37:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-03 13:37:24 +0100 |
| commit | 80e6eab7014b8b0215a442296d517c2bd4ad8c82 (patch) | |
| tree | 69a3c3c68e71310941a9bfe85de5119f781257b2 | |
| parent | a883b6b13b67898accdc1ffe3fd9e770612352b1 (diff) | |
Fix TYPEINFO_VISIBILITY vs. TYPEINFO_VISIBILITY_OVERRIDE
Change-Id: Ia6494c611e6596fa4811c2751bb96294a3950f17
| -rw-r--r-- | include/svx/sxfiitm.hxx | 2 | ||||
| -rw-r--r-- | include/tools/rtti.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 570ebd02aa8c..b36eab227c5e 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -29,7 +29,7 @@ class SdrFractionItem: public SfxPoolItem { Fraction nValue; public: - TYPEINFO_VISIBILITY( SVX_DLLPUBLIC ); + TYPEINFO_VISIBILITY_OVERRIDE( SVX_DLLPUBLIC ); SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx index 013552c66f79..1bc9c448c3d5 100644 --- a/include/tools/rtti.hxx +++ b/include/tools/rtti.hxx @@ -43,8 +43,8 @@ typedef void* (*TypeId)(); visibility static void* CreateType(); \ visibility static TypeId StaticType(); \ visibility static bool IsOf( TypeId aSameOrSuperType ); \ - visibility virtual TypeId Type() const SAL_OVERRIDE; \ - visibility virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE + visibility virtual TypeId Type() const; \ + visibility virtual bool IsA( TypeId aSameOrSuperType ) const #define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \ visibility static void* CreateType(); \ diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index e8b942cec7f2..7c578765db53 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -75,7 +75,7 @@ protected: virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; public: - TYPEINFO_VISIBILITY( SC_DLLPUBLIC ); + TYPEINFO_VISIBILITY_OVERRIDE( SC_DLLPUBLIC ); 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 07d477201427..22726636d92d 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -226,7 +226,7 @@ protected: virtual SdrView* GetDrawView() const SAL_OVERRIDE; public: - TYPEINFO_VISIBILITY(SC_DLLPUBLIC); + TYPEINFO_VISIBILITY_OVERRIDE(SC_DLLPUBLIC); SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL) SFX_DECL_VIEWFACTORY(ScTabViewShell); |