diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 21:45:30 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 21:45:50 +0100 |
commit | 413f7c3642a6a237848e2c6d3b279bdf4d808c31 (patch) | |
tree | 4c33f42450f42c79ba4ac222105910ab8e3d94f6 /oox | |
parent | a81d60527bfe09bc54e6eb2e1281344773db0152 (diff) |
Remove oox::core::FilterBase::implGetImplementationName indirection
Change-Id: Ib275192452c6836cbaac2e517942ec5356dfd9ab
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/core/filterbase.cxx | 5 | ||||
-rw-r--r-- | oox/source/ppt/dgmimport.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/dgmlayout.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptimport.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeFilterBase.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeFilterBase.hxx | 2 |
6 files changed, 5 insertions, 10 deletions
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index bef04349b40f..cfa27967681b 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -392,11 +392,6 @@ bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString // com.sun.star.lang.XServiceInfo interface -OUString SAL_CALL FilterBase::getImplementationName() throw( RuntimeException, std::exception ) -{ - return implGetImplementationName(); -} - sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index 91a46bd96752..5b20196f9ca3 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -112,7 +112,7 @@ oox::drawingml::chart::ChartConverter* QuickDiagrammingImport::getChartConverter return 0; } -OUString QuickDiagrammingImport::implGetImplementationName() const +OUString QuickDiagrammingImport::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return QuickDiagrammingImport_getImplementationName(); } diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 9937b3f777ea..681f5b532a7a 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -163,7 +163,7 @@ const oox::drawingml::table::TableStyleListPtr QuickDiagrammingLayout::getTableS return 0; } -OUString QuickDiagrammingLayout::implGetImplementationName() const +OUString QuickDiagrammingLayout::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return QuickDiagrammingLayout_getImplementationName(); } diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index fc29c1ce277b..27d831762aa8 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -226,7 +226,7 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Impress" ); } -OUString PowerPointImport::implGetImplementationName() const +OUString PowerPointImport::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return PowerPointImport_getImplementationName(); } diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index c40131f9100c..2d886749528e 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -67,7 +67,7 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Writer" ); } -OUString ShapeFilterBase::implGetImplementationName() const +OUString ShapeFilterBase::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return OUString(); } diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 0072c22ac1e4..06d4722bd8a4 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -61,7 +61,7 @@ public: private: virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString implGetImplementationName() const SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; |