diff options
Diffstat (limited to 'forms/source/inc')
| -rw-r--r-- | forms/source/inc/controlfeatureinterception.hxx | 4 | ||||
| -rw-r--r-- | forms/source/inc/formnavigation.hxx | 8 |
2 files changed, 3 insertions, 9 deletions
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( |