diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 23bea866aeea..6781c1492c29 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -88,42 +88,6 @@ include/comphelper/logging.hxx:260 _Bool comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const include/comphelper/logging.hxx:274 _Bool comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:299 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?) const -include/comphelper/logging.hxx:309 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:320 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:332 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:345 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:359 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:384 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?) const -include/comphelper/logging.hxx:394 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:405 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:417 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:430 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:444 - _Bool comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:602 - _Bool comphelper::ResourceBasedEventLogger::logp(const int,const char *,const char *,const int,type-parameter-?-?) const -include/comphelper/logging.hxx:612 - _Bool comphelper::ResourceBasedEventLogger::logp(const int,const char *,const char *,const int,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:623 - _Bool comphelper::ResourceBasedEventLogger::logp(const int,const char *,const char *,const int,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:635 - _Bool comphelper::ResourceBasedEventLogger::logp(const int,const char *,const char *,const int,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:648 - _Bool comphelper::ResourceBasedEventLogger::logp(const int,const char *,const char *,const int,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:662 - _Bool comphelper::ResourceBasedEventLogger::logp(const int,const char *,const char *,const int,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const include/comphelper/lok.hxx:44 _Bool isLocalRendering() include/comphelper/proparrhlp.hxx:87 diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index 326572c5aac3..cd74d24d569a 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -582,86 +582,6 @@ namespace comphelper OptionalString( log::convert::convertLogArgToString( _argument6 ) ) ); return false; } - - - //- XLogger::logp equivalents/wrappers - //- resource IDs - - /** logs a given ASCII message, replacing a placeholder in the message with an argument - */ - template< typename ARGTYPE1 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& rMessage, ARGTYPE1 _argument1 ) const - { - if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, rMessage, - OptionalString( log::convert::convertLogArgToString( _argument1 ) ) ); - return false; - } - - /// logs a given ASCII message, replacing 2 placeholders in the message with respective values - template< typename ARGTYPE1, typename ARGTYPE2 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const - { - if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, rMessage, - OptionalString( log::convert::convertLogArgToString( _argument1 ) ), - OptionalString( log::convert::convertLogArgToString( _argument2 ) ) ); - return false; - } - - /// logs a given ASCII message, replacing 3 placeholders in the message with respective values - template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const - { - if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, rMessage, - OptionalString( log::convert::convertLogArgToString( _argument1 ) ), - OptionalString( log::convert::convertLogArgToString( _argument2 ) ), - OptionalString( log::convert::convertLogArgToString( _argument3 ) ) ); - return false; - } - - /// logs a given ASCII message, replacing 4 placeholders in the message with respective values - template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const - { - if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, rMessage, - OptionalString( log::convert::convertLogArgToString( _argument1 ) ), - OptionalString( log::convert::convertLogArgToString( _argument2 ) ), - OptionalString( log::convert::convertLogArgToString( _argument3 ) ), - OptionalString( log::convert::convertLogArgToString( _argument4 ) ) ); - return false; - } - - /// logs a given ASCII message, replacing 5 placeholders in the message with respective values - template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const - { - if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, rMessage, - OptionalString( log::convert::convertLogArgToString( _argument1 ) ), - OptionalString( log::convert::convertLogArgToString( _argument2 ) ), - OptionalString( log::convert::convertLogArgToString( _argument3 ) ), - OptionalString( log::convert::convertLogArgToString( _argument4 ) ), - OptionalString( log::convert::convertLogArgToString( _argument5 ) ) ); - return false; - } - - /// logs a given ASCII message, replacing 6 placeholders in the message with respective values - template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const - { - if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, rMessage, - OptionalString( log::convert::convertLogArgToString( _argument1 ) ), - OptionalString( log::convert::convertLogArgToString( _argument2 ) ), - OptionalString( log::convert::convertLogArgToString( _argument3 ) ), - OptionalString( log::convert::convertLogArgToString( _argument4 ) ), - OptionalString( log::convert::convertLogArgToString( _argument5 ) ), - OptionalString( log::convert::convertLogArgToString( _argument6 ) ) ); - return false; - } };