summaryrefslogtreecommitdiff
path: root/xmlhelp/source/cxxhelp
diff options
context:
space:
mode:
Diffstat (limited to 'xmlhelp/source/cxxhelp')
-rw-r--r--xmlhelp/source/cxxhelp/inc/tvfactory.hxx14
-rw-r--r--xmlhelp/source/cxxhelp/inc/tvread.hxx46
-rw-r--r--xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx18
-rw-r--r--xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx18
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx14
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.hxx10
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.cxx18
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.hxx18
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx12
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.hxx16
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx76
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.hxx108
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx36
13 files changed, 202 insertions, 202 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index da765330f80c..e095bc7618c8 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -49,7 +49,7 @@ namespace treeview {
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(
const com::sun::star::uno::Type& aType )
- throw( com::sun::star::uno::RuntimeException);
+ throw( com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
acquire(
@@ -71,17 +71,17 @@ namespace treeview {
virtual OUString SAL_CALL
getImplementationName(
void )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL
supportsService(
const OUString& ServiceName )
- throw(com::sun::star::uno::RuntimeException );
+ throw(com::sun::star::uno::RuntimeException, std::exception );
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(
void )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XMultiServiceFactory
@@ -89,18 +89,18 @@ namespace treeview {
createInstance(
const OUString& aServiceSpecifier )
throw( com::sun::star::uno::Exception,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
createInstanceWithArguments(
const OUString& ServiceSpecifier,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments )
throw( com::sun::star::uno::Exception,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames( )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// Other
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index e47038c89f18..55f1d93573ed 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -78,7 +78,7 @@ namespace treeview {
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(
const com::sun::star::uno::Type& aType )
- throw( com::sun::star::uno::RuntimeException);
+ throw( com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
acquire(
@@ -98,13 +98,13 @@ namespace treeview {
virtual com::sun::star::uno::Type SAL_CALL
getElementType( )
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
return getCppuVoidType();
}
virtual sal_Bool SAL_CALL hasElements()
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
return true;
}
@@ -114,7 +114,7 @@ namespace treeview {
virtual void SAL_CALL
addChangesListener(
const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener )
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
// read only
(void)aListener;
@@ -123,7 +123,7 @@ namespace treeview {
virtual void SAL_CALL
removeChangesListener(
const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener )
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
// read only
(void)aListener;
@@ -132,13 +132,13 @@ namespace treeview {
// XComponent
virtual void SAL_CALL dispose( )
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
}
virtual void SAL_CALL addEventListener(
const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
(void)xListener;
}
@@ -146,7 +146,7 @@ namespace treeview {
virtual void SAL_CALL
removeEventListener(
const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
- throw( com::sun::star::uno::RuntimeException )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
{
(void)aListener;
}
@@ -158,26 +158,26 @@ namespace treeview {
getByName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException) = 0;
+ com::sun::star::uno::RuntimeException, std::exception) = 0;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
- throw( com::sun::star::uno::RuntimeException ) = 0;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) = 0;
virtual sal_Bool SAL_CALL
hasByName( const OUString& aName )
- throw( com::sun::star::uno::RuntimeException ) = 0;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) = 0;
// XHierarchicalNameAccess
virtual com::sun::star::uno::Any SAL_CALL
getByHierarchicalName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
- com::sun::star::uno::RuntimeException ) = 0;
+ com::sun::star::uno::RuntimeException, std::exception ) = 0;
virtual sal_Bool SAL_CALL
hasByHierarchicalName( const OUString& aName )
- throw( com::sun::star::uno::RuntimeException ) = 0;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) = 0;
}; // end class TVBase
@@ -197,26 +197,26 @@ namespace treeview {
getByName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL
hasByName( const OUString& aName )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XHierarchicalNameAccess
virtual com::sun::star::uno::Any SAL_CALL
getByHierarchicalName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL
hasByHierarchicalName( const OUString& aName )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
private:
@@ -241,26 +241,26 @@ namespace treeview {
getByName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL
hasByName( const OUString& aName )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XHierarchicalNameAccess
virtual com::sun::star::uno::Any SAL_CALL
getByHierarchicalName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Bool SAL_CALL
hasByHierarchicalName( const OUString& aName )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
private:
std::vector< rtl::Reference< TVRead > > Elements;
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
index 7db8eccb6f2e..a71a589eb65f 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
@@ -93,7 +93,7 @@ BufferedInputStream::~BufferedInputStream()
}
-Any SAL_CALL BufferedInputStream::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL BufferedInputStream::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
{
Any aRet = ::cppu::queryInterface( rType,
(static_cast< XInputStream* >(this)),
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL BufferedInputStream::readBytes( Sequence< sal_Int8 >& aData,s
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException)
+ RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
@@ -146,7 +146,7 @@ sal_Int32 SAL_CALL BufferedInputStream::readSomeBytes(
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException)
+ RuntimeException, std::exception)
{
return readBytes(aData,nMaxBytesToRead);
}
@@ -157,7 +157,7 @@ void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
try
{
@@ -174,7 +174,7 @@ void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip )
sal_Int32 SAL_CALL BufferedInputStream::available( void )
throw( NotConnectedException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_nBufferSize-m_nBufferLocation;
@@ -185,7 +185,7 @@ sal_Int32 SAL_CALL BufferedInputStream::available( void )
void SAL_CALL BufferedInputStream::closeInput( void )
throw( NotConnectedException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
}
@@ -193,7 +193,7 @@ void SAL_CALL BufferedInputStream::closeInput( void )
void SAL_CALL BufferedInputStream::seek( sal_Int64 location )
throw( IllegalArgumentException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
if( 0 <= location && location < m_nBufferSize )
{
@@ -208,7 +208,7 @@ void SAL_CALL BufferedInputStream::seek( sal_Int64 location )
sal_Int64 SAL_CALL BufferedInputStream::getPosition( void )
throw( IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_nBufferLocation;
@@ -216,7 +216,7 @@ sal_Int64 SAL_CALL BufferedInputStream::getPosition( void )
-sal_Int64 SAL_CALL BufferedInputStream::getLength( void ) throw( IOException,RuntimeException )
+sal_Int64 SAL_CALL BufferedInputStream::getLength( void ) throw( IOException,RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_nBufferSize;
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
index 9a57abe55dc8..3aae36880ebd 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
@@ -46,7 +46,7 @@ namespace chelp {
virtual com::sun::star::uno::Any SAL_CALL
queryInterface( const com::sun::star::uno::Type& rType )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL acquire( void ) throw();
@@ -58,43 +58,43 @@ namespace chelp {
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL available( void )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL closeInput( void )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL seek( sal_Int64 location )
throw( com::sun::star::lang::IllegalArgumentException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL getPosition( void )
throw( com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL getLength( void )
throw( com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
};
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 42139af1a21d..f42b45109744 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -87,7 +87,7 @@ void SAL_CALL Content::release()
// virtual
uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
- throw ( uno::RuntimeException )
+ throw ( uno::RuntimeException, std::exception )
{
uno::Any aRet;
return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
@@ -99,7 +99,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
// virtual
uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
static cppu::OTypeCollection* pCollection = NULL;
@@ -130,14 +130,14 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
// virtual
OUString SAL_CALL Content::getImplementationName()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return OUString( "CHelpContent" );
}
// virtual
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = MYUCP_CONTENT_SERVICE_NAME ;
@@ -148,7 +148,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
// virtual
OUString SAL_CALL Content::getContentType()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return OUString( MYUCP_CONTENT_TYPE );
}
@@ -157,7 +157,7 @@ OUString SAL_CALL Content::getContentType()
//virtual
void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
}
@@ -258,7 +258,7 @@ uno::Any SAL_CALL Content::execute(
const uno::Reference< ucb::XCommandEnvironment >& Environment )
throw( uno::Exception,
ucb::CommandAbortedException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
uno::Any aRet;
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 13f0515a3ca7..25f0ef194478 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -73,16 +73,16 @@ namespace chelp
// XServiceInfo
virtual OUString SAL_CALL
getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception );
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception );
// XContent
virtual OUString SAL_CALL
getContentType()
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XCommandProcessor
virtual com::sun::star::uno::Any SAL_CALL
@@ -92,11 +92,11 @@ namespace chelp
com::sun::star::ucb::XCommandEnvironment >& Environment )
throw( com::sun::star::uno::Exception,
com::sun::star::ucb::CommandAbortedException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL
abort( sal_Int32 CommandId )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
private:
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index 33d8556ebdc6..10f23d156196 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -50,7 +50,7 @@ bool SAL_CALL XInputStream_impl::CtorSuccess()
uno::Any SAL_CALL
XInputStream_impl::queryInterface(
const uno::Type& rType )
- throw( uno::RuntimeException)
+ throw( uno::RuntimeException, std::exception)
{
uno::Any aRet = cppu::queryInterface( rType,
(static_cast< io::XInputStream* >(this)),
@@ -85,7 +85,7 @@ XInputStream_impl::readBytes(
throw( io::NotConnectedException,
io::BufferSizeExceededException,
io::IOException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( ! m_bIsOpen )
throw io::IOException();
@@ -112,7 +112,7 @@ XInputStream_impl::readSomeBytes(
throw( io::NotConnectedException,
io::BufferSizeExceededException,
io::IOException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
return readBytes( aData,nMaxBytesToRead );
}
@@ -124,7 +124,7 @@ XInputStream_impl::skipBytes(
throw( io::NotConnectedException,
io::BufferSizeExceededException,
io::IOException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None)
{
@@ -139,7 +139,7 @@ XInputStream_impl::available(
void )
throw( io::NotConnectedException,
io::IOException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
return 0;
}
@@ -150,7 +150,7 @@ XInputStream_impl::closeInput(
void )
throw( io::NotConnectedException,
io::IOException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
if( m_bIsOpen )
{
@@ -167,7 +167,7 @@ XInputStream_impl::seek(
sal_Int64 location )
throw( lang::IllegalArgumentException,
io::IOException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
if( location < 0 )
throw lang::IllegalArgumentException();
@@ -180,7 +180,7 @@ sal_Int64 SAL_CALL
XInputStream_impl::getPosition(
void )
throw( io::IOException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
sal_uInt64 uPos;
if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
@@ -192,7 +192,7 @@ sal_Int64 SAL_CALL
XInputStream_impl::getLength(
void )
throw( io::IOException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
osl::FileBase::RC err;
sal_uInt64 uCurrentPos, uEndPos;
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index 192f38042663..ea43a663d4f0 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -53,7 +53,7 @@ namespace chelp {
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(
const com::sun::star::uno::Type& rType )
- throw( com::sun::star::uno::RuntimeException);
+ throw( com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
acquire(
@@ -72,7 +72,7 @@ namespace chelp {
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL
readSomeBytes(
@@ -81,7 +81,7 @@ namespace chelp {
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
skipBytes(
@@ -89,40 +89,40 @@ namespace chelp {
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL
available(
void )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL
closeInput(
void )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL
seek(
sal_Int64 location )
throw( com::sun::star::lang::IllegalArgumentException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL
getPosition(
void )
throw( com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
virtual sal_Int64 SAL_CALL
getLength(
void )
throw( com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException );
+ com::sun::star::uno::RuntimeException, std::exception );
private:
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 371760c95702..3bc85c880702 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -83,7 +83,7 @@ XTYPEPROVIDER_IMPL_5( ContentProvider,
// XServiceInfo methods.
OUString SAL_CALL ContentProvider::getImplementationName()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
@@ -95,14 +95,14 @@ OUString ContentProvider::getImplementationName_Static()
sal_Bool SAL_CALL
ContentProvider::supportsService(const OUString& ServiceName )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL
ContentProvider::getSupportedServiceNames()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
@@ -141,7 +141,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
uno::Reference< ucb::XContent > SAL_CALL
ContentProvider::queryContent(
const uno::Reference< ucb::XContentIdentifier >& xCanonicId )
- throw( ucb::IllegalIdentifierException, uno::RuntimeException )
+ throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
{
if ( !xCanonicId->getContentProviderScheme()
.equalsIgnoreAsciiCase( m_aScheme ) )
@@ -179,7 +179,7 @@ ContentProvider::queryContent(
void SAL_CALL
ContentProvider::dispose()
- throw ( uno::RuntimeException)
+ throw ( uno::RuntimeException, std::exception)
{
if(m_xContainer.is())
{
@@ -190,7 +190,7 @@ ContentProvider::dispose()
void SAL_CALL
ContentProvider::elementReplaced(const container::ContainerEvent& Event)
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if(!m_pDatabases)
return;
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 9d3068947c42..5e84122dd0e7 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -75,7 +75,7 @@ namespace chelp {
queryContent( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier )
throw( ::com::sun::star::ucb::IllegalIdentifierException,
- ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::RuntimeException, std::exception );
// Additional interfaces
@@ -83,18 +83,18 @@ namespace chelp {
virtual void SAL_CALL
dispose( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
(void)xListener;
}
virtual void SAL_CALL
removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
(void)aListener;
}
@@ -103,7 +103,7 @@ namespace chelp {
virtual void SAL_CALL
disposing( const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
(void)Source;
m_xContainer = com::sun::star::uno::Reference<com::sun::star::container::XContainer>(0);
@@ -111,21 +111,21 @@ namespace chelp {
virtual void SAL_CALL
elementInserted( const ::com::sun::star::container::ContainerEvent& Event )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
(void)Event;
}
virtual void SAL_CALL
elementRemoved( const ::com::sun::star::container::ContainerEvent& Event )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
(void)Event;
}
virtual void SAL_CALL
elementReplaced( const ::com::sun::star::container::ContainerEvent& Event )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// Non-interface methods.
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 9cd9cf2e8ae1..d0eabfb071d7 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -82,7 +82,7 @@ ResultSetBase::release(
uno::Any SAL_CALL
ResultSetBase::queryInterface(
const uno::Type& rType )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XComponent* >(this)),
@@ -102,7 +102,7 @@ ResultSetBase::queryInterface(
void SAL_CALL
ResultSetBase::addEventListener(
const uno::Reference< lang::XEventListener >& Listener )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -117,7 +117,7 @@ ResultSetBase::addEventListener(
void SAL_CALL
ResultSetBase::removeEventListener(
const uno::Reference< lang::XEventListener >& Listener )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -129,7 +129,7 @@ ResultSetBase::removeEventListener(
void SAL_CALL
ResultSetBase::dispose()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -158,7 +158,7 @@ sal_Bool SAL_CALL
ResultSetBase::next(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
sal_Bool test;
m_nRow++;
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL
ResultSetBase::isBeforeFirst(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
return m_nRow == -1;
}
@@ -184,7 +184,7 @@ sal_Bool SAL_CALL
ResultSetBase::isAfterLast(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
return sal::static_int_cast<sal_uInt32>( m_nRow ) >= m_aItems.size(); // Cannot happen, if m_aFolder.isOpen()
}
@@ -194,7 +194,7 @@ sal_Bool SAL_CALL
ResultSetBase::isFirst(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
return m_nRow == 0;
}
@@ -204,7 +204,7 @@ sal_Bool SAL_CALL
ResultSetBase::isLast(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( sal::static_int_cast<sal_uInt32>( m_nRow ) == m_aItems.size() - 1 )
return true;
@@ -217,7 +217,7 @@ void SAL_CALL
ResultSetBase::beforeFirst(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
m_nRow = -1;
}
@@ -227,7 +227,7 @@ void SAL_CALL
ResultSetBase::afterLast(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
m_nRow = m_aItems.size();
}
@@ -237,7 +237,7 @@ sal_Bool SAL_CALL
ResultSetBase::first(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
m_nRow = -1;
return next();
@@ -248,7 +248,7 @@ sal_Bool SAL_CALL
ResultSetBase::last(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
m_nRow = m_aItems.size() - 1;
return true;
@@ -259,7 +259,7 @@ sal_Int32 SAL_CALL
ResultSetBase::getRow(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
// Test, whether behind last row
if( -1 == m_nRow || sal::static_int_cast<sal_uInt32>( m_nRow ) >= m_aItems.size() )
@@ -270,7 +270,7 @@ ResultSetBase::getRow(
sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
- throw( sdbc::SQLException, uno::RuntimeException)
+ throw( sdbc::SQLException, uno::RuntimeException, std::exception)
{
if( row >= 0 )
m_nRow = row - 1;
@@ -292,7 +292,7 @@ sal_Bool SAL_CALL
ResultSetBase::relative(
sal_Int32 row )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( isAfterLast() || isBeforeFirst() )
throw sdbc::SQLException();
@@ -313,7 +313,7 @@ sal_Bool SAL_CALL
ResultSetBase::previous(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( sal::static_int_cast<sal_uInt32>( m_nRow ) > m_aItems.size() )
m_nRow = m_aItems.size(); // Correct Handling of afterLast
@@ -327,7 +327,7 @@ void SAL_CALL
ResultSetBase::refreshRow(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
}
@@ -336,7 +336,7 @@ sal_Bool SAL_CALL
ResultSetBase::rowUpdated(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
return false;
}
@@ -345,7 +345,7 @@ sal_Bool SAL_CALL
ResultSetBase::rowInserted(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
return false;
}
@@ -354,7 +354,7 @@ sal_Bool SAL_CALL
ResultSetBase::rowDeleted(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
return false;
}
@@ -364,7 +364,7 @@ uno::Reference< uno::XInterface > SAL_CALL
ResultSetBase::getStatement(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
uno::Reference< uno::XInterface > test( 0 );
return test;
@@ -377,7 +377,7 @@ void SAL_CALL
ResultSetBase::close(
void )
throw( sdbc::SQLException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
}
@@ -385,7 +385,7 @@ ResultSetBase::close(
OUString SAL_CALL
ResultSetBase::queryContentIdentifierString(
void )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aPath[m_nRow];
@@ -397,7 +397,7 @@ ResultSetBase::queryContentIdentifierString(
uno::Reference< ucb::XContentIdentifier > SAL_CALL
ResultSetBase::queryContentIdentifier(
void )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
{
@@ -415,7 +415,7 @@ ResultSetBase::queryContentIdentifier(
uno::Reference< ucb::XContent > SAL_CALL
ResultSetBase::queryContent(
void )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_xProvider->queryContent( queryContentIdentifier() );
@@ -450,7 +450,7 @@ public:
}
uno::Any SAL_CALL queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
uno::Any aRet = cppu::queryInterface( rType,
(static_cast< beans::XPropertySetInfo* >(this)) );
@@ -458,14 +458,14 @@ public:
}
uno::Sequence< beans::Property > SAL_CALL getProperties()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return m_aSeq;
}
beans::Property SAL_CALL getPropertyByName( const OUString& aName )
throw( beans::UnknownPropertyException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
if( aName == m_aSeq[i].Name )
@@ -474,7 +474,7 @@ public:
}
sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
if( Name == m_aSeq[i].Name )
@@ -492,7 +492,7 @@ private:
// XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL
ResultSetBase::getPropertySetInfo()
- throw( uno::RuntimeException)
+ throw( uno::RuntimeException, std::exception)
{
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
@@ -517,7 +517,7 @@ void SAL_CALL ResultSetBase::setPropertyValue(
beans::PropertyVetoException,
lang::IllegalArgumentException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
(void)aValue;
@@ -533,7 +533,7 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
const OUString& PropertyName )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( PropertyName == "IsRowCountFinal" )
{
@@ -558,7 +558,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& xListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" )
{
@@ -587,7 +587,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& aListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" &&
m_pIsFinalListeners )
@@ -611,7 +611,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& aListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
(void)PropertyName;
(void)aListener;
@@ -623,7 +623,7 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& aListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
(void)PropertyName;
(void)aListener;
@@ -636,7 +636,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
ResultSetBase::getMetaData(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException, std::exception )
{
::ucbhelper::ResultSetMetaData* p =
new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index f74f023a2d5b..524ab7b85516 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -62,7 +62,7 @@ namespace chelp {
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(
const com::sun::star::uno::Type& aType )
- throw( com::sun::star::uno::RuntimeException);
+ throw( com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
acquire(
@@ -78,16 +78,16 @@ namespace chelp {
virtual void SAL_CALL
dispose(
void )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL
addEventListener(
const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual void SAL_CALL
removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XRow
@@ -95,7 +95,7 @@ namespace chelp {
wasNull(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException )
+ com::sun::star::uno::RuntimeException, std::exception )
{
if( 0<= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -108,7 +108,7 @@ namespace chelp {
getString(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getString( columnIndex );
@@ -120,7 +120,7 @@ namespace chelp {
getBoolean(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -132,7 +132,7 @@ namespace chelp {
getByte(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getByte( columnIndex );
@@ -145,7 +145,7 @@ namespace chelp {
sal_Int32 columnIndex )
throw(
com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getShort( columnIndex );
@@ -157,7 +157,7 @@ namespace chelp {
getInt(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException )
+ com::sun::star::uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getInt( columnIndex );
@@ -169,7 +169,7 @@ namespace chelp {
getLong(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getLong( columnIndex );
@@ -181,7 +181,7 @@ namespace chelp {
getFloat(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException )
+ com::sun::star::uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -193,7 +193,7 @@ namespace chelp {
getDouble(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException )
+ com::sun::star::uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -205,7 +205,7 @@ namespace chelp {
getBytes(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException )
+ com::sun::star::uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -217,7 +217,7 @@ namespace chelp {
getDate(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getDate( columnIndex );
@@ -229,7 +229,7 @@ namespace chelp {
getTime(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getTime( columnIndex );
@@ -241,7 +241,7 @@ namespace chelp {
getTimestamp(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -253,7 +253,7 @@ namespace chelp {
getBinaryStream(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -265,7 +265,7 @@ namespace chelp {
getCharacterStream(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -278,7 +278,7 @@ namespace chelp {
sal_Int32 columnIndex,
const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -290,7 +290,7 @@ namespace chelp {
getRef(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getRef( columnIndex );
@@ -302,7 +302,7 @@ namespace chelp {
getBlob(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -314,7 +314,7 @@ namespace chelp {
getClob(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getClob( columnIndex );
@@ -326,7 +326,7 @@ namespace chelp {
getArray(
sal_Int32 columnIndex )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException)
+ com::sun::star::uno::RuntimeException, std::exception)
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getArray( columnIndex );
@@ -341,110 +341,110 @@ namespace chelp {
next(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
isBeforeFirst(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
isAfterLast(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
isFirst(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
isLast(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
beforeFirst(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
afterLast(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
first(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
last(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL
getRow(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
absolute(
sal_Int32 row )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
relative(
sal_Int32 rows )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
previous(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
refreshRow(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
rowUpdated(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
rowInserted(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
rowDeleted(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
getStatement(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
// XCloseable
@@ -452,37 +452,37 @@ namespace chelp {
close(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
// XContentAccess
virtual OUString SAL_CALL
queryContentIdentifierString(
void )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
queryContentIdentifier(
void )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
queryContent(
void )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XResultSetMetaDataSupplier
virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL
getMetaData(
void )
throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
// XPropertySet
virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw( com::sun::star::uno::RuntimeException);
+ throw( com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL setPropertyValue(
const OUString& aPropertyName,
@@ -491,14 +491,14 @@ namespace chelp {
com::sun::star::beans::PropertyVetoException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Any SAL_CALL
getPropertyValue(
const OUString& PropertyName )
throw( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
addPropertyChangeListener(
@@ -506,7 +506,7 @@ namespace chelp {
const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener )
throw( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
removePropertyChangeListener(
@@ -514,7 +514,7 @@ namespace chelp {
const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener )
throw( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL
addVetoableChangeListener(
@@ -522,14 +522,14 @@ namespace chelp {
const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
throw( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& PropertyName,
const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
throw( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
protected:
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 5a73ba1f6a6d..ac827c1360aa 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -331,7 +331,7 @@ public:
~InputStreamTransformer();
- virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException );
+ virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception );
virtual void SAL_CALL acquire( void ) throw();
virtual void SAL_CALL release( void ) throw();
@@ -339,34 +339,34 @@ public:
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException);
+ RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException);
+ RuntimeException, std::exception);
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException );
+ RuntimeException, std::exception );
virtual sal_Int32 SAL_CALL available( void ) throw( NotConnectedException,
IOException,
- RuntimeException );
+ RuntimeException, std::exception );
virtual void SAL_CALL closeInput( void ) throw( NotConnectedException,
IOException,
- RuntimeException );
+ RuntimeException, std::exception );
virtual void SAL_CALL seek( sal_Int64 location ) throw( IllegalArgumentException,
IOException,
- RuntimeException );
+ RuntimeException, std::exception );
- virtual sal_Int64 SAL_CALL getPosition( void ) throw( IOException,RuntimeException );
+ virtual sal_Int64 SAL_CALL getPosition( void ) throw( IOException,RuntimeException, std::exception );
- virtual sal_Int64 SAL_CALL getLength( void ) throw( IOException,RuntimeException );
+ virtual sal_Int64 SAL_CALL getLength( void ) throw( IOException,RuntimeException, std::exception );
void addToBuffer( const char* buffer,int len );
@@ -1015,7 +1015,7 @@ InputStreamTransformer::~InputStreamTransformer()
}
-Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
{
Any aRet = ::cppu::queryInterface( rType,
(static_cast< XInputStream* >(this)),
@@ -1044,7 +1044,7 @@ sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aDat
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException)
+ RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
@@ -1068,7 +1068,7 @@ sal_Int32 SAL_CALL InputStreamTransformer::readSomeBytes( Sequence< sal_Int8 >&
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException)
+ RuntimeException, std::exception)
{
return readBytes( aData,nMaxBytesToRead );
}
@@ -1078,7 +1078,7 @@ sal_Int32 SAL_CALL InputStreamTransformer::readSomeBytes( Sequence< sal_Int8 >&
void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
BufferSizeExceededException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
while( nBytesToSkip-- ) ++pos;
@@ -1088,7 +1088,7 @@ void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw(
sal_Int32 SAL_CALL InputStreamTransformer::available( void ) throw( NotConnectedException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return len-pos > 0 ? len - pos : 0 ;
@@ -1098,7 +1098,7 @@ sal_Int32 SAL_CALL InputStreamTransformer::available( void ) throw( NotConnected
void SAL_CALL InputStreamTransformer::closeInput( void ) throw( NotConnectedException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
}
@@ -1106,7 +1106,7 @@ void SAL_CALL InputStreamTransformer::closeInput( void ) throw( NotConnectedExce
void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalArgumentException,
IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
if( location < 0 )
@@ -1121,7 +1121,7 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA
sal_Int64 SAL_CALL InputStreamTransformer::getPosition( void ) throw( IOException,
- RuntimeException )
+ RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return sal_Int64( pos );
@@ -1129,7 +1129,7 @@ sal_Int64 SAL_CALL InputStreamTransformer::getPosition( void ) throw( IOExceptio
-sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,RuntimeException )
+sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
generated by cgit (git 2.34.1) at 2024-12-26 21:52:49 +0000