just silence the auto_ptr deprecations in isolation

3 files changed, 16 insertions, 2 deletions

diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index e5175ac57a84..b23bad29b036 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -43,6 +43,8 @@
 #include <sfx2/Metadatable.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 
+#include <boost/scoped_ptr.hpp>
+
 
 using namespace ::com::sun::star;
 
@@ -104,9 +106,9 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2)
 void MetadatableTest::test()
 {
     OSL_TRACE("SwMetadatable test(): start");
-    ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg(
+    boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pReg(
         ::sfx2::createXmlIdRegistry(false) );
-    ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
+    boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
         ::sfx2::createXmlIdRegistry(true) );
 
     MockMetadatable m1(*pReg);
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 76d512bc8114..40467b533940 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1422,8 +1422,10 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     DBG_ASSERT( eState != S_Init, "*SfxInternetPage::FillItemSet(): state init is not acceptable at this point!" );
 
     sal_Bool                        bEnableReload = sal_False;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< String >   aURL( NULL );
     ::std::auto_ptr< String >   aFrame( NULL );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     sal_uIntPtr                     nDelay = 0;
 
     switch( eState )
@@ -1432,16 +1434,20 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
             break;
         case S_Reload:
             bEnableReload = sal_True;
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             aURL = ::std::auto_ptr< String >( new String() );
             aFrame = ::std::auto_ptr< String >( new String() );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             nDelay = static_cast<sal_uIntPtr>(aNFReload.GetValue());
             break;
         case S_Forward:
             DBG_ASSERT( aEDForwardURL.GetText().Len(), "+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!" );
 
             bEnableReload = sal_True;
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             aURL = ::std::auto_ptr< String >( new String( URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aEDForwardURL.GetText(), URIHelper::GetMaybeFileHdl(), true ) ) );
             aFrame = ::std::auto_ptr< String >( new String( aCBFrame.GetText() ) );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             nDelay = static_cast<sal_uIntPtr>(aNFAfter.GetValue());
             break;
               default:
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 76589da3bcb2..673b562b4f88 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -889,7 +889,9 @@ namespace sfx2
         DECL_LINK( OnToolboxClicked, ToolBox* );
         DECL_LINK( OnMenuItemSelected, Menu* );
         DECL_LINK( DockingChanged, TitledDockingWindow* );
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< PopupMenu > impl_createPopupMenu() const;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         /// sets the given layout for the panel selector
         void    impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false );
@@ -1015,7 +1017,9 @@ namespace sfx2
         {
             i_pToolBox->EndSelection();
 
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu();
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) );
 
             // pass toolbox button rect so the menu can stay open on button up
@@ -1216,6 +1220,7 @@ namespace sfx2
     }
 
     // ---------------------------------------------------------------------------------------------------------------------
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const
     {
         ::std::auto_ptr<PopupMenu> pMenu( new PopupMenu );
@@ -1261,6 +1266,7 @@ namespace sfx2
 
         return pMenu;
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     //==================================================================================================================
     //= TaskPaneController