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 /include/oox | |
parent | a81d60527bfe09bc54e6eb2e1281344773db0152 (diff) |
Remove oox::core::FilterBase::implGetImplementationName indirection
Change-Id: Ib275192452c6836cbaac2e517942ec5356dfd9ab
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/core/filterbase.hxx | 6 | ||||
-rw-r--r-- | include/oox/ppt/dgmimport.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/dgmlayout.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/pptimport.hxx | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 3d10c08fbae6..02737169ad31 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -199,10 +199,6 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- - virtual OUString SAL_CALL - getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -274,8 +270,6 @@ private: /** Derived classes create a VBA project manager object. */ virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0; - virtual OUString implGetImplementationName() const = 0; - virtual StorageRef implCreateStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0; virtual StorageRef implCreateStorage( diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 83ec9608dd9a..3fd88b50114c 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -50,7 +50,7 @@ public: virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; private: - virtual OUString implGetImplementationName() const SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; }; diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 8cc4802fe259..d0ec057f99ca 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -50,7 +50,7 @@ public: virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; private: - virtual OUString implGetImplementationName() const SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; drawingml::ThemePtr mpThemePtr; }; diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 02f0f4b328df..860da2afa361 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -69,7 +69,7 @@ public: private: virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; 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; private: OUString maTableStyleListPath; |