diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 14:34:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 17:39:55 +0100 |
commit | ee2befb8628b67da206d39030af22ff8fc04d318 (patch) | |
tree | ec0c68e003a210de16c5cdc1495a4f87808d3444 | |
parent | c7f1ce594c641698e8ed8fc99f029030978f91e1 (diff) |
filter: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I56739de05cacebe93983bd27fcaa1ec7f27b5fa8
-rw-r--r-- | filter/source/flash/swfdialog.cxx | 13 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.cxx | 13 | ||||
-rw-r--r-- | filter/source/svg/svgdialog.cxx | 14 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 3 |
4 files changed, 4 insertions, 39 deletions
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 32615b9d37a2..9a7b5afffa12 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -52,17 +52,6 @@ OUString SWFDialog_getImplementationName () return OUString ( SERVICE_NAME ); } - - -Sequence< sal_Int8 > SAL_CALL SWFDialog_getImplementationId() - throw(RuntimeException) -{ - static ::cppu::OImplementationId aId; - return aId.getImplementationId(); -} - - - Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() throw (RuntimeException) { @@ -135,7 +124,7 @@ void SAL_CALL SWFDialog::release() Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId() throw(RuntimeException, std::exception) { - return SWFDialog_getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index f70911127837..dbfcfea780cf 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -46,17 +46,6 @@ OUString PDFDialog_getImplementationName () return OUString ( "com.sun.star.comp.PDF.PDFDialog" ); } - - -Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId() - throw(RuntimeException) -{ - static ::cppu::OImplementationId aId; - return aId.getImplementationId(); -} - - - Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() throw (RuntimeException) { @@ -98,7 +87,7 @@ PDFDialog::~PDFDialog() Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() throw(RuntimeException, std::exception) { - return PDFDialog_getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 9dc9bd4efa28..9d9dd4b302a9 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -52,18 +52,6 @@ OUString SVGDialog_getImplementationName () return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME ); } - - -Sequence< sal_Int8 > SAL_CALL SVGDialog_getImplementationId() - throw(RuntimeException) -{ - static const ::cppu::OImplementationId aId; - - return( aId.getImplementationId() ); -} - - - Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() throw (RuntimeException) { @@ -134,7 +122,7 @@ void SAL_CALL SVGDialog::release() Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId() throw(RuntimeException, std::exception) { - return SVGDialog_getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index d1a37fd05151..7a9fe4e66682 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -216,8 +216,7 @@ namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, l Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( void ) throw( RuntimeException, std::exception ) { - ::cppu::OImplementationId &rID = lcl_ImplId::get(); - return rID.getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } |