just silence the auto_ptr deprecations in isolation

23 files changed, 81 insertions, 27 deletions

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 594ce2d96123..e9bb01a76386 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -597,7 +597,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
         else
         {
             SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-            std::auto_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 );
+            boost::scoped_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 );
 
             // Open the Pilot
             if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK )
@@ -667,7 +667,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                     pOpt->SetStartWithTemplate(bStartWithTemplate);
                     if(bNewDocDirect && !bStartWithTemplate)
                     {
-                        std::auto_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
+                        boost::scoped_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
                         if(pRet.get())
                             ApplyItemSet( SID_SD_EDITOPTIONS, *pRet.get() );
 
@@ -685,7 +685,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
 
                         if(bNewDocDirect && !bStartWithTemplate)
                         {
-                            std::auto_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
+                            boost::scoped_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
                             if(pRet.get())
                                 ApplyItemSet( SID_SD_EDITOPTIONS, *pRet.get() );
                         }
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index c2f05428e836..4d5f57b8f40f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -509,7 +509,9 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
     {
         // Create the corresponding shell and determine the id of the child window.
         sal_uInt16 nChildWindowId = 0;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<SfxShell> pShell;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         switch (rDescriptor.mePaneId)
         {
             case LeftImpressPaneId:
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index a0337d739c4a..fb9b10a2e9d6 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -44,6 +44,7 @@ using namespace ::com::sun::star::drawing::framework;
 namespace sd { namespace framework {
 
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ChildWindowPane::ChildWindowPane (
     const Reference<XResourceId>& rxPaneId,
     sal_uInt16 nChildWindowId,
@@ -95,7 +96,7 @@ ChildWindowPane::ChildWindowPane (
         }
     }
 }
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 8f379123dde2..8f1a5b67aa9a 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -100,7 +100,9 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
 
                     OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
 
+                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                     std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+                    SAL_WNODEPRECATED_DECLARATIONS_POP
 
                     if (mpView->ISA(OutlineView))
                     {
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index f5d5d20e8786..dd82f13ca374 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -232,7 +232,9 @@ sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
     {
         mpWindow->GrabFocus();
 
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         if( (nKeyGroup != KEYGROUP_CURSOR) && (nKeyGroup != KEYGROUP_FKEYS) )
             aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 59d495a5d95c..675604529ccd 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -45,6 +45,8 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 
+#include <boost/scoped_ptr.hpp>
+
 namespace sd {
 
 TYPEINIT1( FuTransform, FuPoor );
@@ -92,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
-                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
+                    boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
 
                     const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
                     SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -112,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
+                    boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
                     if( pDlg.get() && (pDlg->Execute() == RET_OK) )
                     {
                         rReq.Done( *( pDlg->GetOutputItemSet() ) );
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index b3508bdbaace..8a4a55acfaff 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -483,14 +483,18 @@ protected:
     ::boost::shared_ptr<ScrollBar> mpHorizontalScrollBar;
     /// Vertical scroll bar for whole document is always visible.
     ::boost::shared_ptr<ScrollBar> mpVerticalScrollBar;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     /// Horizontal ruler is not shown by default.
     ::std::auto_ptr<SvxRuler> mpHorizontalRuler;
     /// Vertical ruler is not shown by default.
     ::std::auto_ptr<SvxRuler> mpVerticalRuler;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     /// Filler of the little square enclosed by the two scroll bars.
     ::boost::shared_ptr<ScrollBarBox> mpScrollBarBox;
     /// Layer tab bar.
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<LayerTabBar> mpLayerTabBar;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     /// This flag controls whether the rulers are visible.
     bool mbHasRulers;
@@ -530,7 +534,9 @@ protected:
     /// The type of the shell.  Returned by GetShellType().
     ShellType meShellType;
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<Implementation> mpImpl;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     // Support methods for centralized UNDO/REDO
     virtual ::svl::IUndoManager* ImpGetUndoManager (void) const;
@@ -589,7 +595,9 @@ private:
         with reference to the digit langugage used to display digits in text
         shapes.
     */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::sd::WindowUpdater> mpWindowUpdater;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     /** Code common to all constructors.  It generally is a bad idea
         to call this function from outside a constructor.
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index 3fad137c55ad..a7429a070690 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -106,7 +106,9 @@ private:
     bool mbExpanded;
     bool mbFocused;
     // Size of the bounding box that encloses the title string.
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<VirtualDevice> mpDevice;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     bool mbIsExpandable;
 
     /** Return whether this TitleBar object has an expansion indicator
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 531b01e57cc4..c7635efda428 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -461,7 +461,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
 
 
 
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<BitmapCache::CacheIndex> BitmapCache::GetCacheIndex (
     bool bIncludePrecious,
     bool bIncludeNoPreview) const
@@ -497,7 +497,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
         pIndex->push_back(iIndexEntry->first);
     return pIndex;
 }
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index e1a9bf2cce37..ffd793c62d4c 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -99,7 +99,7 @@ private:
 
 namespace sd { namespace slidesorter { namespace cache {
 
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<CacheCompactor> CacheCompactor::Create (
     BitmapCache& rCache,
     sal_Int32 nMaximalCacheSize)
@@ -138,6 +138,7 @@ namespace sd { namespace slidesorter { namespace cache {
 
     return pCompactor;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
@@ -218,8 +219,10 @@ void CacheCompactionByCompression::Run (void)
             mrCache.GetSize(), mnMaximalCacheSize);
 #endif
 
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< ::sd::slidesorter::cache::BitmapCache::CacheIndex> pIndex (
             mrCache.GetCacheIndex(false,false));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         ::sd::slidesorter::cache::BitmapCache::CacheIndex::iterator iIndex;
         for (iIndex=pIndex->begin(); iIndex!=pIndex->end(); ++iIndex)
         {
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
index 90a2932ad501..eef11a947011 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
@@ -62,9 +62,11 @@ public:
             under this number.  However, it is not guaranteed that this
             works in all cases.
     */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     static ::std::auto_ptr<CacheCompactor> Create (
         BitmapCache& rCache,
         sal_Int32 nMaximalCacheSize);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     /** Request a compaction of the off-screen previews in the bitmap
         cache.  This calls via a timer the Run() method.
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
index 36a49f720589..f2aad6dc2b02 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
@@ -29,8 +29,9 @@
 #ifndef SD_SLIDESORTER_PAGE_ENUMERATION_HXX
 #define SD_SLIDESORTER_PAGE_ENUMERATION_HXX
 
-#include "pres.hxx"
+#include <sal/types.h>
 
+#include "pres.hxx"
 
 #include "model/SlsEnumeration.hxx"
 #include "model/SlsSharedPageDescriptor.hxx"
@@ -89,7 +90,9 @@ public:
 
     /** Create and return an exact copy of the called object.
     */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     virtual ::std::auto_ptr<Enumeration<SharedPageDescriptor> > Clone (void);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     PageEnumeration& operator= (const PageEnumeration& rEnumeration);
 
@@ -112,12 +115,16 @@ public:
 
 private:
     /// Implementation object.
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<Enumeration<SharedPageDescriptor> > mpImpl;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     /** This constructor expects an implementation object that holds
         the predicate that filters the pages.
     */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     PageEnumeration (::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     // Default constructor not implemented.
     PageEnumeration (void);
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
 
 
 
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 7c44d2c6a3fd..66e09620ed64 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -115,7 +115,7 @@ ScrollPanel::~ScrollPanel (void)
 
 
 
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 TitledControl* ScrollPanel::AddControl (
     ::std::auto_ptr<TreeNode> pControl,
     const String& rTitle,
@@ -135,10 +135,10 @@ TitledControl* ScrollPanel::AddControl (
 
     return pTitledControl;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
-
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void ScrollPanel::AddControl (::std::auto_ptr<TreeNode> pControl)
 {
     if (pControl.get() != NULL)
@@ -189,7 +189,7 @@ void ScrollPanel::AddControl (::std::auto_ptr<TreeNode> pControl)
             ControlContainer::ES_EXPAND);
     }
 }
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index 584de24f7d82..f21416f4762b 100644
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -65,11 +65,13 @@ namespace sd { namespace toolpanel
     //= ToolPanel
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ToolPanel::ToolPanel( ::std::auto_ptr< TreeNode >& i_rControl )
         :ToolPanel_Base( m_aMutex )
         ,m_pControl( i_rControl )
     {
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     //------------------------------------------------------------------------------------------------------------------
     ToolPanel::~ToolPanel()
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 47453fcedcb0..3889d47aae82 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -282,7 +282,9 @@ private:
 private:
     ToolPanelViewShell&                             m_rPanelViewShell;
     ::boost::scoped_ptr< ::sfx2::ModuleTaskPane >   m_pTaskPane;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::sfx2::TaskPaneController >   m_pTaskPaneController;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     ::rtl::Reference< ConfigurationListener >       m_pConfigListener;
     bool                                            m_bInitialized;
 };
@@ -722,8 +724,10 @@ Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Referenc
 
     // a TreeNode which will resemble the panel
     const PanelFactory aPanelFactory( lcl_describePanel( ePanelId ) );
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ControlFactory > pControlFactory( (*aPanelFactory.pFactory)( *this ) );
     ::std::auto_ptr< TreeNode > pNode( pControlFactory->CreateControl( mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() ) );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     ENSURE_OR_THROW( ( pNode.get() != NULL ) && ( pNode->GetWindow() != NULL ),
         "illegal node returned by the control factory" );
     pNode->GetWindow()->SetHelpId( aPanelFactory.sHelpID );
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 4d6bbf3b8891..2aaa129dc9c6 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -117,7 +117,7 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize)
 
 
 
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<std::vector<MasterPageContainerChangeEvent::EventType> >
     MasterPageDescriptor::Update (
         const MasterPageDescriptor& rDescriptor)
@@ -184,7 +184,7 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize)
 
      return pResult;
 }
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 816b581e3eda..c191636b5f0b 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -798,7 +798,7 @@ void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken)
 
 
 
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList)
 {
     const ::osl::MutexGuard aGuard (maMutex);
@@ -836,7 +836,7 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList
     if (GetParentNode() != NULL)
         GetParentNode()->RequestResize();
 }
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 7b81dd3d8b5f..14186836f08b 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -72,7 +72,9 @@ IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer)
 {
     if (pTimer == &maTimer)
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<AsynchronousFunction> pFunction (mpFunction);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         mpFunction.reset();
         (*pFunction)();
     }
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 8a95f112fad7..6a529e95bd25 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -304,7 +304,9 @@ public:
             this method and that is either released at its end or assigned
             to mpAsynchronousLock in order to be unlocked later.
     */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void Update (::std::auto_ptr<LayouterLock> pLayouterLock);
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     class UpdateLockImplementation
     {
@@ -340,9 +342,11 @@ private:
         (final) unlocking  is usually done asynchronously *after* the
         list of requested toolbars is updated.
     */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<LayouterLock> mpSynchronousLayouterLock;
     ::std::auto_ptr<LayouterLock> mpAsynchronousLayouterLock;
     ::std::auto_ptr<ViewShellManager::UpdateLock> mpViewShellManagerLock;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     sal_uLong mnPendingUpdateCall;
     sal_uLong mnPendingSetValidCall;
     ToolBarRules maToolBarRules;
@@ -918,7 +922,7 @@ void ToolBarManager::Implementation::UnlockUpdate (void)
 
 
 
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void ToolBarManager::Implementation::Update (
     ::std::auto_ptr<LayouterLock> pLocalLayouterLock)
 {
@@ -990,6 +994,7 @@ void ToolBarManager::Implementation::Update (
         }
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 34b38028f837..c56790fc49a2 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -98,7 +98,9 @@ void TextObjectBar::Execute( SfxRequest &rReq )
     sal_uInt16 nSlot = rReq.GetSlot();
     OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     if (mpView->ISA(OutlineView))
     {
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index b29b5883e065..65d741d3d639 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -100,6 +100,7 @@ using namespace ::com::sun::star::linguistic2;
     current clipboard content and the DrawViewShell.
     The list is stored in a new instance of SvxClipboardFmtItem.
 */
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats (
     TransferableDataHelper& rDataHelper)
 {
@@ -180,6 +181,7 @@ using namespace ::com::sun::star::linguistic2;
 
     return pResult;
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 namespace sd {
 
@@ -197,7 +199,9 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
         // exit immediately.
         TransferableDataHelper aDataHelper (
             TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow()));
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         if (mpDrawView == NULL)
             return 0;
         mpCurrentClipboardFormats = pFormats;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index acaad8ecf941..139b752ce642 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -499,7 +499,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
     sal_Bool bPreviewState = sal_False;
     sal_uLong nSlot = rReq.GetSlot();
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if( pOlView && (
         (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) ||
         (nSlot == SID_TRANSLITERATE_TITLE_CASE) ||