More SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP around std::auto_ptr

...as needed by Clang trunk towards 3.4.

Change-Id: Ibbfe9cb0ec03e0aed939d769feee9e046af4741f

7 files changed, 16 insertions, 0 deletions

diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index cb6acfdde10d..93217f0b37ba 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -56,6 +56,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
 
 //------------------------------------------------------------------------
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
 {
     if( aNotify )
@@ -103,6 +104,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
 
     return ::std::auto_ptr<SfxHint>( new SfxHint() );
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex )
 {
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 2e9b3431f4f4..271cb7ee560e 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -604,7 +604,9 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
                 ScAddress aAddress;
                 ScCompiler* pComp = new ScCompiler(pDoc,aAddress);
                 pComp->SetGrammar( pDoc->GetGrammar() );
+                SAL_WNODEPRECATED_DECLARATIONS_PUSH
                 xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));
+                SAL_WNODEPRECATED_DECLARATIONS_POP
                 break;
             }
 #ifndef DISABLE_SCRIPTING
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;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index c0c92131e9ac..b192ac0c1582 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1672,7 +1672,9 @@ void SmEditAccessible::ClearWin()
     pWin = 0;   // implicitly results in AccessibleStateType::DEFUNC set
 
     //! make TextHelper implicitly release C++ references to some core objects
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     pTextHelper->SetEditSource( ::std::auto_ptr<SvxEditSource>(NULL) );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     //! make TextHelper release references
     //! (e.g. the one set by the 'SetEventSource' call)
     pTextHelper->Dispose();
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 5f0eb423c64b..58e03ccbf30b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -185,8 +185,10 @@ SwDoc::SwDoc()
     mpAttrPool(new SwAttrPool(this)),
     mpMarkManager(new ::sw::mark::MarkManager(*this)),
     m_pMetaFieldManager(new ::sw::MetaFieldManager()),
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     m_pUndoManager(new ::sw::UndoManager(
             ::std::auto_ptr<SwNodes>(new SwNodes(this)), *this, *this, *this)),
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     mpDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
     mpEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, mpDfltFrmFmt ) ),
     mpColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, mpDfltFrmFmt ) ),