Kaydet (Commit) 80e6eab7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix TYPEINFO_VISIBILITY vs. TYPEINFO_VISIBILITY_OVERRIDE

Change-Id: Ia6494c611e6596fa4811c2751bb96294a3950f17
üst a883b6b1
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
class SdrFractionItem: public SfxPoolItem { class SdrFractionItem: public SfxPoolItem {
Fraction nValue; Fraction nValue;
public: public:
TYPEINFO_VISIBILITY( SVX_DLLPUBLIC ); TYPEINFO_VISIBILITY_OVERRIDE( SVX_DLLPUBLIC );
SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {}
SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
SdrFractionItem(sal_uInt16 nId, SvStream& rIn); SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
......
...@@ -43,8 +43,8 @@ typedef void* (*TypeId)(); ...@@ -43,8 +43,8 @@ typedef void* (*TypeId)();
visibility static void* CreateType(); \ visibility static void* CreateType(); \
visibility static TypeId StaticType(); \ visibility static TypeId StaticType(); \
visibility static bool IsOf( TypeId aSameOrSuperType ); \ visibility static bool IsOf( TypeId aSameOrSuperType ); \
visibility virtual TypeId Type() const SAL_OVERRIDE; \ visibility virtual TypeId Type() const; \
visibility virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE visibility virtual bool IsA( TypeId aSameOrSuperType ) const
#define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \ #define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \
visibility static void* CreateType(); \ visibility static void* CreateType(); \
......
...@@ -75,7 +75,7 @@ protected: ...@@ -75,7 +75,7 @@ protected:
virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE;
public: public:
TYPEINFO_VISIBILITY( SC_DLLPUBLIC ); TYPEINFO_VISIBILITY_OVERRIDE( SC_DLLPUBLIC );
SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL) SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScPreviewShell); SFX_DECL_VIEWFACTORY(ScPreviewShell);
......
...@@ -226,7 +226,7 @@ protected: ...@@ -226,7 +226,7 @@ protected:
virtual SdrView* GetDrawView() const SAL_OVERRIDE; virtual SdrView* GetDrawView() const SAL_OVERRIDE;
public: public:
TYPEINFO_VISIBILITY(SC_DLLPUBLIC); TYPEINFO_VISIBILITY_OVERRIDE(SC_DLLPUBLIC);
SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL) SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScTabViewShell); SFX_DECL_VIEWFACTORY(ScTabViewShell);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment