[Libreoffice-commits] core.git: include/svx include/tools sc/source

[Stephan Bergmann]

 include/svx/sxfiitm.hxx      |    2 +-
 include/tools/rtti.hxx       |    4 ++--
 sc/source/ui/inc/prevwsh.hxx |    2 +-
 sc/source/ui/inc/tabvwsh.hxx |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 80e6eab7014b8b0215a442296d517c2bd4ad8c82
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 3 13:37:24 2015 +0100

    Fix TYPEINFO_VISIBILITY vs. TYPEINFO_VISIBILITY_OVERRIDE
    
    Change-Id: Ia6494c611e6596fa4811c2751bb96294a3950f17

diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx
index 570ebd0..b36eab2 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 013552c..1bc9c44 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 e8b942c..7c57876 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 07d4772..2272663 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);