diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /sd/source/ui/slidesorter/model | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'sd/source/ui/slidesorter/model')
| -rw-r--r-- | sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 3eac80cbd5b0..8a135b322d95 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -46,7 +46,9 @@ public: virtual ~PageEnumerationImpl (void); /** Create a copy of the called enumeration object. */ + SAL_WNODEPRECATED_DECLARATIONS_PUSH virtual inline ::std::auto_ptr<Enumeration<SharedPageDescriptor> > Clone (void); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual inline bool HasMoreElements (void) const; virtual inline SharedPageDescriptor GetNextElement (void); @@ -84,7 +86,7 @@ private: namespace sd { namespace slidesorter { namespace model { - +SAL_WNODEPRECATED_DECLARATIONS_PUSH PageEnumeration PageEnumeration::Create ( const SlideSorterModel& rModel, const PagePredicate& rPredicate) @@ -92,16 +94,16 @@ PageEnumeration PageEnumeration::Create ( return PageEnumeration(::std::auto_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(rModel, rPredicate))); } +SAL_WNODEPRECATED_DECLARATIONS_POP - - +SAL_WNODEPRECATED_DECLARATIONS_PUSH PageEnumeration::PageEnumeration ( ::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl) : mpImpl(pImpl) { } - +SAL_WNODEPRECATED_DECLARATIONS_POP @@ -148,13 +150,13 @@ PageEnumeration& PageEnumeration::operator= ( - +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone (void) { return ::std::auto_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumeration (*this, true)); } - +SAL_WNODEPRECATED_DECLARATIONS_POP @@ -217,14 +219,14 @@ PageEnumerationImpl::~PageEnumerationImpl (void) - +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Enumeration<SharedPageDescriptor> > PageEnumerationImpl::Clone (void) { return ::std::auto_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(mrModel,maPredicate,mnIndex)); } - +SAL_WNODEPRECATED_DECLARATIONS_POP |