From d3ca36915e20cf4a0ee724c6ba084fe9653757c2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 2 Oct 2013 16:43:02 +0200 Subject: More SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP around std::auto_ptr ...as needed by Clang trunk towards 3.4. Change-Id: Ibbfe9cb0ec03e0aed939d769feee9e046af4741f --- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 4 ++++ sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2 ++ 2 files changed, 6 insertions(+) (limited to 'sd/source/ui/accessibility') diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index ddb04b177acd..7e9d9eedb76a 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -110,8 +110,10 @@ void AccessibleDrawDocumentView::Init (void) { pPage->acquire(); pPage->Init(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH mpChildrenManager->AddAccessibleShape ( std::auto_ptr(pPage)); + SAL_WNODEPRECATED_DECLARATIONS_POP pPage->release(); mpChildrenManager->Update (); } @@ -304,8 +306,10 @@ void SAL_CALL { pPage->acquire(); pPage->Init(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH mpChildrenManager->AddAccessibleShape ( std::auto_ptr(pPage)); + SAL_WNODEPRECATED_DECLARATIONS_POP mpChildrenManager->Update (false); pPage->release(); } diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 39fc2d850069..724c4d9d3e6c 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -84,8 +84,10 @@ AccessibleOutlineView::AccessibleOutlineView ( if( pOutlineView && pOutliner ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH maTextHelper.SetEditSource( ::std::auto_ptr< SvxEditSource >( new AccessibleOutlineEditSource( *pOutliner, *pView, *pOutlineView, *pSdWindow ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP } } } -- cgit