forms: std::auto_ptr -> std::unique_ptr

Change-Id: Ia8f045715a508de77c8ce86cf224a3038162faac

15 files changed, 16 insertions, 27 deletions

diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 3229f07d7b37..ad3ed573e5cb 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -60,7 +60,7 @@ class OComboBoxModel
     ::com::sun::star::form::ListSourceType  m_eListSourceType;      // ListSource's type
     bool                                    m_bEmptyIsNull;         // Empty string is interpreted as NULL
 
-    ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter;
+    ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter;
 
 
 
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index d8eda8b6b19e..fb34214e6f6d 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -34,7 +34,7 @@ namespace frm
 class OEditModel
                 :public OEditBaseModel
 {
-    ::std::auto_ptr< ::dbtools::FormattedColumnValue >
+    ::std::unique_ptr< ::dbtools::FormattedColumnValue >
                                 m_pValueFormatter;
     bool                    m_bMaxTextLenModified : 1;  // set to <TRUE/> when we change the MaxTextLen of the aggregate
 
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index 8b2504dd1e42..dfcdde01dd43 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -35,7 +35,7 @@ class OPatternModel
 {
 private:
     ::com::sun::star::uno::Any  m_aLastKnownValue;
-    ::std::auto_ptr< ::dbtools::FormattedColumnValue >
+    ::std::unique_ptr< ::dbtools::FormattedColumnValue >
                                 m_pFormattedValue;
 
 protected:
diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx
index b7a7aff67ffc..ebbe73a48da1 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -72,7 +72,7 @@ namespace frm
         void    setConnection       ( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection );
 
     private:
-        ::std::auto_ptr< CachedRowSet_Data >    m_pData;
+        ::std::unique_ptr< CachedRowSet_Data >    m_pData;
     };
 
 
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 8fb17f5fa598..60f03b89b920 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -178,7 +178,7 @@ namespace frm
     private:
         OImageProducerThread_Impl*          m_pThread;
         ::cppu::OInterfaceContainerHelper   m_aSubmissionVetoListeners;
-        ::std::auto_ptr< ControlFeatureInterception >
+        ::std::unique_ptr< ControlFeatureInterception >
                                             m_pFeatureInterception;
 
     protected:
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index 381eb32f0341..54c0a2c46298 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -49,9 +49,7 @@ 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
+        ::std::unique_ptr< UrlTransformer >   m_pUrlTransformer;
 
     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 c323c2b4b2be..6bd725fc2dbb 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -66,10 +66,8 @@ namespace frm
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
                             m_xORB;
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< ControlFeatureInterception >
+        ::std::unique_ptr< ControlFeatureInterception >
                             m_pFeatureInterception;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         // all supported features
         FeatureMap          m_aSupportedFeatures;
@@ -181,9 +179,7 @@ namespace frm
     class OFormNavigationMapper
     {
     private:
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< UrlTransformer >   m_pUrlTransformer;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr< UrlTransformer >   m_pUrlTransformer;
 
     public:
         OFormNavigationMapper(
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 3e3f149bf1d2..af5ec75c98aa 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -90,7 +90,6 @@ namespace frm
     ORichTextModel::ORichTextModel( const ORichTextModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
         :OControlModel       ( _pOriginal, _rxFactory, false )
         ,FontControlModel    ( _pOriginal                        )
-        ,m_pEngine           ( NULL                              )
         ,m_bSettingEngineText( false                             )
         ,m_aModifyListeners  ( m_aMutex                          )
     {
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 1df1bc43073d..f64d22b34332 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -89,7 +89,7 @@ namespace frm
         bool                    m_bMultiLine;
         // </properties_for_awt_edit_compatibility>
 
-        ::std::auto_ptr<RichTextEngine>
+        ::std::unique_ptr<RichTextEngine>
                                     m_pEngine;
         bool                        m_bSettingEngineText;
 
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 4cc14ba72b9f..6c8d643ecd13 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -192,8 +192,7 @@ namespace xforms
 
     namespace
     {
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern )
+        static void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern )
         {
             UErrorCode nMatchStatus = U_ZERO_ERROR;
             UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() );    // UChar != sal_Unicode in MinGW
@@ -201,7 +200,6 @@ 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 OUString& _rText )
         {
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 4aa9f50c983b..d881300c4954 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -62,7 +62,7 @@ namespace xforms
         sal_uInt16      m_nWST;
         // </properties>
 
-        ::std::auto_ptr< U_NAMESPACE_QUALIFIER RegexMatcher >
+        ::std::unique_ptr< U_NAMESPACE_QUALIFIER RegexMatcher >
                         m_pPatternMatcher;
         bool            m_bPatternMatcherDirty;
 
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 88a7238998e5..2c2f670cdbce 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -107,11 +107,10 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con
     return CSubmission::UNKNOWN_ERROR;
 }
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< CSerialization > CSubmission::createSerialization(const Reference< XInteractionHandler >& _xHandler,Reference<XCommandEnvironment>& _rOutEnv)
+::std::unique_ptr< CSerialization > CSubmission::createSerialization(const Reference< XInteractionHandler >& _xHandler,Reference<XCommandEnvironment>& _rOutEnv)
 {
     // PUT always uses application/xml
-    ::std::auto_ptr< CSerialization > apSerialization(new CSerializationAppXML());
+    ::std::unique_ptr< CSerialization > apSerialization(new CSerializationAppXML());
     apSerialization->setSource(m_aFragment);
     apSerialization->serialize();
 
@@ -130,6 +129,5 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
     _rOutEnv = pHelper;
     return apSerialization;
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 7ac4eefd696b..0cca95090eb7 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -117,7 +117,7 @@ protected:
     css::uno::Reference< css::uno::XComponentContext >      m_xContext;
     OUString m_aEncoding;
 
-    ::std::auto_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler
+    ::std::unique_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler
                                                   ,com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment>& _rOutEnv);
 
 public:
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index 0aecefc98493..cd1cba2fa15e 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -48,7 +48,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const css::uno::Reference<
 {
     // PUT always uses application/xml
     css::uno::Reference< XCommandEnvironment > aEnvironment;
-    auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
+    unique_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
 
     try {
         ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext());
diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx
index aedbd8c2910e..3d7284cf69cf 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -45,7 +45,7 @@ CSubmissionPut::CSubmissionPut(const OUString& aURL, const css::uno::Reference<
 CSubmission::SubmissionResult CSubmissionPut::submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
 {
     css::uno::Reference< XCommandEnvironment > aEnvironment;
-    auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
+    unique_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
 
     try {
         ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext());