summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--connectivity/source/commontools/sqlerror.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MConnection.hxx2
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx2
-rw-r--r--connectivity/source/resource/sharedresources.cxx2
-rw-r--r--connectivity/source/simpledbt/dbtfactory.cxx6
-rw-r--r--connectivity/source/simpledbt/dbtfactory.hxx2
-rw-r--r--include/connectivity/TTableHelper.hxx2
-rw-r--r--include/connectivity/dbmetadata.hxx2
-rw-r--r--include/connectivity/formattedcolumnvalue.hxx2
-rw-r--r--include/connectivity/paramwrapper.hxx2
-rw-r--r--include/connectivity/sdbcx/VCollection.hxx2
-rw-r--r--include/connectivity/sqliterator.hxx2
-rw-r--r--include/connectivity/sqlparse.hxx2
-rw-r--r--include/connectivity/statementcomposer.hxx2
-rw-r--r--include/connectivity/virtualdbtools.hxx2
-rw-r--r--include/svx/dbtoolsclient.hxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
-rw-r--r--svx/source/form/dbtoolsclient.cxx6
-rw-r--r--svx/source/inc/gridcell.hxx6
19 files changed, 22 insertions, 30 deletions
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 1894f354f3e3..39e46dbb02c2 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -90,7 +90,7 @@ namespace connectivity
private:
::osl::Mutex m_aMutex;
Reference<XComponentContext> m_aContext;
- ::std::auto_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
+ ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
bool m_bAttemptedInit;
};
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 7501e978aa18..6241318578ff 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -103,7 +103,7 @@ namespace connectivity
// an operation
MozabDriver* m_pDriver; // Pointer to the owning
// driver object
- ::std::auto_ptr< ConnectionImplData > m_pImplData;
+ ::std::unique_ptr< ConnectionImplData > m_pImplData;
// This is to be able to hold a boost::shared_ptr. If we would hold it as member, it would
// not compile the mozillasrc directory, since this directory is compiled without RTTI support
// and boost seems to require RTTI on some platforms.
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index 7e66763b2a38..ab020ed9f40f 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
@@ -58,7 +58,7 @@ namespace connectivity { namespace mozab {
virtual ~MLdapAttributeMap();
private:
- ::std::auto_ptr< AttributeMap_Data > m_pData;
+ ::std::unique_ptr< AttributeMap_Data > m_pData;
};
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index ea28d4801668..c3c0896a1f89 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -46,7 +46,7 @@ namespace connectivity
static oslInterlockedCount s_nClients;
private:
- ::std::auto_ptr< ::comphelper::OfficeResourceBundle >
+ ::std::unique_ptr< ::comphelper::OfficeResourceBundle >
m_pResourceBundle;
public:
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
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index a125222a0cf2..43d5fd7695d1 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -81,7 +81,7 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OTableHelper : public OTable_TYPEDEF
{
- ::std::auto_ptr<OTableHelperImpl> m_pImpl;
+ ::std::unique_ptr<OTableHelperImpl> m_pImpl;
void refreshPrimaryKeys(TStringVector& _rKeys);
void refreshForeignKeys(TStringVector& _rKeys);
diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index 7d7e3bf6da7b..148763d9dfe5 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -49,7 +49,7 @@ namespace dbtools
class OOO_DLLPUBLIC_DBTOOLS DatabaseMetaData
{
private:
- ::std::auto_ptr< DatabaseMetaData_Impl > m_pImpl;
+ ::std::unique_ptr< DatabaseMetaData_Impl > m_pImpl;
public:
DatabaseMetaData();
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index 85f7ec5f0d83..085233df21a4 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -97,7 +97,7 @@ namespace dbtools
virtual OUString getFormattedValue() const;
private:
- ::std::auto_ptr< FormattedColumnValue_Data > m_pData;
+ ::std::unique_ptr< FormattedColumnValue_Data > m_pData;
};
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 60ff2cc72f95..c38f5a615797 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -72,7 +72,7 @@ namespace param
/// the component taking the value
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xValueDestination;
/// helper for implementing XPropertySetInfo
- ::std::auto_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper;
+ ::std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper;
public:
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 95ef85e2ecae..7573b5a462d5 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -92,7 +92,7 @@ namespace connectivity
public OCollectionBase
{
protected:
- ::std::auto_ptr<IObjectCollection> m_pElements;
+ ::std::unique_ptr<IObjectCollection> m_pElements;
::cppu::OInterfaceContainerHelper m_aContainerListeners;
::cppu::OInterfaceContainerHelper m_aRefreshListeners;
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index ef792db83017..785c821337fc 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -67,7 +67,7 @@ namespace connectivity
::rtl::Reference<OSQLColumns> m_aOrderColumns; // the order by columns
::rtl::Reference<OSQLColumns> m_aCreateColumns; // the columns for Create table clause
- ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl;
+ ::std::unique_ptr< OSQLParseTreeIteratorImpl > m_pImpl;
void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias);
// inserts a table into the map
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 5afe259a5658..8240be502c38 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -151,7 +151,7 @@ namespace connectivity
// information on the current parse action
const IParseContext* m_pContext;
OSQLParseNode* m_pParseTree; // result from parsing
- ::std::auto_ptr< OSQLParser_Data >
+ ::std::unique_ptr< OSQLParser_Data >
m_pData;
OUString m_sFieldName; // current field name for a predicate
OUString m_sErrorMessage;// current error msg
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index 39ead8407760..d53f3903b94d 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -41,7 +41,7 @@ namespace dbtools
*/
class OOO_DLLPUBLIC_DBTOOLS StatementComposer : public ::boost::noncopyable
{
- ::std::auto_ptr< StatementComposer_Data > m_pData;
+ ::std::unique_ptr< StatementComposer_Data > m_pData;
public:
/** constructs an instance
diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx
index 26dc62e8de31..7735f519a9b2 100644
--- a/include/connectivity/virtualdbtools.hxx
+++ b/include/connectivity/virtualdbtools.hxx
@@ -347,7 +347,7 @@ namespace connectivity
/// creates a helper which can be used to access the static methods in dbtools.hxx
virtual ::rtl::Reference< IDataAccessTools > getDataAccessTools() = 0;
- 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
diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx
index 6064e35ffb20..7888b0ac876b 100644
--- a/include/svx/dbtoolsclient.hxx
+++ b/include/svx/dbtoolsclient.hxx
@@ -158,7 +158,7 @@ namespace svxform
DBToolsObjectFactory();
virtual ~DBToolsObjectFactory();
- ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue(
+ ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue(
const css::uno::Reference<css::uno::XComponentContext>& _rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
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;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 10:34:39 +0000