diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:43:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:49:49 +0200 |
| commit | d3ca36915e20cf4a0ee724c6ba084fe9653757c2 (patch) | |
| tree | ab88dd36ee3f5583485759e45cd5f6f1edc4f7a7 /sd | |
| parent | 075d472a9d120431f0b8731e4dcfe3e8b4ded521 (diff) | |
More SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP around std::auto_ptr
...as needed by Clang trunk towards 3.4.
Change-Id: Ibbfe9cb0ec03e0aed939d769feee9e046af4741f
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 2 |
3 files changed, 8 insertions, 0 deletions
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<AccessibleShape>(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<AccessibleShape>(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 } } } diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index 4681f2e788bc..930cc70b36e4 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -84,7 +84,9 @@ public: protected: friend class ::SdModule; + SAL_WNODEPRECATED_DECLARATIONS_PUSH friend class ::std::auto_ptr<SdGlobalResourceContainer>; + SAL_WNODEPRECATED_DECLARATIONS_POP class Implementation; ::std::auto_ptr<Implementation> mpImpl; |