[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann]

 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 891e9807d8cb88bb8f2a9d5f05aee78dca538b32
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Thu Mar 27 22:14:41 2014 +0100

    Work around MSC "'override' cannot be used with 'inline'" bug
    
    Change-Id: Ib84508c7617610ff81d3ec29bc5130048e4cecd3

diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx 
b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 69514c0..74ceb59 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -37,12 +37,12 @@ public:
     /** Create a copy of the called enumeration object.
     */
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    virtual inline ::std::auto_ptr<Enumeration<SharedPageDescriptor> > Clone 
(void) SAL_OVERRIDE;
+    virtual ::std::auto_ptr<Enumeration<SharedPageDescriptor> > Clone (void) 
SAL_OVERRIDE;
     SAL_WNODEPRECATED_DECLARATIONS_POP
 
-    virtual inline bool HasMoreElements (void) const SAL_OVERRIDE;
-    virtual inline SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE;
-    virtual inline void Rewind (void) SAL_OVERRIDE;
+    virtual bool HasMoreElements (void) const SAL_OVERRIDE;
+    virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE;
+    virtual void Rewind (void) SAL_OVERRIDE;
 
 private:
     const SlideSorterModel& mrModel;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits