diff options
Diffstat (limited to 'writerperfect')
47 files changed, 82 insertions, 246 deletions
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index fa8f931924d2..0993d4a9f62a 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -70,8 +70,7 @@ public: } // XFilter - virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) override { utl::MediaDescriptor aDescriptor(rDescriptor); css::uno::Reference < css::io::XInputStream > xInputStream; @@ -106,8 +105,7 @@ public: return this->doImportDocument(input, exporter, aDescriptor); } - virtual void SAL_CALL cancel() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL cancel() override { } @@ -116,15 +114,13 @@ public: { return mxDoc; } - virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) override { mxDoc = xDoc; } //XExtendedFilterDetection - 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 { OUString sTypeName; sal_Int32 nLength = Descriptor.getLength(); @@ -161,8 +157,7 @@ public: } // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) override { css::uno::Sequence < css::beans::PropertyValue > aAnySeq; sal_Int32 nLength = aArguments.getLength(); diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 1c80fa79bcf7..6cb6fe88e06f 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -237,7 +237,6 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp //XExtendedFilterDetection sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) -throw (css::uno::RuntimeException, std::exception) { OUString sUrl; css::uno::Reference < css::io::XInputStream > xInputStream; @@ -379,19 +378,16 @@ void MSWorksCalcImportFilter::doRegisterHandlers(OdsGenerator &) // XServiceInfo OUString SAL_CALL MSWorksCalcImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Calc.MSWorksCalcImportFilter"); } sal_Bool SAL_CALL MSWorksCalcImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MSWorksCalcImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx index c209f6f9f3a9..725465c71287 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx @@ -27,16 +27,12 @@ public: : writerperfect::ImportFilter<OdsGenerator>(rxContext) {} // 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; //XFilter - virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) override; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &) override; diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx index 63f1c278bdb8..904b58351bf7 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx @@ -99,19 +99,16 @@ void MWAWCalcImportFilter::doRegisterHandlers(OdsGenerator &rGenerator) // XServiceInfo OUString SAL_CALL MWAWCalcImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Calc.MWAWCalcImportFilter"); } sal_Bool SAL_CALL MWAWCalcImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MWAWCalcImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.hxx b/writerperfect/source/calc/MWAWCalcImportFilter.hxx index 3a8979438010..c511e5115cae 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.hxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdsGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx b/writerperfect/source/calc/NumbersImportFilter.cxx index 568505e72283..f23397e94c56 100644 --- a/writerperfect/source/calc/NumbersImportFilter.cxx +++ b/writerperfect/source/calc/NumbersImportFilter.cxx @@ -46,19 +46,16 @@ void NumbersImportFilter::doRegisterHandlers(OdsGenerator &) // XServiceInfo OUString SAL_CALL NumbersImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Calc.NumbersImportFilter"); } sal_Bool SAL_CALL NumbersImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL NumbersImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/calc/NumbersImportFilter.hxx b/writerperfect/source/calc/NumbersImportFilter.hxx index f12226ff4200..dcbb2fe70002 100644 --- a/writerperfect/source/calc/NumbersImportFilter.hxx +++ b/writerperfect/source/calc/NumbersImportFilter.hxx @@ -26,12 +26,9 @@ public: : writerperfect::ImportFilter<OdsGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx index 5ed92db46dfc..d6b529a6c66f 100644 --- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx +++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx @@ -67,19 +67,16 @@ void StarOfficeCalcImportFilter::doRegisterHandlers(OdsGenerator &rGenerator) // XServiceInfo OUString SAL_CALL StarOfficeCalcImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter"); } sal_Bool SAL_CALL StarOfficeCalcImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL StarOfficeCalcImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; } diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx index bcf457fd5bae..d753df37d368 100644 --- a/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx +++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdsGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index 7c29a30db957..c2d9c39494d7 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -42,19 +42,16 @@ bool CDRImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri // XServiceInfo OUString SAL_CALL CDRImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.CDRImportFilter"); } sal_Bool SAL_CALL CDRImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL CDRImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx index 6fe957d019d5..8a99d49b6677 100644 --- a/writerperfect/source/draw/CDRImportFilter.hxx +++ b/writerperfect/source/draw/CDRImportFilter.hxx @@ -27,12 +27,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx index 3144ef758f02..28c24e0e2b8a 100644 --- a/writerperfect/source/draw/CMXImportFilter.cxx +++ b/writerperfect/source/draw/CMXImportFilter.cxx @@ -42,19 +42,16 @@ bool CMXImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri // XServiceInfo OUString SAL_CALL CMXImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.CMXImportFilter"); } sal_Bool SAL_CALL CMXImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL CMXImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx index c6e3fa66c84b..6bf66a6e9c34 100644 --- a/writerperfect/source/draw/CMXImportFilter.hxx +++ b/writerperfect/source/draw/CMXImportFilter.hxx @@ -27,12 +27,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx index e5a1fb955503..7d640c3fd83c 100644 --- a/writerperfect/source/draw/FreehandImportFilter.cxx +++ b/writerperfect/source/draw/FreehandImportFilter.cxx @@ -38,19 +38,16 @@ bool FreehandImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O // XServiceInfo OUString SAL_CALL FreehandImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.FreehandImportFilter"); } sal_Bool SAL_CALL FreehandImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL FreehandImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx index 4d974715c766..027d5e0b7e40 100644 --- a/writerperfect/source/draw/FreehandImportFilter.hxx +++ b/writerperfect/source/draw/FreehandImportFilter.hxx @@ -24,12 +24,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx index 03a3ff54a0f5..61cf0b557888 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.cxx +++ b/writerperfect/source/draw/MSPUBImportFilter.cxx @@ -38,19 +38,16 @@ bool MSPUBImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt // XServiceInfo OUString SAL_CALL MSPUBImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.MSPUBImportFilter"); } sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MSPUBImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx index 72bbe4daa2e0..5c65791fa317 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.hxx +++ b/writerperfect/source/draw/MSPUBImportFilter.hxx @@ -24,12 +24,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index f99c67e9df77..e8a7a3d3f9e0 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -91,19 +91,16 @@ void MWAWDrawImportFilter::doRegisterHandlers(OdgGenerator &rGenerator) // XServiceInfo OUString SAL_CALL MWAWDrawImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.MWAWDrawImportFilter"); } sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MWAWDrawImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx index 3cfa54bc82a1..2467a8d2e1ef 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdgGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx index a2ef7f8106c5..7f0c62857cf7 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.cxx +++ b/writerperfect/source/draw/PageMakerImportFilter.cxx @@ -40,19 +40,16 @@ bool PageMakerImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, // XServiceInfo OUString SAL_CALL PageMakerImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Draw.PageMakerImportFilter"); } sal_Bool SAL_CALL PageMakerImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL PageMakerImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence< OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/PageMakerImportFilter.hxx b/writerperfect/source/draw/PageMakerImportFilter.hxx index 93bcfeb3040c..d5e6f9ac7600 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.hxx +++ b/writerperfect/source/draw/PageMakerImportFilter.hxx @@ -24,12 +24,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx index bded190f5fda..7197d496a7b9 100644 --- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx +++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx @@ -69,19 +69,16 @@ void StarOfficeDrawImportFilter::doRegisterHandlers(OdgGenerator &rGenerator) // XServiceInfo OUString SAL_CALL StarOfficeDrawImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Draw.StarOfficeDrawImportFilter"); } sal_Bool SAL_CALL StarOfficeDrawImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL StarOfficeDrawImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; } diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx index 2fd9b7bb24e8..b6caf48b57e7 100644 --- a/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx +++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdgGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx index 9467035779ba..896fdacc4fb3 100644 --- a/writerperfect/source/draw/VisioImportFilter.cxx +++ b/writerperfect/source/draw/VisioImportFilter.cxx @@ -38,19 +38,16 @@ bool VisioImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt // XServiceInfo OUString SAL_CALL VisioImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.VisioImportFilter"); } sal_Bool SAL_CALL VisioImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL VisioImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx index 2183b28fef05..f842aded9946 100644 --- a/writerperfect/source/draw/VisioImportFilter.hxx +++ b/writerperfect/source/draw/VisioImportFilter.hxx @@ -24,12 +24,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx index dbac05dd7bd0..dadbd084e117 100644 --- a/writerperfect/source/draw/WPGImportFilter.cxx +++ b/writerperfect/source/draw/WPGImportFilter.cxx @@ -45,19 +45,16 @@ bool WPGImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri // XServiceInfo OUString SAL_CALL WPGImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.WPGImportFilter"); } sal_Bool SAL_CALL WPGImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx index 6be6ab90f038..c261d6154537 100644 --- a/writerperfect/source/draw/WPGImportFilter.hxx +++ b/writerperfect/source/draw/WPGImportFilter.hxx @@ -29,12 +29,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx index 8c6e0294eb4b..c5bfe12a9214 100644 --- a/writerperfect/source/draw/ZMFImportFilter.cxx +++ b/writerperfect/source/draw/ZMFImportFilter.cxx @@ -40,19 +40,16 @@ bool ZMFImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri // XServiceInfo OUString SAL_CALL ZMFImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Draw.ZMFImportFilter"); } sal_Bool SAL_CALL ZMFImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL ZMFImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; } diff --git a/writerperfect/source/draw/ZMFImportFilter.hxx b/writerperfect/source/draw/ZMFImportFilter.hxx index a5eb9f20b0f5..4a8036e0f090 100644 --- a/writerperfect/source/draw/ZMFImportFilter.hxx +++ b/writerperfect/source/draw/ZMFImportFilter.hxx @@ -24,12 +24,9 @@ public: } // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index cf274c85f56a..143131fd65b5 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -69,7 +69,6 @@ bool KeynoteImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU // XExtendedFilterDetection OUString SAL_CALL KeynoteImportFilter::detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) -throw(css::uno::RuntimeException, std::exception) { sal_Int32 nLength = Descriptor.getLength(); sal_Int32 nNewLength = nLength + 2; @@ -241,19 +240,16 @@ throw(css::uno::RuntimeException, std::exception) // XServiceInfo OUString SAL_CALL KeynoteImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Impress.KeynoteImportFilter"); } sal_Bool SAL_CALL KeynoteImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL KeynoteImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx index a56ffcc8b63c..ea61a20b69f6 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.hxx +++ b/writerperfect/source/impress/KeynoteImportFilter.hxx @@ -25,16 +25,12 @@ public: virtual ~KeynoteImportFilter() override {} //XExtendedFilterDetection - 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; // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx index e0e5d9a0c672..3b77605a2c6e 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx @@ -79,17 +79,14 @@ void MWAWPresentationImportFilter::doRegisterHandlers(OdpGenerator &rGenerator) // XServiceInfo OUString SAL_CALL MWAWPresentationImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Impress.MWAWPresentationImportFilter"); } sal_Bool SAL_CALL MWAWPresentationImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MWAWPresentationImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx index 10de65df90f2..11625bf14457 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdpGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx index 43d5d1e7f7d4..e2b702272337 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.cxx +++ b/writerperfect/source/writer/AbiWordImportFilter.cxx @@ -38,19 +38,16 @@ bool AbiWordImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU // XServiceInfo OUString SAL_CALL AbiWordImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Writer.AbiWordImportFilter"); } sal_Bool SAL_CALL AbiWordImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL AbiWordImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/writer/AbiWordImportFilter.hxx b/writerperfect/source/writer/AbiWordImportFilter.hxx index 99cc61c725f9..c3ce92bade41 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.hxx +++ b/writerperfect/source/writer/AbiWordImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index 3f1dfbb11393..ecddf56302a5 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -90,19 +90,16 @@ bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt // XServiceInfo OUString SAL_CALL EBookImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Writer.EBookImportFilter"); } sal_Bool SAL_CALL EBookImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL EBookImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/writer/EBookImportFilter.hxx b/writerperfect/source/writer/EBookImportFilter.hxx index 66ff6779b563..79468e0ae45a 100644 --- a/writerperfect/source/writer/EBookImportFilter.hxx +++ b/writerperfect/source/writer/EBookImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 9466b4495a51..631dc5f9ed04 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -118,19 +118,16 @@ void MSWorksImportFilter::doRegisterHandlers(OdtGenerator &rGenerator) // XServiceInfo OUString SAL_CALL MSWorksImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Writer.MSWorksImportFilter"); } sal_Bool SAL_CALL MSWorksImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MSWorksImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx b/writerperfect/source/writer/MSWorksImportFilter.hxx index cef3519f88ab..45404be5e83f 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.hxx +++ b/writerperfect/source/writer/MSWorksImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 2b06ea163cbd..0d8d9f29b0f5 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -91,19 +91,16 @@ void MWAWImportFilter::doRegisterHandlers(OdtGenerator &rGenerator) // XServiceInfo OUString SAL_CALL MWAWImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Writer.MWAWImportFilter"); } sal_Bool SAL_CALL MWAWImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MWAWImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx index 8644aa3fb7e1..309e9cf9a151 100644 --- a/writerperfect/source/writer/MWAWImportFilter.hxx +++ b/writerperfect/source/writer/MWAWImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/PagesImportFilter.cxx b/writerperfect/source/writer/PagesImportFilter.cxx index af2a88834b0f..9352a9b3b92c 100644 --- a/writerperfect/source/writer/PagesImportFilter.cxx +++ b/writerperfect/source/writer/PagesImportFilter.cxx @@ -42,19 +42,16 @@ bool PagesImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt // XServiceInfo OUString SAL_CALL PagesImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Writer.PagesImportFilter"); } sal_Bool SAL_CALL PagesImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL PagesImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/writer/PagesImportFilter.hxx b/writerperfect/source/writer/PagesImportFilter.hxx index ce68915e3c55..15b083ca5cba 100644 --- a/writerperfect/source/writer/PagesImportFilter.hxx +++ b/writerperfect/source/writer/PagesImportFilter.hxx @@ -26,12 +26,9 @@ public: : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx index 9ee289ee0c04..f04343e205bb 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx @@ -90,19 +90,16 @@ void StarOfficeWriterImportFilter::doRegisterHandlers(OdtGenerator &rGenerator) // XServiceInfo OUString SAL_CALL StarOfficeWriterImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("org.libreoffice.comp.Writer.StarOfficeWriterImportFilter"); } sal_Bool SAL_CALL StarOfficeWriterImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL StarOfficeWriterImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"}; } diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx index 65805e049aee..ed1da0540763 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx @@ -27,12 +27,9 @@ public: : writerperfect::ImportFilter<OdtGenerator>(rxContext) {} // 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; private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override; diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 82912eac4813..74f050772afe 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -86,7 +86,6 @@ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, libr } bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< css::beans::PropertyValue > &aDescriptor) -throw (RuntimeException, std::exception) { sal_Int32 nLength = aDescriptor.getLength(); const PropertyValue *pValue = aDescriptor.getConstArray(); @@ -152,25 +151,21 @@ throw (RuntimeException, std::exception) } sal_Bool SAL_CALL WordPerfectImportFilter::filter(const Sequence< css::beans::PropertyValue > &aDescriptor) -throw (RuntimeException, std::exception) { return importImpl(aDescriptor); } void SAL_CALL WordPerfectImportFilter::cancel() -throw (RuntimeException, std::exception) { } // XImporter void SAL_CALL WordPerfectImportFilter::setTargetDocument(const Reference< css::lang::XComponent > &xDoc) -throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } // XExtendedFilterDetection OUString SAL_CALL WordPerfectImportFilter::detect(Sequence< PropertyValue > &Descriptor) -throw(RuntimeException, std::exception) { libwpd::WPDConfidence confidence = libwpd::WPD_CONFIDENCE_NONE; OUString sTypeName; @@ -213,7 +208,6 @@ throw(RuntimeException, std::exception) // XInitialization void SAL_CALL WordPerfectImportFilter::initialize(const Sequence< Any > &aArguments) -throw (Exception, RuntimeException, std::exception) { Sequence < PropertyValue > aAnySeq; sal_Int32 nLength = aArguments.getLength(); @@ -234,19 +228,16 @@ throw (Exception, RuntimeException, std::exception) // XServiceInfo OUString SAL_CALL WordPerfectImportFilter::getImplementationName() -throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.Writer.WordPerfectImportFilter"); } sal_Bool SAL_CALL WordPerfectImportFilter::supportsService(const OUString &rServiceName) -throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames() -throw (RuntimeException, std::exception) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index af6676dfc688..a34255dea56b 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -40,8 +40,7 @@ protected: OUString msFilterName; /// @throws css::uno::RuntimeException - bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) - throw (css::uno::RuntimeException, std::exception); + bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor); public: explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext) @@ -49,38 +48,25 @@ public: virtual ~WordPerfectImportFilter() override {} // XFilter - virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) override; + virtual void SAL_CALL cancel() override; // XImporter - virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) override; //XExtendedFilterDetection - 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; // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) 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; }; -/// @throws css::uno::RuntimeException -bool SAL_CALL WordPerfectImportFilter_supportsService(const OUString &ServiceName) -throw (css::uno::RuntimeException); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |