summaryrefslogtreecommitdiff
path: root/dbaccess/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/filter')
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx36
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx20
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx7
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx9
5 files changed, 34 insertions, 42 deletions
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index bade845ff55a..4a53e8377dc0 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -100,9 +100,9 @@ public:
explicit DBTypeDetection(const Reference< XComponentContext >&);
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw(std::exception ) override;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override;
- Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// static methods
static OUString getImplementationName_Static() throw( )
@@ -113,7 +113,7 @@ public:
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
- virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
};
DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContext)
@@ -121,7 +121,7 @@ DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContex
{
}
-OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor )
{
try
{
@@ -188,19 +188,19 @@ Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMult
}
// XServiceInfo
-OUString SAL_CALL DBTypeDetection::getImplementationName() throw(std::exception )
+OUString SAL_CALL DBTypeDetection::getImplementationName()
{
return getImplementationName_Static();
}
// XServiceInfo
-sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName) throw(std::exception )
+sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
-Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames() throw(std::exception )
+Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames()
{
return getSupportedServiceNames_Static();
}
@@ -235,9 +235,9 @@ public:
explicit DBContentLoader(const Reference< XComponentContext >&);
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw(std::exception ) override;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override;
- Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// static methods
static OUString getImplementationName_Static() throw( )
@@ -251,8 +251,8 @@ public:
// XLoader
virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
const Sequence< PropertyValue >& _rArgs,
- const Reference< XLoadEventListener > & _rListener) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL cancel() throw(std::exception) override;
+ const Reference< XLoadEventListener > & _rListener) override;
+ virtual void SAL_CALL cancel() override;
private:
bool impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, bool& _bShouldStartTableWizard );
@@ -272,19 +272,19 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult
}
// XServiceInfo
-OUString SAL_CALL DBContentLoader::getImplementationName() throw(std::exception )
+OUString SAL_CALL DBContentLoader::getImplementationName()
{
return getImplementationName_Static();
}
// XServiceInfo
-sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) throw(std::exception )
+sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
-Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames() throw(std::exception )
+Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames()
{
return getSupportedServiceNames_Static();
}
@@ -367,7 +367,7 @@ bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _rxMod
void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& _rURL,
const Sequence< PropertyValue >& rArgs,
- const Reference< XLoadEventListener > & rListener) throw(css::uno::RuntimeException, std::exception)
+ const Reference< XLoadEventListener > & rListener)
{
// first check if preview is true, if so return with out creating a controller. Preview is not supported
::comphelper::NamedValueCollection aMediaDesc( rArgs );
@@ -550,7 +550,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
::comphelper::disposeComponent(xModel);
}
-void DBContentLoader::cancel() throw(std::exception)
+void DBContentLoader::cancel()
{
}
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 069e1a97b692..8f096cb437a6 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -68,18 +68,18 @@ namespace dbaxml
{
public:
/// @throws RuntimeException
- static OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
+ static OUString SAL_CALL getImplementationName_Static( );
/// @throws RuntimeException
- static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
+ static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
};
class ODBFullExportHelper
{
public:
/// @throws RuntimeException
- static OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
+ static OUString SAL_CALL getImplementationName_Static( );
/// @throws RuntimeException
- static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
+ static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
};
}
@@ -112,12 +112,12 @@ namespace dbaxml
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY ));
}
- OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString SAL_CALL ODBExportHelper::getImplementationName_Static( )
{
return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
}
- Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( )
{
Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
return aSupported;
@@ -127,11 +127,11 @@ namespace dbaxml
{
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::ALL));
}
- OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( )
{
return OUString("com.sun.star.comp.sdb.XMLFullExporter");
}
- Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( )
{
Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
return aSupported;
@@ -253,13 +253,11 @@ ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString
}
OUString ODBExport::getImplementationName_Static()
- throw (css::uno::RuntimeException)
{
return OUString("com.sun.star.comp.sdb.DBExportFilter");
}
css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static()
- throw (css::uno::RuntimeException)
{
css::uno::Sequence<OUString> s { "com.sun.star.document.ExportFilter" };
return s;
@@ -1387,7 +1385,7 @@ SvXMLAutoStylePoolP* ODBExport::CreateAutoStylePool()
return new OXMLAutoStylePoolP(*this);
}
-void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc )
{
Reference<XOfficeDatabaseDocument> xOfficeDoc(xDoc,UNO_QUERY_THROW);
m_xDataSource.set(xOfficeDoc->getDataSource(),UNO_QUERY_THROW);
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index c0c6904f85e1..840ea95c8f0a 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -172,12 +172,11 @@ public:
ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS );
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL getImplementationName_Static()
- throw (css::uno::RuntimeException);
+ static OUString SAL_CALL getImplementationName_Static();
/// @throws css::uno::RuntimeException
static css::uno::Sequence<OUString> SAL_CALL
- getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
+ getSupportedServiceNames_Static();
static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
@@ -186,7 +185,7 @@ public:
rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const;
// XExporter
- virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
const Reference<XPropertySet>& getDataSource() const { return m_xDataSource; }
};
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 134ad6492982..04197f605f34 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -224,14 +224,12 @@ ODBFilter::~ODBFilter() throw()
OUString ODBFilter::getImplementationName_Static()
- throw (css::uno::RuntimeException)
{
return OUString("com.sun.star.comp.sdb.DBFilter");
}
css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
- throw (css::uno::RuntimeException)
{
css::uno::Sequence<OUString> s { "com.sun.star.document.ImportFilter" };
return s;
@@ -246,7 +244,6 @@ css::uno::Reference< css::uno::XInterface >
sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor )
- throw (RuntimeException, std::exception)
{
uno::Reference< css::awt::XWindow > xWindow;
{
@@ -274,7 +271,6 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
- throw (RuntimeException, std::exception)
{
OUString sFileName;
::comphelper::NamedValueCollection aMediaDescriptor( rDescriptor );
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 133a61d33fa7..171320c6fac3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -82,7 +82,7 @@ private:
bool m_bNewFormat;
/// @throws RuntimeException
- bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
+ bool implImport( const Sequence< PropertyValue >& rDescriptor );
/** fills the map with the Properties
@param _rValue
@@ -107,15 +107,14 @@ public:
explicit ODBFilter( const Reference< XComponentContext >& _rxContext );
// XFilter
- virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL getImplementationName_Static()
- throw (css::uno::RuntimeException);
+ static OUString SAL_CALL getImplementationName_Static();
/// @throws css::uno::RuntimeException
static css::uno::Sequence<OUString> SAL_CALL
- getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
+ getSupportedServiceNames_Static();
static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
generated by cgit (git 2.34.1) at 2024-08-16 05:41:03 +0000