From d3ca36915e20cf4a0ee724c6ba084fe9653757c2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
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 ++
 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx      | 2 ++
 3 files changed, 8 insertions(+)

(limited to 'sd/source/ui')

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;
-- 
cgit