just silence the auto_ptr deprecations in isolation

5 files changed, 19 insertions, 2 deletions

diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index d3c9aa3c91e3..c34294cf26ff 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -59,7 +59,9 @@ namespace frm
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >
                                             m_xFirstDispatchInterceptor;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< UrlTransformer >   m_pUrlTransformer;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
     public:
         /** retrieves our URL transformer, so our clients may use it, too
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 6e56e4f54519..040967da027b 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -74,8 +74,10 @@ namespace frm
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                             m_xORB;
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< ControlFeatureInterception >
                             m_pFeatureInterception;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         // all supported features
         FeatureMap          m_aSupportedFeatures;
@@ -190,7 +192,9 @@ namespace frm
     class OFormNavigationMapper
     {
     private:
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< UrlTransformer >   m_pUrlTransformer;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
     public:
         OFormNavigationMapper(
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index ff5b9c79d86b..2f5c307419de 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -831,7 +831,9 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
     // SYNCHRONIZED ----->
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ElementDescription > aAutoDeleteMetaData;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     ElementDescription* pElementMetaData = _pApprovalResult;
     if ( !pElementMetaData )
     {   // not yet approved by the caller -> do ourself
@@ -839,7 +841,9 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
         DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" );
 
         // ensure that the meta data structure will be deleted later on
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         aAutoDeleteMetaData = ::std::auto_ptr< ElementDescription >( pElementMetaData );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         // will throw an exception if necessary
         approveNewElement( _rxElement, pElementMetaData );
@@ -979,7 +983,9 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
     OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" );
 
     // approve the new object
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" );
     {
         Reference< XPropertySet > xElementProps;
@@ -1127,7 +1133,9 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
 {
     Reference< XPropertySet > xElementProps;
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" );
 
     // ensure the correct name of the element
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index c8c76c8d848f..502f0be462b2 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -208,6 +208,7 @@ namespace xforms
     //--------------------------------------------------------------------
     namespace
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern )
         {
             UErrorCode nMatchStatus = U_ZERO_ERROR;
@@ -216,6 +217,7 @@ namespace xforms
             OSL_ENSURE( U_SUCCESS( nMatchStatus ), "lcl_initializePatternMatcher: invalid pattern property!" );
                 // if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity
         }
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText )
         {
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 9ac1f08eb5ff..b3af353d554c 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -116,6 +116,8 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
     }
     return CSubmission::UNKNOWN_ERROR;
 }
+
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< CSerialization > CSubmission::createSerialization(const Reference< XInteractionHandler >& _xHandler,Reference<XCommandEnvironment>& _rOutEnv)
 {
     // PUT always uses application/xml
@@ -139,7 +141,6 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
     _rOutEnv = pHelper;
     return apSerialization;
 }
-
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */