summaryrefslogtreecommitdiff
path: root/package/source/zippackage/ZipPackage.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'package/source/zippackage/ZipPackage.cxx')
-rw-r--r--package/source/zippackage/ZipPackage.cxx41
1 files changed, 7 insertions, 34 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 83b3a82c37c1..a28507852493 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -110,35 +110,28 @@ class ActiveDataStreamer : public ::cppu::WeakImplHelper< XActiveDataStreamer >
uno::Reference< XStream > mStream;
public:
- virtual uno::Reference< XStream > SAL_CALL getStream()
- throw( RuntimeException, std::exception ) override
+ virtual uno::Reference< XStream > SAL_CALL getStream() override
{ return mStream; }
- virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream )
- throw( RuntimeException, std::exception ) override
+ virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream ) override
{ mStream = stream; }
};
class DummyInputStream : public ::cppu::WeakImplHelper< XInputStream >
{
- virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 )
- throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+ virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) override
{ return 0; }
- virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 )
- throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+ virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) override
{ return 0; }
- virtual void SAL_CALL skipBytes( sal_Int32 )
- throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+ virtual void SAL_CALL skipBytes( sal_Int32 ) override
{}
- virtual sal_Int32 SAL_CALL available()
- throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+ virtual sal_Int32 SAL_CALL available() override
{ return 0; }
- virtual void SAL_CALL closeInput()
- throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+ virtual void SAL_CALL closeInput() override
{}
};
@@ -555,7 +548,6 @@ void ZipPackage::getZipFileContents()
}
void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
- throw( Exception, RuntimeException, std::exception )
{
uno::Reference< XProgressHandler > xProgressHandler;
beans::NamedValue aNamedValue;
@@ -771,7 +763,6 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
}
Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
- throw( NoSuchElementException, RuntimeException, std::exception )
{
OUString sTemp, sDirName;
sal_Int32 nOldIndex, nStreamIndex;
@@ -865,7 +856,6 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
}
sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
- throw( RuntimeException, std::exception )
{
OUString sTemp, sDirName;
sal_Int32 nOldIndex, nStreamIndex;
@@ -959,14 +949,12 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
}
uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance()
- throw( Exception, RuntimeException, std::exception )
{
uno::Reference < XInterface > xRef = *( new ZipPackageStream( *this, m_xContext, m_nFormat, m_bAllowRemoveOnInsert ) );
return xRef;
}
uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const uno::Sequence< Any >& aArguments )
- throw( Exception, RuntimeException, std::exception )
{
bool bArg = false;
uno::Reference < XInterface > xRef;
@@ -1372,7 +1360,6 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
}
void SAL_CALL ZipPackage::commitChanges()
- throw( WrappedTargetException, RuntimeException, std::exception )
{
// lock the component for the time of committing
::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
@@ -1610,12 +1597,10 @@ const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
}
sal_Bool SAL_CALL ZipPackage::hasPendingChanges()
- throw( RuntimeException, std::exception )
{
return false;
}
Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges()
- throw( RuntimeException, std::exception )
{
return uno::Sequence < ElementChange > ();
}
@@ -1642,19 +1627,16 @@ Sequence< OUString > ZipPackage::static_getSupportedServiceNames()
}
OUString ZipPackage::getImplementationName()
- throw ( RuntimeException, std::exception )
{
return static_getImplementationName();
}
Sequence< OUString > ZipPackage::getSupportedServiceNames()
- throw ( RuntimeException, std::exception )
{
return static_getSupportedServiceNames();
}
sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName )
- throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
@@ -1670,14 +1652,12 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::
namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId()
- throw ( RuntimeException )
{
::cppu::OImplementationId &rId = lcl_ImplId::get();
return rId.getImplementationId();
}
sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier )
- throw( RuntimeException, std::exception )
{
if ( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), aIdentifier.getConstArray(), 16 ) )
return reinterpret_cast < sal_Int64 > ( this );
@@ -1685,13 +1665,11 @@ sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aI
}
uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo()
- throw( RuntimeException, std::exception )
{
return uno::Reference < XPropertySetInfo > ();
}
void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
- throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
{
if ( m_nFormat != embed::StorageFormats::PACKAGE )
throw UnknownPropertyException(THROW_WHERE );
@@ -1787,7 +1765,6 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
}
Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
- throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
{
// TODO/LATER: Activate the check when zip-ucp is ready
// if ( m_nFormat != embed::StorageFormats::PACKAGE )
@@ -1828,19 +1805,15 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
throw UnknownPropertyException(THROW_WHERE );
}
void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
- throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
{
}
void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ )
- throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
{
}
void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
- throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
{
}
void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
- throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
{
}