diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 18:15:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-25 08:40:12 +0200 |
| commit | 43c47c610556b0bbd4f22c317d6e58c543109c12 (patch) | |
| tree | 092acbcbc99b29b02591022a0e11a01f2b309e93 /connectivity/source/simpledbt | |
| parent | c91dec0dad6b0da5bfe15d0597bfc069df26f343 (diff) | |
connectivity: std::auto_ptr -> std::unique_ptr
Change-Id: I796dc05d1846f140a56b5a6f14a69a239324ae5b
Diffstat (limited to 'connectivity/source/simpledbt')
| -rw-r--r-- | connectivity/source/simpledbt/dbtfactory.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/simpledbt/dbtfactory.hxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx index dfd553574b4e..cead9fab7fe8 100644 --- a/connectivity/source/simpledbt/dbtfactory.cxx +++ b/connectivity/source/simpledbt/dbtfactory.cxx @@ -73,15 +73,13 @@ namespace connectivity } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( + ::std::unique_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { - ::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) ); + ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) ); return pValue; } - SAL_WNODEPRECATED_DECLARATIONS_POP ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext) const diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx index 4ba0fe5fc4ee..7631606a4892 100644 --- a/connectivity/source/simpledbt/dbtfactory.hxx +++ b/connectivity/source/simpledbt/dbtfactory.hxx @@ -52,7 +52,7 @@ namespace connectivity virtual ::rtl::Reference< simple::IDataAccessTools > getDataAccessTools() SAL_OVERRIDE; - virtual ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( + virtual ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn |