summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/container/enumerablemap.cxx15
-rw-r--r--comphelper/source/misc/anycompare.cxx6
-rw-r--r--comphelper/source/property/MasterPropertySet.cxx10
-rw-r--r--comphelper/source/property/opropertybag.hxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx8
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx6
-rw-r--r--include/comphelper/anycompare.hxx2
-rw-r--r--include/comphelper/listenernotification.hxx6
-rw-r--r--include/comphelper/namedvaluecollection.hxx2
-rw-r--r--include/comphelper/officeresourcebundle.hxx2
-rw-r--r--include/comphelper/propertybag.hxx2
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.cxx2
12 files changed, 27 insertions, 36 deletions
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 7dc2df10c93e..763e31f6ff50 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -39,9 +39,10 @@
#include <typelib/typedescription.hxx>
#include <map>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <utility>
+#include <boost/noncopyable.hpp>
namespace comphelper
{
@@ -93,8 +94,8 @@ namespace comphelper
{
Type m_aKeyType;
Type m_aValueType;
- ::std::auto_ptr< KeyedValues > m_pValues;
- ::boost::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
+ ::std::unique_ptr< KeyedValues > m_pValues;
+ ::std::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
bool m_bMutable;
MapListeners m_aModListeners;
@@ -333,7 +334,7 @@ namespace comphelper
private:
// since we share our mutex with the main map, we need to keep it alive as long as we live
Reference< XInterface > m_xKeepMapAlive;
- ::std::auto_ptr< MapData > m_pMapDataCopy;
+ ::std::unique_ptr< MapData > m_pMapDataCopy;
MapEnumerator m_aEnumerator;
};
@@ -388,14 +389,14 @@ namespace comphelper
throw IllegalTypeException("Unsupported value type.", *this );
// create the comparator for the KeyType, and throw if the type is not supported
- ::std::auto_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) );
+ ::std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) );
if ( !pComparator.get() )
throw IllegalTypeException("Unsupported key type.", *this );
// init members
m_aData.m_aKeyType = aKeyType;
m_aData.m_aValueType = aValueType;
- m_aData.m_pKeyCompare = pComparator;
+ m_aData.m_pKeyCompare = std::move(pComparator);
m_aData.m_pValues.reset( new KeyedValues( *m_aData.m_pKeyCompare ) );
m_aData.m_bMutable = bMutable;
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 3d7d3f249eca..e4f038d3f665 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -176,11 +176,9 @@ namespace comphelper
};
- ::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
+ ::std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< IKeyPredicateLess > pComparator;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< IKeyPredicateLess > pComparator;
switch ( i_type.getTypeClass() )
{
case TypeClass_CHAR:
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index a4fa97668c03..6cb5abfe24da 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -45,7 +45,7 @@ AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : mpGuardArray(new bo
AutoOGuardArray::~AutoOGuardArray()
{
- //!! release auto_ptr's and thus the mutexes locks
+ //!! release scoped_ptr's and thus the mutexes locks
delete [] mpGuardArray;
}
@@ -216,9 +216,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >&
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter;
- //!! have an auto_ptr to an array of OGuards in order to have the
+ //!! have a scoped_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
- //!! Since the array itself has auto_ptrs as members we have to use a
+ //!! Since the array itself has scoped_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount );
@@ -281,9 +281,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter;
- //!! have an auto_ptr to an array of OGuards in order to have the
+ //!! have an scoped_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
- //!! Since the array itself has auto_ptrs as members we have to use a
+ //!! Since the array itself has scoped_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount );
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 9cabfa0ac5e1..7211748f7219 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -77,7 +77,7 @@ namespace comphelper
{
private:
/// our IPropertyArrayHelper implementation
- ::std::auto_ptr< ::cppu::OPropertyArrayHelper >
+ ::std::unique_ptr< ::cppu::OPropertyArrayHelper >
m_pArrayHelper;
::comphelper::PropertyBag
m_aDynamicProperties;
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 99a432c11576..5afa1589ad87 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -243,9 +243,7 @@ namespace pcr
{
if ( !_bDoListen )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
while ( pListenerIterator->hasMoreElements() )
{
PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() );
@@ -279,9 +277,7 @@ namespace pcr
}
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
while ( pListenerIterator->hasMoreElements() )
{
Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY );
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 862ab4b84a57..6ac121a9259d 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -78,10 +78,8 @@ namespace pcr
return;
// remove all old property change listeners
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
+ ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
while ( removeListener->hasMoreElements() )
removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) );
OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" );
diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index 263531ba249e..9216b4854771 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -204,7 +204,7 @@ namespace comphelper
a default implementation of IKeyPredicateLess, which is able to compare values of the given type. If no
such default implementation is known for the given type, then <NULL/> is returned.
*/
- ::std::auto_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC
+ ::std::unique_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC
getStandardLessPredicate(
::com::sun::star::uno::Type const & i_type,
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 38409eaa54f2..a2b6d35a7e86 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -84,13 +84,11 @@ namespace comphelper
/** creates an iterator for looping through all registered listeners
*/
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
+ ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
{
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) );
+ ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) );
return pIterator;
}
- SAL_WNODEPRECATED_DECLARATIONS_POP
protected:
OListenerContainer( ::osl::Mutex& _rMutex );
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index bcd7ab7c31a2..0889654bb350 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -45,7 +45,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC NamedValueCollection
{
private:
- ::std::auto_ptr< NamedValueCollection_Impl > m_pImpl;
+ ::std::unique_ptr< NamedValueCollection_Impl > m_pImpl;
public:
NamedValueCollection();
diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx
index f893fbb84d72..1a40551f505a 100644
--- a/include/comphelper/officeresourcebundle.hxx
+++ b/include/comphelper/officeresourcebundle.hxx
@@ -41,7 +41,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC OfficeResourceBundle
{
private:
- ::std::auto_ptr< ResourceBundle_Impl > m_pImpl;
+ ::std::unique_ptr< ResourceBundle_Impl > m_pImpl;
public:
/** constructs a resource bundle with the resource bundle given as 8-bit ASCII name
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 573f0efd2ecc..484246a11d17 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -42,7 +42,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC PropertyBag : protected OPropertyContainerHelper
{
private:
- ::std::auto_ptr< PropertyBag_Impl > m_pImpl;
+ ::std::unique_ptr< PropertyBag_Impl > m_pImpl;
public:
PropertyBag();
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 30b28c58d8f4..1aab3bc91931 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -559,7 +559,7 @@ private:
}
// get predicate object
- ::std::auto_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) );
+ ::std::unique_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) );
ENSURE_OR_RETURN_FALSE( pPredicate.get(), "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!" );
// then sort
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 16:49:06 +0000