summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx1
-rw-r--r--include/comphelper/SelectionMultiplex.hxx4
-rw-r--r--include/comphelper/accessibleeventnotifier.hxx4
-rw-r--r--include/comphelper/accessiblewrapper.hxx15
-rw-r--r--include/comphelper/asyncnotification.hxx4
-rw-r--r--include/comphelper/componentmodule.hxx4
-rw-r--r--include/comphelper/configuration.hxx24
-rw-r--r--include/comphelper/documentinfo.hxx10
-rw-r--r--include/comphelper/propertycontainerhelper.hxx6
-rw-r--r--include/comphelper/proxyaggregation.hxx15
10 files changed, 37 insertions, 50 deletions
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 6269be8c0605..6e10abb7e827 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -66,7 +66,6 @@ namespace
OPropertyContainerHelper::OPropertyContainerHelper()
- :m_bUnused(false)
{
}
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 67c71324731c..c645ec88f98b 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -74,8 +74,8 @@ namespace comphelper
bool m_bListening : 1;
bool m_bAutoSetRelease : 1;
- OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&);
- OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&);
+ OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) SAL_DELETED_FUNCTION;
+ OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) SAL_DELETED_FUNCTION;
protected:
virtual ~OSelectionChangeMultiplexer();
public:
diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index b88bae441455..c401503dba69 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
@@ -44,8 +44,8 @@ namespace comphelper
~AccessibleEventNotifier( ); // never implemented
private:
- COMPHELPER_DLLPRIVATE AccessibleEventNotifier( const AccessibleEventNotifier& ); // never implemented!
- COMPHELPER_DLLPRIVATE AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ); // never implemented!
+ AccessibleEventNotifier( const AccessibleEventNotifier& ) SAL_DELETED_FUNCTION;
+ AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ) SAL_DELETED_FUNCTION;
public:
/** registers a client of this class, means a broadcaster of AccessibleEvents
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index ab2c5c83dcc1..072110465f7a 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -117,9 +117,8 @@ namespace comphelper
virtual ~OAccessibleWrapper( );
private:
- COMPHELPER_DLLPRIVATE OAccessibleWrapper( ); // never implemented
- COMPHELPER_DLLPRIVATE OAccessibleWrapper( const OAccessibleWrapper& ); // never implemented
- COMPHELPER_DLLPRIVATE OAccessibleWrapper& operator=( const OAccessibleWrapper& ); // never implemented
+ OAccessibleWrapper( const OAccessibleWrapper& ) SAL_DELETED_FUNCTION;
+ OAccessibleWrapper& operator=( const OAccessibleWrapper& ) SAL_DELETED_FUNCTION;
};
@@ -312,9 +311,8 @@ namespace comphelper
virtual ~OAccessibleContextWrapper();
private:
- COMPHELPER_DLLPRIVATE OAccessibleContextWrapper(); // never implemented
- COMPHELPER_DLLPRIVATE OAccessibleContextWrapper( const OAccessibleContextWrapper& ); // never implemented
- COMPHELPER_DLLPRIVATE OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ); // never implemented
+ OAccessibleContextWrapper( const OAccessibleContextWrapper& ) SAL_DELETED_FUNCTION;
+ OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ) SAL_DELETED_FUNCTION;
};
@@ -400,9 +398,8 @@ namespace comphelper
virtual ~OWrappedAccessibleChildrenManager( );
private:
- COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( ); // never implemented
- COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ); // never implemented
- COMPHELPER_DLLPRIVATE OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ); // never implemented
+ OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ) SAL_DELETED_FUNCTION;
+ OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 93209768e778..58cb17df6a44 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -48,8 +48,8 @@ namespace comphelper
virtual ~AnyEvent();
private:
- AnyEvent( AnyEvent& ); // not defined
- void operator=( AnyEvent& ); // not defined
+ AnyEvent( AnyEvent& ) SAL_DELETED_FUNCTION;
+ void operator=( AnyEvent& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 9f23a1769b94..024d9b63f551 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -162,8 +162,8 @@ namespace comphelper
virtual void onLastClient();
private:
- OModule( const OModule& ); // never implemented
- OModule& operator=( const OModule& ); // never implemented
+ OModule( const OModule& ) SAL_DELETED_FUNCTION;
+ OModule& operator=( const OModule& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index 74ed03226722..31146f8ac726 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -143,8 +143,8 @@ template< typename T > struct Convert: private boost::noncopyable {
{ return value.get< T >(); }
private:
- Convert(); // not defined
- ~Convert(); // not defined
+ Convert() SAL_DELETED_FUNCTION;
+ ~Convert() SAL_DELETED_FUNCTION;
};
/// @internal
@@ -164,8 +164,8 @@ template< typename T > struct Convert< boost::optional< T > >:
}
private:
- Convert(); // not defined
- ~Convert(); // not defined
+ Convert() SAL_DELETED_FUNCTION;
+ ~Convert() SAL_DELETED_FUNCTION;
};
}
@@ -208,8 +208,8 @@ template< typename T, typename U > struct ConfigurationProperty:
}
private:
- ConfigurationProperty(); // not defined
- ~ConfigurationProperty(); // not defined
+ ConfigurationProperty() SAL_DELETED_FUNCTION;
+ ~ConfigurationProperty() SAL_DELETED_FUNCTION;
};
/// A type-safe wrapper around a localized configuration property.
@@ -254,8 +254,8 @@ template< typename T, typename U > struct ConfigurationLocalizedProperty:
}
private:
- ConfigurationLocalizedProperty(); // not defined
- ~ConfigurationLocalizedProperty(); // not defined
+ ConfigurationLocalizedProperty() SAL_DELETED_FUNCTION;
+ ~ConfigurationLocalizedProperty() SAL_DELETED_FUNCTION;
};
/// A type-safe wrapper around a configuration group.
@@ -287,8 +287,8 @@ template< typename T > struct ConfigurationGroup: private boost::noncopyable {
}
private:
- ConfigurationGroup(); // not defined
- ~ConfigurationGroup(); // not defined
+ ConfigurationGroup() SAL_DELETED_FUNCTION;
+ ~ConfigurationGroup() SAL_DELETED_FUNCTION;
};
/// A type-safe wrapper around a configuration set.
@@ -320,8 +320,8 @@ template< typename T > struct ConfigurationSet: private boost::noncopyable {
}
private:
- ConfigurationSet(); // not defined
- ~ConfigurationSet(); // not defined
+ ConfigurationSet() SAL_DELETED_FUNCTION;
+ ~ConfigurationSet() SAL_DELETED_FUNCTION;
};
}
diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index 61cd9fc8ffe5..59f4d45a06b6 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
@@ -31,16 +31,12 @@ namespace comphelper {
//= DocumentInfo
- class COMPHELPER_DLLPUBLIC DocumentInfo
+ namespace DocumentInfo
{
- public:
/** retrieves the UI title of the given document
*/
- static OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument );
-
- private:
- DocumentInfo(); // never implemented
- };
+ COMPHELPER_DLLPUBLIC OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument );
+ }
} // namespace comphelper
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index 1809b19a278c..430c86ff76f4 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -85,8 +85,6 @@ private:
typedef Properties::const_iterator ConstPropertiesIterator;
Properties m_aProperties;
- bool m_bUnused;
-
protected:
OPropertyContainerHelper();
~OPropertyContainerHelper();
@@ -188,8 +186,8 @@ private:
COMPHELPER_DLLPRIVATE PropertiesIterator searchHandle(sal_Int32 _nHandle);
private:
- COMPHELPER_DLLPRIVATE OPropertyContainerHelper( const OPropertyContainerHelper& ); // never implemented
- COMPHELPER_DLLPRIVATE OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ); // never implemented
+ OPropertyContainerHelper( const OPropertyContainerHelper& ) SAL_DELETED_FUNCTION;
+ OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 725294b1ca75..426ce3efcc8b 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -110,9 +110,8 @@ namespace comphelper
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
private:
- OProxyAggregation( ); // never implemented
- OProxyAggregation( const OProxyAggregation& ); // never implemented
- OProxyAggregation& operator=( const OProxyAggregation& ); // never implemented
+ OProxyAggregation( const OProxyAggregation& ) SAL_DELETED_FUNCTION;
+ OProxyAggregation& operator=( const OProxyAggregation& ) SAL_DELETED_FUNCTION;
};
@@ -171,9 +170,8 @@ namespace comphelper
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
private:
- COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( ); // never implemented
- COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ); // never implemented
- COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ); // never implemented
+ OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) SAL_DELETED_FUNCTION;
+ OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ) SAL_DELETED_FUNCTION;
};
@@ -210,9 +208,8 @@ namespace comphelper
void implEnsureDisposeInDtor( );
private:
- COMPHELPER_DLLPRIVATE OComponentProxyAggregation( ); // never implemented
- COMPHELPER_DLLPRIVATE OComponentProxyAggregation( const OComponentProxyAggregation& ); // never implemented
- COMPHELPER_DLLPRIVATE OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ); // never implemented
+ OComponentProxyAggregation( const OComponentProxyAggregation& ) SAL_DELETED_FUNCTION;
+ OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) SAL_DELETED_FUNCTION;
};
generated by cgit (git 2.34.1) at 2024-08-03 12:02:08 +0000