summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 22:14:41 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 23:20:06 +0100
commit891e9807d8cb88bb8f2a9d5f05aee78dca538b32 (patch)
treeb030d23557241281b6daf01e211e6283dc550f51 /sd
parentb3b843481db30df80e39869052b57ec929e18ea8 (diff)
Work around MSC "'override' cannot be used with 'inline'" bug
Change-Id: Ib84508c7617610ff81d3ec29bc5130048e4cecd3
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 69514c0e40e5..74ceb59bb0d6 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;