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 /svx | |
| parent | c91dec0dad6b0da5bfe15d0597bfc069df26f343 (diff) | |
connectivity: std::auto_ptr -> std::unique_ptr
Change-Id: I796dc05d1846f140a56b5a6f14a69a239324ae5b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/dbtoolsclient.cxx | 6 | ||||
| -rw-r--r-- | svx/source/inc/gridcell.hxx | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 9feb232991e4..fd140a8c28e9 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1793,9 +1793,7 @@ OUString DbPatternField::impl_formatText( const OUString& _rText ) OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { bool bIsForPaint = _rxField != m_rColumn.GetField(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::dbtools::FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; if ( !rpFormatter.get() ) { diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index c5b6d052c408..766877ad6491 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -317,16 +317,14 @@ namespace svxform } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( + ::std::unique_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue( const Reference<XComponentContext>& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn ) { - ::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue; + ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue; if ( ensureLoaded() ) pValue = getFactory()->createFormattedColumnValue( _rContext, _rxRowSet, _rxColumn ); return pValue; } - SAL_WNODEPRECATED_DECLARATIONS_POP } // namespace svxform diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 2746fa602858..2051498f5854 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -544,10 +544,8 @@ private: OUString impl_formatText(const OUString& _rText); private: - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; - ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pPaintFormatter; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; + ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pPaintFormatter; css::uno::Reference<css::uno::XComponentContext> m_xContext; }; |