summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/comphelper/componentbase.hxx4
-rw-r--r--include/comphelper/containermultiplexer.hxx2
-rw-r--r--include/comphelper/interaction.hxx3
-rw-r--r--include/comphelper/listenernotification.hxx11
-rw-r--r--include/comphelper/logging.hxx40
-rw-r--r--include/comphelper/namedvaluecollection.hxx15
-rw-r--r--include/comphelper/sharedmutex.hxx1
-rw-r--r--include/comphelper/threadpool.hxx1
8 files changed, 0 insertions, 77 deletions
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index 349e6c648641..94182497e88b 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -136,10 +136,6 @@ namespace comphelper
{
m_aMutexGuard.clear();
}
- inline void reset()
- {
- m_aMutexGuard.reset();
- }
private:
::osl::ResettableMutexGuard m_aMutexGuard;
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 97fff52d653f..6b2525ad4fce 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -101,8 +101,6 @@ namespace comphelper
/// dispose the object. No multiplexing anymore
void dispose();
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >&
- getContainer() const { return m_xContainer; }
};
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 8e49d727c210..6520b484d06a 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -51,9 +51,6 @@ namespace comphelper
public:
/// determines whether or not this handler was selected
bool wasSelected() const { return m_bSelected; }
- /// resets the state to "not selected", so you may reuse the handler
- void reset() { m_bSelected = false; }
-
protected:
void implSelected() { m_bSelected = true; }
};
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index a2b6d35a7e86..f0ff806463aa 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -77,11 +77,6 @@ namespace comphelper
inline bool
empty() const;
- /** determines the number of elements in the container
- */
- inline size_t
- size() const;
-
/** creates an iterator for looping through all registered listeners
*/
::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
@@ -145,11 +140,6 @@ namespace comphelper
return ( m_aListeners.getLength() == 0 );
}
- inline size_t OListenerContainer::size() const
- {
- return m_aListeners.getLength();
- }
-
//= OSimpleListenerContainer
@@ -194,7 +184,6 @@ namespace comphelper
using OListenerContainer::disposing;
using OListenerContainer::clear;
using OListenerContainer::empty;
- using OListenerContainer::size;
using OListenerContainer::createIterator;
/// typed notification
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 0a5e8077fc0d..dcfe7b37e142 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -119,14 +119,6 @@ namespace comphelper
//- XLogger::log equivalents/wrappers
//- string messages
- /// logs a given message, without any arguments, or source class/method names
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage ) const
- {
- if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, _rMessage );
- return false;
- }
-
/** logs a given message, replacing a placeholder in the message with an argument
The function takes, additionally to the log level and the message, an arbitrary
@@ -212,14 +204,6 @@ namespace comphelper
//- XLogger::log equivalents/wrappers
//- ASCII messages
- /// logs a given message, without any arguments, or source class/method names
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage ) const
- {
- if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ) );
- return false;
- }
-
/** logs a given message, replacing a placeholder in the message with an argument
The function takes, additionally to the log level and the message, an arbitrary
@@ -305,14 +289,6 @@ namespace comphelper
//- XLogger::logp equivalents/wrappers
//- string messages
- /// logs a given message, without any arguments, or source class/method names
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage ) const
- {
- if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage );
- return false;
- }
-
/** logs a given message, replacing a placeholder in the message with an argument
The function takes, additionally to the logp level and the message, an arbitrary
@@ -398,14 +374,6 @@ namespace comphelper
//- XLogger::logp equivalents/wrappers
//- ASCII messages
- /// logs a given ASCII message, without any arguments, or source class/method names
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage ) const
- {
- if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ) );
- return false;
- }
-
/** logs a given ASCII message, replacing a placeholder in the message with an argument
The function takes, additionally to the logp level and the message, an arbitrary
@@ -629,14 +597,6 @@ namespace comphelper
//- XLogger::logp equivalents/wrappers
//- resource IDs
- /// logs a given ASCII message, without any arguments, or source class/method names
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Int32 _nMessageResID ) const
- {
- if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, impl_loadStringMessage_nothrow( _nMessageResID ) );
- return false;
- }
-
/** logs a given ASCII message, replacing a placeholder in the message with an argument
*/
template< typename ARGTYPE1 >
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index 0889654bb350..286084a16378 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -82,26 +82,11 @@ namespace comphelper
~NamedValueCollection();
- inline void assign( const ::com::sun::star::uno::Any& i_rWrappedElements )
- {
- impl_assign( i_rWrappedElements );
- }
-
inline void assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments )
{
impl_assign( _rArguments );
}
- inline void assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments )
- {
- impl_assign( _rArguments );
- }
-
- inline void assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments )
- {
- impl_assign( _rArguments );
- }
-
inline void clear()
{
impl_assign( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() );
diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index cca7239259b6..13e48a67d089 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -41,7 +41,6 @@ namespace comphelper
{
}
- inline ::osl::Mutex& getMutex() { return *m_pMutexImpl; }
inline operator ::osl::Mutex& () { return *m_pMutexImpl; }
private:
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx
index 88375ab58c9d..4a149a89e4be 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -58,7 +58,6 @@ private:
/// wait until all work is completed, then join all threads
void waitAndCleanupWorkers();
- ThreadTask *waitForWork( osl::Condition &rNewWork );
ThreadTask *popWork();
void startWork();
void stopWork();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 04:06:40 +0000