Remove oox::core::FilterBase::implGetImplementationName indirection

Change-Id: Ib275192452c6836cbaac2e517942ec5356dfd9ab

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(

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;
 };
 

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;
 };

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;

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);

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();
 }

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();
 }

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();
 }

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();
 }

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;

sc/source/filter/excel/xestream.cxx

@@ -1127,7 +1127,7 @@ bool XclExpXmlStream::exportDocument()
     return new ::oox::xls::ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
 }
 
-OUString XclExpXmlStream::implGetImplementationName() const
+OUString XclExpXmlStream::getImplementationName() throw (css::uno::RuntimeException, std::exception)
 {
     return OUString( "TODO" );
 }

sc/source/filter/inc/excelfilter.hxx

@@ -53,7 +53,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;
 
     WorkbookGlobals*    mpBookGlob;
 };

sc/source/filter/inc/xestream.hxx

@@ -369,7 +369,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;
     ScDocShell *getDocShell();
     sax_fastparser::FSHelperPtr&    WriteAttributesInternal( sal_Int32 nAttribute, ... );
 

sc/source/filter/oox/excelfilter.cxx

@@ -175,7 +175,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::
     return false;
 }
 
-OUString ExcelFilter::implGetImplementationName() const
+OUString ExcelFilter::getImplementationName() throw (css::uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" );
 }

sd/source/filter/eppt/epptooxml.hxx

@@ -133,7 +133,7 @@ private:
 
     void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId );
 
-    virtual OUString implGetImplementationName() const SAL_OVERRIDE;
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
 

sd/source/filter/eppt/pptx-epptooxml.cxx

@@ -2162,7 +2162,7 @@ uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const
     return (cppu::OWeakObject*)new PowerPointExport( rxCtxt );
 }
 
-OUString PowerPointExport::implGetImplementationName() const
+OUString PowerPointExport::getImplementationName() throw (css::uno::RuntimeException, std::exception)
 {
     return PowerPointExport_getImplementationName();
 }

sw/source/filter/ww8/docxexportfilter.cxx

@@ -91,7 +91,7 @@ OUString DocxExport_getImplementationName()
     return OUString( IMPL_NAME );
 }
 
-OUString DocxExportFilter::implGetImplementationName() const
+OUString DocxExportFilter::getImplementationName() throw (css::uno::RuntimeException, std::exception)
 {
     return DocxExport_getImplementationName();
 }

sw/source/filter/ww8/docxexportfilter.hxx

@@ -45,9 +45,7 @@ public:
     virtual bool        exportDocument() SAL_OVERRIDE;
 
 private:
-
-    /// Implementatio of the filter abstract method.
-    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
     {