summaryrefslogtreecommitdiff
path: root/extensions/source/logging
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /extensions/source/logging
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source/logging')
-rw-r--r--extensions/source/logging/consolehandler.cxx52
-rw-r--r--extensions/source/logging/csvformatter.cxx70
-rw-r--r--extensions/source/logging/filehandler.cxx44
-rw-r--r--extensions/source/logging/logger.cxx52
-rw-r--r--extensions/source/logging/plaintextformatter.cxx24
5 files changed, 121 insertions, 121 deletions
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index ea6af6884ddd..8db97dd1b350 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -65,23 +65,23 @@ namespace logging
private:
// XConsoleHandler
- virtual ::sal_Int32 SAL_CALL getThreshold() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getThreshold() override;
+ virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) override;
// XLogHandler
- virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception) override;
- virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL flush( ) throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getEncoding() override;
+ virtual void SAL_CALL setEncoding( const OUString& _encoding ) override;
+ virtual Reference< XLogFormatter > SAL_CALL getFormatter() override;
+ virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) override;
+ virtual ::sal_Int32 SAL_CALL getLevel() override;
+ virtual void SAL_CALL setLevel( ::sal_Int32 _level ) override;
+ virtual void SAL_CALL flush( ) override;
+ virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// OComponentHelper
virtual void SAL_CALL disposing() override;
@@ -150,21 +150,21 @@ namespace logging
}
- ::sal_Int32 SAL_CALL ConsoleHandler::getThreshold() throw (RuntimeException, std::exception)
+ ::sal_Int32 SAL_CALL ConsoleHandler::getThreshold()
{
MethodGuard aGuard( *this );
return m_nThreshold;
}
- void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException, std::exception)
+ void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold )
{
MethodGuard aGuard( *this );
m_nThreshold = _threshold;
}
- OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException, std::exception)
+ OUString SAL_CALL ConsoleHandler::getEncoding()
{
MethodGuard aGuard( *this );
OUString sEncoding;
@@ -173,42 +173,42 @@ namespace logging
}
- void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException, std::exception)
+ void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding )
{
MethodGuard aGuard( *this );
OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
}
- Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter() throw (RuntimeException, std::exception)
+ Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter()
{
MethodGuard aGuard( *this );
return m_aHandlerHelper.getFormatter();
}
- void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException, std::exception)
+ void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter )
{
MethodGuard aGuard( *this );
m_aHandlerHelper.setFormatter( _rxFormatter );
}
- ::sal_Int32 SAL_CALL ConsoleHandler::getLevel() throw (RuntimeException, std::exception)
+ ::sal_Int32 SAL_CALL ConsoleHandler::getLevel()
{
MethodGuard aGuard( *this );
return m_aHandlerHelper.getLevel();
}
- void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception)
+ void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel )
{
MethodGuard aGuard( *this );
m_aHandlerHelper.setLevel( _nLevel );
}
- void SAL_CALL ConsoleHandler::flush( ) throw (RuntimeException, std::exception)
+ void SAL_CALL ConsoleHandler::flush( )
{
MethodGuard aGuard( *this );
fflush( stdout );
@@ -216,7 +216,7 @@ namespace logging
}
- sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException, std::exception)
+ sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord )
{
MethodGuard aGuard( *this );
@@ -232,17 +232,17 @@ namespace logging
return true;
}
- OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException, std::exception)
+ OUString SAL_CALL ConsoleHandler::getImplementationName()
{
return OUString("com.sun.star.comp.extensions.ConsoleHandler");
}
- sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
- Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames()
{
return { "com.sun.star.logging.ConsoleHandler" };
}
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index f668c287fab8..98e64e1c454d 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -43,33 +43,33 @@ namespace logging
class CsvFormatter : public cppu::WeakImplHelper<css::logging::XCsvLogFormatter, css::lang::XServiceInfo>
{
public:
- virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) override;
CsvFormatter();
private:
// XCsvLogFormatter
- virtual sal_Bool SAL_CALL getLogEventNo() throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getLogThread() throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getLogTimestamp() throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getLogSource() throw (RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getColumnnames() throw (RuntimeException, std::exception) override;
-
- virtual void SAL_CALL setLogEventNo( sal_Bool log_event_no ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setLogThread( sal_Bool log_thread ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setLogTimestamp( sal_Bool log_timestamp ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setLogSource( sal_Bool log_source ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) throw (RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL getLogEventNo() override;
+ virtual sal_Bool SAL_CALL getLogThread() override;
+ virtual sal_Bool SAL_CALL getLogTimestamp() override;
+ virtual sal_Bool SAL_CALL getLogSource() override;
+ virtual Sequence< OUString > SAL_CALL getColumnnames() override;
+
+ virtual void SAL_CALL setLogEventNo( sal_Bool log_event_no ) override;
+ virtual void SAL_CALL setLogThread( sal_Bool log_thread ) override;
+ virtual void SAL_CALL setLogTimestamp( sal_Bool log_timestamp ) override;
+ virtual void SAL_CALL setLogSource( sal_Bool log_source ) override;
+ virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) override;
// XLogFormatter
- virtual OUString SAL_CALL getHead( ) throw (RuntimeException, std::exception) override;
- virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTail( ) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getHead( ) override;
+ virtual OUString SAL_CALL format( const LogRecord& Record ) override;
+ virtual OUString SAL_CALL getTail( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& service_name ) throw(RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& service_name ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
bool m_LogEventNo;
@@ -136,58 +136,58 @@ namespace logging
m_Columnnames({ "message" })
{ }
- sal_Bool CsvFormatter::getLogEventNo() throw (RuntimeException, std::exception)
+ sal_Bool CsvFormatter::getLogEventNo()
{
return m_LogEventNo;
}
- sal_Bool CsvFormatter::getLogThread() throw (RuntimeException, std::exception)
+ sal_Bool CsvFormatter::getLogThread()
{
return m_LogThread;
}
- sal_Bool CsvFormatter::getLogTimestamp() throw (RuntimeException, std::exception)
+ sal_Bool CsvFormatter::getLogTimestamp()
{
return m_LogTimestamp;
}
- sal_Bool CsvFormatter::getLogSource() throw (RuntimeException, std::exception)
+ sal_Bool CsvFormatter::getLogSource()
{
return m_LogSource;
}
- Sequence< OUString > CsvFormatter::getColumnnames() throw (RuntimeException, std::exception)
+ Sequence< OUString > CsvFormatter::getColumnnames()
{
return m_Columnnames;
}
- void CsvFormatter::setLogEventNo(sal_Bool log_event_no) throw (RuntimeException, std::exception)
+ void CsvFormatter::setLogEventNo(sal_Bool log_event_no)
{
m_LogEventNo = log_event_no;
}
- void CsvFormatter::setLogThread(sal_Bool log_thread) throw (RuntimeException, std::exception)
+ void CsvFormatter::setLogThread(sal_Bool log_thread)
{
m_LogThread = log_thread;
}
- void CsvFormatter::setLogTimestamp(sal_Bool log_timestamp) throw (RuntimeException, std::exception)
+ void CsvFormatter::setLogTimestamp(sal_Bool log_timestamp)
{
m_LogTimestamp = log_timestamp;
}
- void CsvFormatter::setLogSource(sal_Bool log_source) throw (RuntimeException, std::exception)
+ void CsvFormatter::setLogSource(sal_Bool log_source)
{
m_LogSource = log_source;
}
- void CsvFormatter::setColumnnames(const Sequence< OUString >& columnnames) throw (RuntimeException, std::exception)
+ void CsvFormatter::setColumnnames(const Sequence< OUString >& columnnames)
{
m_Columnnames = Sequence< OUString>(columnnames);
m_MultiColumn = (m_Columnnames.getLength()>1);
}
- OUString SAL_CALL CsvFormatter::getHead( ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL CsvFormatter::getHead( )
{
OUStringBuffer buf;
if(m_LogEventNo)
@@ -209,7 +209,7 @@ namespace logging
return buf.makeStringAndClear();
}
- OUString SAL_CALL CsvFormatter::format( const LogRecord& record ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL CsvFormatter::format( const LogRecord& record )
{
OUStringBuffer aLogEntry;
@@ -264,12 +264,12 @@ namespace logging
return aLogEntry.makeStringAndClear();
}
- OUString SAL_CALL CsvFormatter::getTail( ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL CsvFormatter::getTail( )
{
return OUString();
}
- OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception)
+ OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< OUString>& column_data)
{
sal_Int32 columns = column_data.getLength();
OUStringBuffer buf;
@@ -282,17 +282,17 @@ namespace logging
return buf.makeStringAndClear();
}
- sal_Bool SAL_CALL CsvFormatter::supportsService( const OUString& service_name ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL CsvFormatter::supportsService( const OUString& service_name )
{
return cppu::supportsService(this, service_name);
}
- OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException, std::exception)
+ OUString SAL_CALL CsvFormatter::getImplementationName()
{
return OUString("com.sun.star.comp.extensions.CsvFormatter");
}
- Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames()
{
return { "com.sun.star.logging.CsvFormatter" };
}
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index c1bd711346cb..0096cad1f06c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -87,19 +87,19 @@ namespace logging
private:
// XLogHandler
- virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception) override;
- virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL flush( ) throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getEncoding() override;
+ virtual void SAL_CALL setEncoding( const OUString& _encoding ) override;
+ virtual Reference< XLogFormatter > SAL_CALL getFormatter() override;
+ virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) override;
+ virtual ::sal_Int32 SAL_CALL getLevel() override;
+ virtual void SAL_CALL setLevel( ::sal_Int32 _level ) override;
+ virtual void SAL_CALL flush( ) override;
+ virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// OComponentHelper
virtual void SAL_CALL disposing() override;
@@ -260,7 +260,7 @@ namespace logging
}
- OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException, std::exception)
+ OUString SAL_CALL FileHandler::getEncoding()
{
MethodGuard aGuard( *this );
OUString sEncoding;
@@ -269,42 +269,42 @@ namespace logging
}
- void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException, std::exception)
+ void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding )
{
MethodGuard aGuard( *this );
OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
}
- Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter() throw (RuntimeException, std::exception)
+ Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter()
{
MethodGuard aGuard( *this );
return m_aHandlerHelper.getFormatter();
}
- void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException, std::exception)
+ void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter )
{
MethodGuard aGuard( *this );
m_aHandlerHelper.setFormatter( _rxFormatter );
}
- ::sal_Int32 SAL_CALL FileHandler::getLevel() throw (RuntimeException, std::exception)
+ ::sal_Int32 SAL_CALL FileHandler::getLevel()
{
MethodGuard aGuard( *this );
return m_aHandlerHelper.getLevel();
}
- void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception)
+ void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel )
{
MethodGuard aGuard( *this );
m_aHandlerHelper.setLevel( _nLevel );
}
- void SAL_CALL FileHandler::flush( ) throw (RuntimeException, std::exception)
+ void SAL_CALL FileHandler::flush( )
{
MethodGuard aGuard( *this );
if(!m_pFile.get())
@@ -317,7 +317,7 @@ namespace logging
}
- sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException, std::exception)
+ sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord )
{
MethodGuard aGuard( *this );
@@ -332,17 +332,17 @@ namespace logging
return true;
}
- OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException, std::exception)
+ OUString SAL_CALL FileHandler::getImplementationName()
{
return OUString("com.sun.star.comp.extensions.FileHandler");
}
- sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
- Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames()
{
return { "com.sun.star.logging.FileHandler" };
}
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index ff3d731879e7..f528c847701c 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -66,14 +66,14 @@ namespace logging
EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName );
// XLogger
- virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() override;
+ virtual ::sal_Int32 SAL_CALL getLevel() override;
+ virtual void SAL_CALL setLevel( ::sal_Int32 _level ) override;
+ virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) override;
+ virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) override;
+ virtual sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) override;
+ virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) override;
+ virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) override;
protected:
virtual ~EventLogger() override;
@@ -102,13 +102,13 @@ namespace logging
explicit LoggerPool( const Reference< XComponentContext >& _rxContext );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XLoggerPool
- virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) throw (RuntimeException, std::exception) override;
- virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) throw (RuntimeException, std::exception) override;
+ virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) override;
+ virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) override;
};
EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName )
@@ -152,42 +152,42 @@ namespace logging
[] (Reference<XLogHandler> const& rxListener) { rxListener->flush(); } );
}
- OUString SAL_CALL EventLogger::getName() throw (RuntimeException, std::exception)
+ OUString SAL_CALL EventLogger::getName()
{
return m_sName;
}
- ::sal_Int32 SAL_CALL EventLogger::getLevel() throw (RuntimeException, std::exception)
+ ::sal_Int32 SAL_CALL EventLogger::getLevel()
{
::osl::MutexGuard aGuard( m_aMutex );
return m_nLogLevel;
}
- void SAL_CALL EventLogger::setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception)
+ void SAL_CALL EventLogger::setLevel( ::sal_Int32 _level )
{
::osl::MutexGuard aGuard( m_aMutex );
m_nLogLevel = _level;
}
- void SAL_CALL EventLogger::addLogHandler( const Reference< XLogHandler >& _rxLogHandler ) throw (RuntimeException, std::exception)
+ void SAL_CALL EventLogger::addLogHandler( const Reference< XLogHandler >& _rxLogHandler )
{
if ( _rxLogHandler.is() )
m_aHandlers.addInterface( _rxLogHandler );
}
- void SAL_CALL EventLogger::removeLogHandler( const Reference< XLogHandler >& _rxLogHandler ) throw (RuntimeException, std::exception)
+ void SAL_CALL EventLogger::removeLogHandler( const Reference< XLogHandler >& _rxLogHandler )
{
if ( _rxLogHandler.is() )
m_aHandlers.removeInterface( _rxLogHandler );
}
- sal_Bool SAL_CALL EventLogger::isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception)
+ sal_Bool SAL_CALL EventLogger::isLoggable( ::sal_Int32 _nLevel )
{
::osl::MutexGuard aGuard( m_aMutex );
return impl_nts_isLoggable_nothrow( _nLevel );
}
- void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const OUString& _rMessage ) throw (RuntimeException, std::exception)
+ void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const OUString& _rMessage )
{
impl_ts_logEvent_nothrow( createLogRecord(
m_sName,
@@ -197,7 +197,7 @@ namespace logging
) );
}
- void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const OUString& _rSourceClass, const OUString& _rSourceMethod, const OUString& _rMessage ) throw (RuntimeException, std::exception)
+ void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const OUString& _rSourceClass, const OUString& _rSourceMethod, const OUString& _rMessage )
{
impl_ts_logEvent_nothrow( createLogRecord(
m_sName,
@@ -214,22 +214,22 @@ namespace logging
{
}
- OUString SAL_CALL LoggerPool::getImplementationName() throw(RuntimeException, std::exception)
+ OUString SAL_CALL LoggerPool::getImplementationName()
{
return OUString("com.sun.star.comp.extensions.LoggerPool");
}
- sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
- Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames()
{
return { "com.sun.star.logging.LoggerPool" };
}
- Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const OUString& _rName ) throw (RuntimeException, std::exception)
+ Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const OUString& _rName )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -245,7 +245,7 @@ namespace logging
return xLogger;
}
- Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( ) throw (RuntimeException, std::exception)
+ Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( )
{
return getNamedLogger( "org.openoffice.logging.DefaultLogger" );
}
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 7e115dcb610f..40c7c7156c06 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -46,21 +46,21 @@ namespace logging
private:
// XLogFormatter
- virtual OUString SAL_CALL getHead( ) throw (RuntimeException, std::exception) override;
- virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTail( ) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getHead( ) override;
+ virtual OUString SAL_CALL format( const LogRecord& Record ) override;
+ virtual OUString SAL_CALL getTail( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
PlainTextFormatter::PlainTextFormatter()
{
}
- OUString SAL_CALL PlainTextFormatter::getHead( ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL PlainTextFormatter::getHead( )
{
OUStringBuffer aHeader;
aHeader.append( " event no" ); // column 1: the event number
@@ -77,7 +77,7 @@ namespace logging
}
- OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord )
{
char buffer[ 30 ];
const int buffer_size = sizeof( buffer );
@@ -115,24 +115,24 @@ namespace logging
}
- OUString SAL_CALL PlainTextFormatter::getTail( ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL PlainTextFormatter::getTail( )
{
// no tail
return OUString();
}
- sal_Bool SAL_CALL PlainTextFormatter::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL PlainTextFormatter::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
- OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException, std::exception)
+ OUString SAL_CALL PlainTextFormatter::getImplementationName()
{
return OUString("com.sun.star.comp.extensions.PlainTextFormatter");
}
- Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames()
{
return { "com.sun.star.logging.PlainTextFormatter" };
}