just silence the auto_ptr deprecations in isolation

6 files changed, 26 insertions, 0 deletions

diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
index ec93d5dd60bc..c9faeff8cd22 100644
--- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx
+++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
@@ -110,7 +110,9 @@ namespace accessibility
             model) contained in the given SvxEditSource.
 
         */
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         virtual ~AccessibleStaticTextBase();
 
     private:
@@ -158,7 +160,9 @@ namespace accessibility
             The new edit source to set. Object ownership is transferred
             from the caller to the callee.
         */
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         /** Set the event source
 
@@ -269,7 +273,9 @@ namespace accessibility
     private:
 
         /// @dyn
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
     };
 
diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index 69c3ae8c6496..25f91bc42ee1 100644
--- a/editeng/inc/editeng/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@@ -102,7 +102,9 @@ namespace editeng
         };
 
     private:
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< HangulHanjaConversion_Impl >   m_pImpl;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         // used to set initial values of m_pImpl object from saved ones
         static sal_Bool             m_bUseSavedValues;  // defines if the followng two values should be used for initialization
diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index 681043f48a86..5d8caa616aef 100644
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -79,7 +79,9 @@ public:
 
         @return the translated hint
      */
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     static ::std::auto_ptr<SfxHint> EENotification2Hint( EENotify* aNotify );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     /** Calculate attribute run for EditEngines
 
diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 573b23c35035..7fa85deddbab 100644
--- a/editeng/inc/editeng/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -159,7 +159,9 @@ public:
     virtual void                                UpdateData();
     virtual SfxBroadcaster&                     GetBroadcaster() const;
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void        SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     sal_Bool    IsValid() const;
 
 private:
@@ -167,7 +169,9 @@ private:
     SvxEditSourceAdapter( const SvxEditSourceAdapter& );
     SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& );
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< SvxEditSource >    mpAdaptee;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     SvxAccessibleTextAdapter            maTextAdapter;
     SvxAccessibleTextEditViewAdapter    maEditViewAdapter;
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 0af51fcef399..d909892756f8 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -138,7 +138,9 @@ namespace accessibility
 
             return maEditSource;
         }
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         void SetEventSource( const uno::Reference< XAccessible >& rInterface )
         {
@@ -248,6 +250,7 @@ namespace accessibility
         DBG_DTOR( AccessibleStaticTextBase_Impl, NULL );
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
     {
         DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
@@ -256,6 +259,7 @@ namespace accessibility
         if( mpTextParagraph )
             mpTextParagraph->SetEditSource( &maEditSource );
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
     {
@@ -467,6 +471,7 @@ namespace accessibility
     //
     //------------------------------------------------------------------------
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource >        pEditSource ) :
         mpImpl( new AccessibleStaticTextBase_Impl() )
     {
@@ -474,6 +479,7 @@ namespace accessibility
 
         SetEditSource( pEditSource );
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     AccessibleStaticTextBase::~AccessibleStaticTextBase()
     {
@@ -494,6 +500,7 @@ namespace accessibility
 #endif
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     void AccessibleStaticTextBase::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException))
     {
 #ifdef DBG_UTIL
@@ -509,6 +516,7 @@ namespace accessibility
         mpImpl->SetEditSource( pEditSource );
 #endif
     }
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     void AccessibleStaticTextBase::SetEventSource( const uno::Reference< XAccessible >& rInterface )
     {
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 245241595af1..73220b8fbac0 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -336,7 +336,9 @@ SvxEditSource* SvxEditSourceAdapter::Clone() const
 {
     if( mbEditSourceValid && mpAdaptee.get() )
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         if( pClonedAdaptee.get() )
         {
@@ -424,6 +426,7 @@ SfxBroadcaster& SvxEditSourceAdapter::GetBroadcaster() const
     return maDummyBroadcaster;
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee )
 {
     if( pAdaptee.get() )
@@ -439,6 +442,7 @@ void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdap
         mbEditSourceValid = sal_False;
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 sal_Bool SvxEditSourceAdapter::IsValid() const
 {