diff options
Diffstat (limited to 'dbaccess/source/ui/uno/copytablewizard.cxx')
-rw-r--r-- | dbaccess/source/ui/uno/copytablewizard.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 1f6f0b8cdb2b..3bdb494924ca 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -236,13 +236,11 @@ namespace dbaui /** extracts the source object (table or query) described by the given descriptor, relative to m_xSourceConnection */ - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ICopyTableSourceObject > + ::std::unique_ptr< ICopyTableSourceObject > impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const; - SAL_WNODEPRECATED_DECLARATIONS_POP /** extracts the result set to copy records from, and the selection-related aspects, if any. @@ -337,10 +335,8 @@ private: // source SharedConnection m_xSourceConnection; sal_Int32 m_nCommandType; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ICopyTableSourceObject > + ::std::unique_ptr< ICopyTableSourceObject > m_pSourceObject; - SAL_WNODEPRECATED_DECLARATIONS_POP Reference< XResultSet > m_xSourceResultSet; Sequence< Any > m_aSourceSelection; bool m_bSourceSelectionBookmarks; @@ -718,8 +714,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const +::std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const { OSL_PRECOND( _rxDescriptor.is() && m_xSourceConnection.is(), "CopyTableWizard::impl_extractSourceObject_throw: illegal arguments!" ); @@ -736,7 +731,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH OSL_VERIFY( _rxDescriptor->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); OSL_VERIFY( _rxDescriptor->getPropertyValue( PROPERTY_COMMAND_TYPE ) >>= _out_rCommandType ); - ::std::auto_ptr< ICopyTableSourceObject > pSourceObject; + ::std::unique_ptr< ICopyTableSourceObject > pSourceObject; Reference< XNameAccess > xContainer; switch ( _out_rCommandType ) { @@ -785,8 +780,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH return pSourceObject; } -SAL_WNODEPRECATED_DECLARATIONS_POP - void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPropertySet >& i_rDescriptor ) { Reference< XPropertySetInfo > xPSI( i_rDescriptor->getPropertySetInfo(), UNO_SET_THROW ); |