summaryrefslogtreecommitdiff
path: root/include/ucbhelper
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 /include/ucbhelper
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 'include/ucbhelper')
-rw-r--r--include/ucbhelper/activedatasink.hxx6
-rw-r--r--include/ucbhelper/activedatastreamer.hxx8
-rw-r--r--include/ucbhelper/cancelcommandexecution.hxx6
-rw-r--r--include/ucbhelper/commandenvironment.hxx8
-rw-r--r--include/ucbhelper/content.hxx143
-rw-r--r--include/ucbhelper/contenthelper.hxx86
-rw-r--r--include/ucbhelper/contentidentifier.hxx15
-rw-r--r--include/ucbhelper/contentinfo.hxx45
-rw-r--r--include/ucbhelper/fd_inputstream.hxx41
-rw-r--r--include/ucbhelper/interactionrequest.hxx141
-rw-r--r--include/ucbhelper/interceptedinteraction.hxx3
-rw-r--r--include/ucbhelper/macros.hxx9
-rw-r--r--include/ucbhelper/propertyvalueset.hxx93
-rw-r--r--include/ucbhelper/providerhelper.hxx25
-rw-r--r--include/ucbhelper/registerucb.hxx3
-rw-r--r--include/ucbhelper/resultset.hxx234
-rw-r--r--include/ucbhelper/resultsethelper.hxx44
-rw-r--r--include/ucbhelper/resultsetmetadata.hxx93
18 files changed, 270 insertions, 733 deletions
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index fda23bdce323..4cdc69a2b2c7 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -40,11 +40,9 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink :
public:
// XActiveDataSink methods.
- virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override;
- virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream() override;
};
} /* namespace ucbhelper */
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 618aaf73e172..aa00f361d854 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -40,12 +40,8 @@ class ActiveDataStreamer :
public:
// XActiveDataStreamer methods.
- virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream )
- throw( css::uno::RuntimeException,
- std::exception ) override;
- virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream()
- throw( css::uno::RuntimeException,
- std::exception ) override;
+ virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream ) override;
+ virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream() override;
};
} /* namespace ucbhelper */
diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx
index 8cdeb7a7a7ee..381d63c27645 100644
--- a/include/ucbhelper/cancelcommandexecution.hxx
+++ b/include/ucbhelper/cancelcommandexecution.hxx
@@ -56,8 +56,7 @@ namespace ucbhelper
UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::uno::Any & rException,
const css::uno::Reference<
css::ucb::XCommandEnvironment > &
- xEnv )
- throw( css::uno::Exception );
+ xEnv );
/** Cancel the execution of a command by throwing the appropriate exception.
If an Interaction Handler is given with the command environment and the
@@ -94,8 +93,7 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::ucb::IOErrorCode eEr
const css::uno::Sequence< css::uno::Any > & rArgs,
const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
const OUString & rMessage = OUString(),
- const css::uno::Reference< css::ucb::XCommandProcessor > & xContext = nullptr )
- throw( css::uno::Exception );
+ const css::uno::Reference< css::ucb::XCommandProcessor > & xContext = nullptr );
}
#endif // INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index c11e448aa1ff..919f49ca3a3a 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -60,13 +60,9 @@ public:
virtual ~CommandEnvironment() override;
// XCommandEnvironemnt
- virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler()
- throw ( css::uno::RuntimeException,
- std::exception ) override;
+ virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
- virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler()
- throw ( css::uno::RuntimeException,
- std::exception ) override;
+ virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() override;
};
} /* namespace ucbhelper */
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 5fa70c7783bc..4943fce10979 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -101,10 +101,7 @@ protected:
/// @throws css::uno::RuntimeException,
/// @throws css::uno::Exception
css::uno::Any createCursorAny( const css::uno::Sequence< OUString >& rPropertyNames,
- ResultSetInclude eMode )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ ResultSetInclude eMode );
public:
/**
@@ -125,9 +122,7 @@ public:
*/
Content( const OUString& rURL,
const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
- const css::uno::Reference< css::uno::XComponentContext >& rCtx )
- throw ( css::ucb::ContentCreationException,
- css::uno::RuntimeException );
+ const css::uno::Reference< css::uno::XComponentContext >& rCtx );
/**
* Constructor.
*
@@ -141,9 +136,7 @@ public:
*/
Content( const css::uno::Reference< css::ucb::XContent >& rContent,
const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
- const css::uno::Reference< css::uno::XComponentContext >& rCtx )
- throw ( css::ucb::ContentCreationException,
- css::uno::RuntimeException );
+ const css::uno::Reference< css::uno::XComponentContext >& rCtx );
/**
* Copy Constructor.
*
@@ -253,10 +246,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::ucb::XCommandInfo >
- getCommands()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ getCommands();
/**
* This methods provides access to meta data of the properties supported
* by this content.
@@ -268,10 +258,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::beans::XPropertySetInfo >
- getProperties()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ getProperties();
// Access to property value(s).
@@ -288,10 +275,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Any
- getPropertyValue( const OUString& rPropertyName )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ getPropertyValue( const OUString& rPropertyName );
/**
* This method can be used to set a single property value.
*
@@ -321,10 +305,7 @@ public:
*/
css::uno::Any
setPropertyValue( const OUString& rPropertyName,
- const css::uno::Any& rValue )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ const css::uno::Any& rValue );
/**
* This method can be used to read multiple property values.
*
@@ -336,10 +317,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Sequence< css::uno::Any >
- getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames );
/**
* This method can be used to read multiple property values.
*
@@ -351,10 +329,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::sdbc::XRow >
- getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames );
/**
* This method can be used to set multiple property values.
@@ -391,10 +366,7 @@ public:
*/
css::uno::Sequence< css::uno::Any >
setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames,
- const css::uno::Sequence< css::uno::Any >& rValues )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ const css::uno::Sequence< css::uno::Any >& rValues );
// General command execution.
@@ -415,10 +387,7 @@ public:
*/
css::uno::Any
executeCommand( const OUString& rCommandName,
- const css::uno::Any& rCommandArgument )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ const css::uno::Any& rCommandArgument );
// Special commands.
@@ -444,10 +413,7 @@ public:
*/
css::uno::Reference< css::sdbc::XResultSet >
createCursor( const css::uno::Sequence< OUString >& rPropertyNames,
- ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS );
/**
* This methods gives access to the children of a folder content.
* Additionally, the result set returned provides efficient access to
@@ -468,10 +434,7 @@ public:
*/
css::uno::Reference< css::ucb::XDynamicResultSet >
createDynamicCursor( const css::uno::Sequence< OUString >& rPropertyNames,
- ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS );
/// @throws css::ucb::CommandAbortedException
/// @throws css::uno::RuntimeException
@@ -480,10 +443,7 @@ public:
createSortedCursor( const css::uno::Sequence< OUString >& rPropertyNames,
const css::uno::Sequence< css::ucb::NumberedSortingInfo >& rSortInfo,
const css::uno::Reference< css::ucb::XAnyCompareFactory >& rAnyCompareFactory,
- ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS );
/**
* This methods gives read access to the content stream of a content (i.e
@@ -497,10 +457,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::io::XInputStream >
- openStream()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ openStream();
/**
* This methods gives read access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -514,10 +471,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::io::XInputStream >
- openStreamNoLock()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ openStreamNoLock();
/**
* This methods gives read/write access to the content stream of a content (i.e
@@ -531,10 +485,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::io::XStream >
- openWriteableStream()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ openWriteableStream();
/**
* This methods gives read/write access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -548,10 +499,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Reference< css::io::XStream >
- openWriteableStreamNoLock()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ openWriteableStreamNoLock();
/**
* This methods gives read access to the content stream of a content (i.e
@@ -565,10 +513,7 @@ public:
* @throws css::uno::Exception
*/
bool
- openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink );
/**
* This methods gives read access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -581,10 +526,7 @@ public:
* @throws css::uno::Exception
*/
bool
- openStream( const css::uno::Reference< css::io::XOutputStream >& rStream )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ openStream( const css::uno::Reference< css::io::XOutputStream >& rStream );
/**
* This methods gives write access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -600,10 +542,7 @@ public:
*/
void
writeStream( const css::uno::Reference< css::io::XInputStream >& rStream,
- bool bReplaceExisting )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ bool bReplaceExisting );
/**
* This method returns the different types of contents this content
@@ -616,10 +555,7 @@ public:
* @throws css::uno::Exception
*/
css::uno::Sequence< css::ucb::ContentInfo >
- queryCreatableContentsInfo()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ queryCreatableContentsInfo();
/**
* This method creates, initializes and inserts ( commits ) a new content
@@ -651,10 +587,7 @@ public:
insertNewContent( const OUString& rContentType,
const css::uno::Sequence< OUString >& rPropertyNames,
const css::uno::Sequence< css::uno::Any >& rPropertyValues,
- Content& rNewContent )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ Content& rNewContent );
/**
* This method creates, initializes and inserts (commits) a new content
* inside this (the target folder) content. For example, it can be used to
@@ -689,10 +622,7 @@ public:
const css::uno::Sequence< OUString >& rPropertyNames,
const css::uno::Sequence< css::uno::Any >& rPropertyValues,
const css::uno::Reference< css::io::XInputStream >& rStream,
- Content& rNewContent )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ Content& rNewContent );
/**
* This method transfers (copies/moves) a content. It creates a new
@@ -735,10 +665,7 @@ public:
bool bMajorVersion = false,
const OUString & rCommentVersion = OUString( ),
OUString* pResultURL = nullptr,
- const OUString & rDocumentId = OUString( ) )
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ const OUString & rDocumentId = OUString( ) );
/**
* This method lock the resource.
@@ -748,10 +675,7 @@ public:
* @throws css::uno::Exception
*/
void
- lock()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ lock();
/**
* This method unlock the resource.
@@ -761,10 +685,7 @@ public:
* @throws css::uno::Exception
*/
void
- unlock()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ unlock();
// Required properties.
@@ -779,10 +700,7 @@ public:
* @throws css::uno::Exception
*/
bool
- isFolder()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ isFolder();
/**
* This method returns the value of the content's property "IsDocument".
*
@@ -793,10 +711,7 @@ public:
* @throws css::uno::Exception
*/
bool
- isDocument()
- throw( css::ucb::CommandAbortedException,
- css::uno::RuntimeException,
- css::uno::Exception );
+ isDocument();
};
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 9645f7ef1f83..2eb9c7209b6a 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -309,8 +309,7 @@ public:
virtual ~ContentImplHelper() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -318,86 +317,65 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XServiceInfo
virtual OUString SAL_CALL
- getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ getImplementationName() override = 0;
virtual sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ getSupportedServiceNames() override = 0;
// XComponent
virtual void SAL_CALL
- dispose()
- throw( css::uno::RuntimeException, std::exception ) override;
+ dispose() override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
// XContent
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- getIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getIdentifier() override;
virtual OUString SAL_CALL
- getContentType()
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ getContentType() override = 0;
virtual void SAL_CALL
addContentEventListener(
- const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override;
virtual void SAL_CALL
removeContentEventListener(
- const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override;
// XCommandProcessor
virtual sal_Int32 SAL_CALL
- createCommandIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ createCommandIdentifier() override;
virtual css::uno::Any SAL_CALL
execute( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
- const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
- throw( css::uno::Exception,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception ) override = 0;
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override = 0;
virtual void SAL_CALL
- abort( sal_Int32 CommandId )
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ abort( sal_Int32 CommandId ) override = 0;
// XPropertiesChangeNotifier
virtual void SAL_CALL
addPropertiesChangeListener(
const css::uno::Sequence< OUString >& PropertyNames,
- const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override;
virtual void SAL_CALL
removePropertiesChangeListener(
const css::uno::Sequence< OUString >& PropertyNames,
- const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override;
// XCommandInfoChangeNotifier
virtual void SAL_CALL
addCommandInfoChangeListener(
- const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) override;
virtual void SAL_CALL
removeCommandInfoChangeListener(
- const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) override;
// XPropertyContainer
@@ -414,11 +392,7 @@ public:
virtual void SAL_CALL
addProperty( const OUString& Name,
sal_Int16 Attributes,
- const css::uno::Any& DefaultValue )
- throw( css::beans::PropertyExistException,
- css::beans::IllegalTypeException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Any& DefaultValue ) override;
/**
* This method removes a property from the content according to the
@@ -431,20 +405,15 @@ public:
* implementation of getPropertyInfoTable.
*/
virtual void SAL_CALL
- removeProperty( const OUString& Name )
- throw( css::beans::UnknownPropertyException,
- css::beans::NotRemoveableException,
- css::uno::RuntimeException, std::exception ) override;
+ removeProperty( const OUString& Name ) override;
// XPropertySetInfoChangeNotifier
virtual void SAL_CALL
addPropertySetInfoChangeListener(
- const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
virtual void SAL_CALL
removePropertySetInfoChangeListener(
- const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
// XChild
@@ -454,16 +423,13 @@ public:
* implementation of getParentURL.
*/
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- getParent()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getParent() override;
/**
* The implementation of this method always throws a NoSupportException.
*/
virtual void SAL_CALL
- setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
- throw( css::lang::NoSupportException,
- css::uno::RuntimeException, std::exception ) override;
+ setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
// Non-interface methods.
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 21616511ce2b..093544c2b6da 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -50,8 +50,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL
acquire() throw() override;
virtual void SAL_CALL
@@ -59,19 +58,15 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XContentIdentifier
virtual OUString SAL_CALL
- getContentIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getContentIdentifier() override;
virtual OUString SAL_CALL
- getContentProviderScheme()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getContentProviderScheme() override;
private:
std::unique_ptr<ContentIdentifier_Impl> m_pImpl;
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 171479ca0e1f..7b2e9a2c0c8b 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -65,8 +65,7 @@ public:
virtual ~PropertySetInfo() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -74,24 +73,18 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XPropertySetInfo
virtual css::uno::Sequence<
css::beans::Property > SAL_CALL
- getProperties()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getProperties() override;
virtual css::beans::Property SAL_CALL
- getPropertyByName( const OUString& aName )
- throw( css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception ) override;
+ getPropertyByName( const OUString& aName ) override;
virtual sal_Bool SAL_CALL
- hasPropertyByName( const OUString& Name )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasPropertyByName( const OUString& Name ) override;
// Non-Interface methods.
void reset();
@@ -130,8 +123,7 @@ public:
virtual ~CommandProcessorInfo() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -139,31 +131,22 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XCommandInfo
virtual css::uno::Sequence<
css::ucb::CommandInfo > SAL_CALL
- getCommands()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getCommands() override;
virtual css::ucb::CommandInfo SAL_CALL
- getCommandInfoByName( const OUString& Name )
- throw( css::ucb::UnsupportedCommandException,
- css::uno::RuntimeException, std::exception ) override;
+ getCommandInfoByName( const OUString& Name ) override;
virtual css::ucb::CommandInfo SAL_CALL
- getCommandInfoByHandle( sal_Int32 Handle )
- throw( css::ucb::UnsupportedCommandException,
- css::uno::RuntimeException, std::exception ) override;
+ getCommandInfoByHandle( sal_Int32 Handle ) override;
virtual sal_Bool SAL_CALL
- hasCommandByName( const OUString& Name )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasCommandByName( const OUString& Name ) override;
virtual sal_Bool SAL_CALL
- hasCommandByHandle( sal_Int32 Handle )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasCommandByHandle( sal_Int32 Handle ) override;
// Non-Interface methods.
void reset();
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index a80d6615fcf4..da0aec5ac1e6 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -54,60 +54,35 @@ namespace ucbhelper
virtual sal_Int32 SAL_CALL
readBytes(css::uno::Sequence< sal_Int8 >& aData,
- sal_Int32 nBytesToRead)
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nBytesToRead) override;
virtual sal_Int32 SAL_CALL
readSomeBytes(css::uno::Sequence< sal_Int8 >& aData,
- sal_Int32 nMaxBytesToRead )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nMaxBytesToRead ) override;
virtual void SAL_CALL
- skipBytes(sal_Int32 nBytesToSkip)
- throw(css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ skipBytes(sal_Int32 nBytesToSkip) override;
virtual sal_Int32 SAL_CALL
- available()
- throw(css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ available() override;
virtual void SAL_CALL
- closeInput()
- throw(css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ closeInput() override;
/** XSeekable
*/
virtual void SAL_CALL
- seek(sal_Int64 location)
- throw(css::lang::IllegalArgumentException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ seek(sal_Int64 location) override;
virtual sal_Int64 SAL_CALL
- getPosition()
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ getPosition() override;
virtual sal_Int64 SAL_CALL
- getLength()
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ getLength() override;
private:
oslFileHandle m_tmpfl;
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index ff5eaaed539d..07cd1ad629a8 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -90,8 +90,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -99,19 +98,15 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionRequest
virtual css::uno::Any SAL_CALL
- getRequest()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getRequest() override;
virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL
- getContinuations()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getContinuations() override;
// Non-interface methods.
@@ -184,8 +179,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -193,15 +187,12 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
};
@@ -221,8 +212,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -230,15 +220,12 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
};
@@ -258,8 +245,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -267,15 +253,12 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
};
@@ -295,8 +278,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -304,15 +286,12 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
};
@@ -393,8 +372,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -402,67 +380,50 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
// XInteractionSupplyAuthentication
virtual sal_Bool SAL_CALL
- canSetRealm()
- throw( css::uno::RuntimeException, std::exception ) override;
+ canSetRealm() override;
virtual void SAL_CALL
- setRealm( const OUString& Realm )
- throw( css::uno::RuntimeException, std::exception ) override;
+ setRealm( const OUString& Realm ) override;
virtual sal_Bool SAL_CALL
- canSetUserName()
- throw( css::uno::RuntimeException, std::exception ) override;
+ canSetUserName() override;
virtual void SAL_CALL
- setUserName( const OUString& UserName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ setUserName( const OUString& UserName ) override;
virtual sal_Bool SAL_CALL
- canSetPassword()
- throw( css::uno::RuntimeException, std::exception ) override;
+ canSetPassword() override;
virtual void SAL_CALL
- setPassword( const OUString& Password )
- throw( css::uno::RuntimeException, std::exception ) override;
+ setPassword( const OUString& Password ) override;
virtual css::uno::Sequence<
css::ucb::RememberAuthentication > SAL_CALL
getRememberPasswordModes(
- css::ucb::RememberAuthentication& Default )
- throw( css::uno::RuntimeException, std::exception ) override;
+ css::ucb::RememberAuthentication& Default ) override;
virtual void SAL_CALL
- setRememberPassword( css::ucb::RememberAuthentication Remember )
- throw( css::uno::RuntimeException, std::exception ) override;
+ setRememberPassword( css::ucb::RememberAuthentication Remember ) override;
virtual sal_Bool SAL_CALL
- canSetAccount()
- throw( css::uno::RuntimeException, std::exception ) override;
+ canSetAccount() override;
virtual void SAL_CALL
- setAccount( const OUString& Account )
- throw( css::uno::RuntimeException, std::exception ) override;
+ setAccount( const OUString& Account ) override;
virtual css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL
getRememberAccountModes(
- css::ucb::RememberAuthentication& Default )
- throw( css::uno::RuntimeException, std::exception ) override;
+ css::ucb::RememberAuthentication& Default ) override;
virtual void SAL_CALL
- setRememberAccount( css::ucb::RememberAuthentication Remember )
- throw( css::uno::RuntimeException, std::exception ) override;
+ setRememberAccount( css::ucb::RememberAuthentication Remember ) override;
// XInteractionSupplyAuthentication2
- virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default )
- throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default ) override;
+ virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials ) override;
// Non-interface methods.
@@ -549,8 +510,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -558,15 +518,12 @@ public:
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
};
class UCBHELPER_DLLPUBLIC InteractionAuthFallback:
@@ -581,23 +538,19 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
// XAuthFallback
- virtual void SAL_CALL setCode( const OUString& code )
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL setCode( const OUString& code ) override;
/// @throws css::uno::RuntimeException
- const OUString& SAL_CALL getCode()
- throw (::css::uno::RuntimeException, ::std::exception);
+ const OUString& SAL_CALL getCode();
};
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 6a723f541a9b..c940249a07b3 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -233,8 +233,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@param xRequest
the interaction request, which should be intercepted.
*/
- virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) override;
// helper
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 6f9311e8657f..09dca56d5750 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -39,16 +39,14 @@
#define XTYPEPROVIDER_COMMON_IMPL( Class ) \
css::uno::Sequence< sal_Int8 > SAL_CALL \
-Class::getImplementationId() \
- throw( css::uno::RuntimeException, std::exception ) \
+Class::getImplementationId() \
{ \
return css::uno::Sequence<sal_Int8>(); \
}
#define GETTYPES_IMPL_START( Class ) \
css::uno::Sequence< css::uno::Type > SAL_CALL \
-Class::getTypes() \
- throw( css::uno::RuntimeException, std::exception ) \
+Class::getTypes() \
{ \
static cppu::OTypeCollection* pCollection = nullptr; \
if ( !pCollection ) \
@@ -161,7 +159,6 @@ GETTYPES_IMPL_END
#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
OUString SAL_CALL Class::getImplementationName() \
- throw( css::uno::RuntimeException, std::exception ) \
{ \
return getImplementationName_Static(); \
} \
@@ -173,14 +170,12 @@ OUString Class::getImplementationName_Static() \
\
sal_Bool SAL_CALL \
Class::supportsService( const OUString& ServiceName ) \
- throw( css::uno::RuntimeException, std::exception ) \
{ \
return cppu::supportsService( this, ServiceName ); \
} \
\
css::uno::Sequence< OUString > SAL_CALL \
Class::getSupportedServiceNames() \
- throw( css::uno::RuntimeException, std::exception ) \
{ \
return getSupportedServiceNames_Static(); \
}
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index e475243be8a4..dcc48170e8a4 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -75,8 +75,7 @@ public:
virtual ~PropertyValueSet() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -84,107 +83,63 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XRow
virtual sal_Bool SAL_CALL
- wasNull()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ wasNull() override;
virtual OUString SAL_CALL
- getString( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getString( sal_Int32 columnIndex ) override;
virtual sal_Bool SAL_CALL
- getBoolean( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBoolean( sal_Int32 columnIndex ) override;
virtual sal_Int8 SAL_CALL
- getByte( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getByte( sal_Int32 columnIndex ) override;
virtual sal_Int16 SAL_CALL
- getShort( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getShort( sal_Int32 columnIndex ) override;
virtual sal_Int32 SAL_CALL
- getInt( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getInt( sal_Int32 columnIndex ) override;
virtual sal_Int64 SAL_CALL
- getLong( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getLong( sal_Int32 columnIndex ) override;
virtual float SAL_CALL
- getFloat( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getFloat( sal_Int32 columnIndex ) override;
virtual double SAL_CALL
- getDouble( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getDouble( sal_Int32 columnIndex ) override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getBytes( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBytes( sal_Int32 columnIndex ) override;
virtual css::util::Date SAL_CALL
- getDate( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getDate( sal_Int32 columnIndex ) override;
virtual css::util::Time SAL_CALL
- getTime( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getTime( sal_Int32 columnIndex ) override;
virtual css::util::DateTime SAL_CALL
- getTimestamp( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getTimestamp( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::io::XInputStream > SAL_CALL
- getBinaryStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBinaryStream( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::io::XInputStream > SAL_CALL
- getCharacterStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getCharacterStream( sal_Int32 columnIndex ) override;
virtual css::uno::Any SAL_CALL
getObject( sal_Int32 columnIndex,
const css::uno::Reference<
- css::container::XNameAccess >& typeMap )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ css::container::XNameAccess >& typeMap ) override;
virtual css::uno::Reference<
css::sdbc::XRef > SAL_CALL
- getRef( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getRef( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::sdbc::XBlob > SAL_CALL
- getBlob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBlob( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::sdbc::XClob > SAL_CALL
- getClob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getClob( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::sdbc::XArray > SAL_CALL
- getArray( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getArray( sal_Int32 columnIndex ) override;
// XColumnLocate
virtual sal_Int32 SAL_CALL
- findColumn( const OUString& columnName )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ findColumn( const OUString& columnName ) override;
// Non-interface methods
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index da10f4194817..8bff1126862f 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -137,8 +137,7 @@ public:
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -148,24 +147,19 @@ public:
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XServiceInfo
virtual OUString SAL_CALL
- getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ getImplementationName() override = 0;
virtual sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ getSupportedServiceNames() override = 0;
// XContentProvider
@@ -183,13 +177,10 @@ public:
* content, otherwise
*/
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
- throw( css::ucb::IllegalIdentifierException,
- css::uno::RuntimeException, std::exception ) override = 0;
+ queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override = 0;
virtual sal_Int32 SAL_CALL
compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
- const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
// Non-interface methods.
diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx
index 4f0591fcaf43..536d21a0ab69 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -89,8 +89,7 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
OUString const & rName,
OUString const & rArguments,
- OUString const & rTemplate)
- throw (css::uno::RuntimeException);
+ OUString const & rTemplate);
}
#endif // INCLUDED_UCBHELPER_REGISTERUCB_HXX
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index d7f831fa7b92..a71afddabb5f 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -102,8 +102,7 @@ public:
virtual ~ResultSet() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -111,255 +110,143 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XComponent
virtual void SAL_CALL
- dispose()
- throw( css::uno::RuntimeException, std::exception ) override;
+ dispose() override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
// XContentAccess
virtual OUString SAL_CALL
- queryContentIdentifierString()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContentIdentifierString() override;
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- queryContentIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContentIdentifier() override;
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- queryContent()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContent() override;
// XResultSetMetaDataSupplier
virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
- getMetaData()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getMetaData() override;
// XResultSet
virtual sal_Bool SAL_CALL
- next()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ next() override;
virtual sal_Bool SAL_CALL
- isBeforeFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isBeforeFirst() override;
virtual sal_Bool SAL_CALL
- isAfterLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isAfterLast() override;
virtual sal_Bool SAL_CALL
- isFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isFirst() override;
virtual sal_Bool SAL_CALL
- isLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isLast() override;
virtual void SAL_CALL
- beforeFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ beforeFirst() override;
virtual void SAL_CALL
- afterLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ afterLast() override;
virtual sal_Bool SAL_CALL
- first()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ first() override;
virtual sal_Bool SAL_CALL
- last()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ last() override;
virtual sal_Int32 SAL_CALL
- getRow()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getRow() override;
virtual sal_Bool SAL_CALL
- absolute( sal_Int32 row )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ absolute( sal_Int32 row ) override;
virtual sal_Bool SAL_CALL
- relative( sal_Int32 rows )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ relative( sal_Int32 rows ) override;
virtual sal_Bool SAL_CALL
- previous()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ previous() override;
virtual void SAL_CALL
- refreshRow()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ refreshRow() override;
virtual sal_Bool SAL_CALL
- rowUpdated()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ rowUpdated() override;
virtual sal_Bool SAL_CALL
- rowInserted()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ rowInserted() override;
virtual sal_Bool SAL_CALL
- rowDeleted()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ rowDeleted() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- getStatement()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getStatement() override;
// XRow
virtual sal_Bool SAL_CALL
- wasNull()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ wasNull() override;
virtual OUString SAL_CALL
- getString( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getString( sal_Int32 columnIndex ) override;
virtual sal_Bool SAL_CALL
- getBoolean( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBoolean( sal_Int32 columnIndex ) override;
virtual sal_Int8 SAL_CALL
- getByte( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getByte( sal_Int32 columnIndex ) override;
virtual sal_Int16 SAL_CALL
- getShort( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getShort( sal_Int32 columnIndex ) override;
virtual sal_Int32 SAL_CALL
- getInt( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getInt( sal_Int32 columnIndex ) override;
virtual sal_Int64 SAL_CALL
- getLong( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getLong( sal_Int32 columnIndex ) override;
virtual float SAL_CALL
- getFloat( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getFloat( sal_Int32 columnIndex ) override;
virtual double SAL_CALL
- getDouble( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getDouble( sal_Int32 columnIndex ) override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getBytes( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBytes( sal_Int32 columnIndex ) override;
virtual css::util::Date SAL_CALL
- getDate( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getDate( sal_Int32 columnIndex ) override;
virtual css::util::Time SAL_CALL
- getTime( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getTime( sal_Int32 columnIndex ) override;
virtual css::util::DateTime SAL_CALL
- getTimestamp( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getTimestamp( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::io::XInputStream > SAL_CALL
- getBinaryStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBinaryStream( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::io::XInputStream > SAL_CALL
- getCharacterStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getCharacterStream( sal_Int32 columnIndex ) override;
virtual css::uno::Any SAL_CALL
getObject( sal_Int32 columnIndex,
- const css::uno::Reference< css::container::XNameAccess >& typeMap )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
- getRef( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getRef( sal_Int32 columnIndex ) override;
virtual css::uno::Reference<
css::sdbc::XBlob > SAL_CALL
- getBlob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getBlob( sal_Int32 columnIndex ) override;
virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
- getClob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getClob( sal_Int32 columnIndex ) override;
virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
- getArray( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getArray( sal_Int32 columnIndex ) override;
// XCloseable
virtual void SAL_CALL
- close()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ close() override;
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getPropertySetInfo() override;
virtual void SAL_CALL
setPropertyValue( const OUString& aPropertyName,
- const css::uno::Any& aValue )
- throw( css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Any& aValue ) override;
virtual css::uno::Any SAL_CALL
- getPropertyValue( const OUString& PropertyName )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ getPropertyValue( const OUString& PropertyName ) override;
virtual void SAL_CALL
addPropertyChangeListener( const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
virtual void SAL_CALL
removePropertyChangeListener( const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
virtual void SAL_CALL
addVetoableChangeListener( const OUString& PropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
virtual void SAL_CALL
removeVetoableChangeListener( const OUString& PropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
// Non-interface methods.
@@ -553,8 +440,7 @@ public:
*
* @exception ResultSetException thrown, if an error has occurred
*/
- virtual void validate()
- throw( css::ucb::ResultSetException ) = 0;
+ virtual void validate() = 0;
};
}
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 078b1cb21c75..da4618c3d6c9 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -129,8 +129,7 @@ public:
virtual ~ResultSetImplHelper() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -138,54 +137,37 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XComponent ( base class of XDynamicResultSet )
virtual void SAL_CALL
- dispose()
- throw( css::uno::RuntimeException, std::exception ) override;
+ dispose() override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
// XDynamicResultSet
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
- getStaticResultSet()
- throw( css::ucb::ListenerAlreadySetException,
- css::uno::RuntimeException, std::exception ) override;
+ getStaticResultSet() override;
virtual void SAL_CALL
- setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
- throw( css::ucb::ListenerAlreadySetException,
- css::uno::RuntimeException, std::exception ) override;
+ setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) override;
virtual void SAL_CALL
- connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache )
- throw( css::ucb::ListenerAlreadySetException,
- css::ucb::AlreadyInitializedException,
- css::ucb::ServiceNotFoundException,
- css::uno::RuntimeException, std::exception ) override;
+ connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override;
/**
* The implementation of this method always returns 0. Override this
* method, if necessary.
*/
virtual sal_Int16 SAL_CALL
- getCapabilities()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getCapabilities() override;
};
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 5b397d6603f9..8474cf100433 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -143,8 +143,7 @@ public:
virtual ~ResultSetMetaData() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -152,11 +151,9 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationId() override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getTypes() override;
// XResultSetMetaData
@@ -166,9 +163,7 @@ public:
* @return the length of the property sequence.
*/
virtual sal_Int32 SAL_CALL
- getColumnCount()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnCount() override;
/**
* Checks whether column is automatically numbered, which makes it
* read-only.
@@ -178,9 +173,7 @@ public:
* @return true, if column is automatically numbered.
*/
virtual sal_Bool SAL_CALL
- isAutoIncrement( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isAutoIncrement( sal_Int32 column ) override;
/**
* Checks whether column is case sensitive.
*
@@ -189,9 +182,7 @@ public:
* @return true, if column is case sensitive.
*/
virtual sal_Bool SAL_CALL
- isCaseSensitive( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isCaseSensitive( sal_Int32 column ) override;
/**
* Checks whether the value stored in column can be used in a
* WHERE clause.
@@ -201,9 +192,7 @@ public:
* @return true, if the column is searchable.
*/
virtual sal_Bool SAL_CALL
- isSearchable( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isSearchable( sal_Int32 column ) override;
/**
* Checks whether column is a cash value.
*
@@ -212,9 +201,7 @@ public:
* @return true, if the column is a cash value.
*/
virtual sal_Bool SAL_CALL
- isCurrency( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isCurrency( sal_Int32 column ) override;
/**
* Checks whether a NULL can be stored in column.
*
@@ -226,9 +213,7 @@ public:
* can be stored in the column.
*/
virtual sal_Int32 SAL_CALL
- isNullable( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isNullable( sal_Int32 column ) override;
/**
* Checks whether the value stored in column is a signed number.
*
@@ -237,9 +222,7 @@ public:
* @return true, if the value stored in column is a signed number.
*/
virtual sal_Bool SAL_CALL
- isSigned( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isSigned( sal_Int32 column ) override;
/**
* Gets the normal maximum width in characters for column.
*
@@ -248,9 +231,7 @@ public:
* @return the normal maximum width in characters for column.
*/
virtual sal_Int32 SAL_CALL
- getColumnDisplaySize( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnDisplaySize( sal_Int32 column ) override;
/**
* Gets the suggested column title for column, to be used in print-
* outs and displays.
@@ -260,9 +241,7 @@ public:
* @return the column label.
*/
virtual OUString SAL_CALL
- getColumnLabel( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnLabel( sal_Int32 column ) override;
/**
* Gets the name of column.
*
@@ -271,9 +250,7 @@ public:
* @return the name of the property that corresponds to column.
*/
virtual OUString SAL_CALL
- getColumnName( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnName( sal_Int32 column ) override;
/**
* Gets the schema name for the table from which column of this
* result set was derived.
@@ -285,9 +262,7 @@ public:
* @return the schema name of column or an empty string.
*/
virtual OUString SAL_CALL
- getSchemaName( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getSchemaName( sal_Int32 column ) override;
/**
* For number types, getprecision gets the number of decimal digits
* in column.
@@ -300,9 +275,7 @@ public:
* @return the precision for the column.
*/
virtual sal_Int32 SAL_CALL
- getPrecision( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getPrecision( sal_Int32 column ) override;
/**
* Gets the number of digits to the right of the decimal point for
* values in column.
@@ -312,9 +285,7 @@ public:
* @return the scale of the column.
*/
virtual sal_Int32 SAL_CALL
- getScale( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getScale( sal_Int32 column ) override;
/**
* Gets the name of the table from which column of this result set
* was derived or "" if there is none (for example, for a join).
@@ -326,9 +297,7 @@ public:
* @return the table name for column or an empty string.
*/
virtual OUString SAL_CALL
- getTableName( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getTableName( sal_Int32 column ) override;
virtual OUString SAL_CALL
/**
* Gets the catalog name for the table from which column of this
@@ -340,9 +309,7 @@ public:
* be returned. The first column is 1, the second is 2, ...
* @return the catalog name for column or an empty string.
*/
- getCatalogName( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getCatalogName( sal_Int32 column ) override;
/**
* Gets the JDBC type for the value stored in column. ... The STRUCT
* and DISTINCT type codes are always returned for structured and
@@ -355,9 +322,7 @@ public:
* from UNO-Type to SQL-Type.
*/
virtual sal_Int32 SAL_CALL
- getColumnType( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnType( sal_Int32 column ) override;
/**
* Gets the type name used by this particular data source for the
* values stored in column. If the type code for the type of value
@@ -369,9 +334,7 @@ public:
* @return the column type name.
*/
virtual OUString SAL_CALL
- getColumnTypeName( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnTypeName( sal_Int32 column ) override;
/**
* Indicates whether a column is definitely not writable.
*
@@ -380,9 +343,7 @@ public:
* @return true, if the column is definetely not writable.
*/
virtual sal_Bool SAL_CALL
- isReadOnly( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isReadOnly( sal_Int32 column ) override;
/**
* Indicates whether it is possible for a write on the column to succeed.
*
@@ -391,9 +352,7 @@ public:
* @return true, if it is possible for a write to succeed.
*/
virtual sal_Bool SAL_CALL
- isWritable( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isWritable( sal_Int32 column ) override;
/**
* Indicates whether a write on the column will definitely succeed.
*
@@ -402,9 +361,7 @@ public:
* @return true, if a write on the column will definetely succeed.
*/
virtual sal_Bool SAL_CALL
- isDefinitelyWritable( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ isDefinitelyWritable( sal_Int32 column ) override;
/**
* Returns the fully-qualified name of the service whose instances
* are manufactured if the method
@@ -417,9 +374,7 @@ public:
* is applicable.
*/
virtual OUString SAL_CALL
- getColumnServiceName( sal_Int32 column )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override;
+ getColumnServiceName( sal_Int32 column ) override;
};
} // namespace ucbhelper