[Libreoffice-commits] core.git: include/oox oox/source sc/source sd/source sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Mar 17 13:46:52 PDT 2015
include/oox/core/filterbase.hxx | 6 ------
include/oox/ppt/dgmimport.hxx | 2 +-
include/oox/ppt/dgmlayout.hxx | 2 +-
include/oox/ppt/pptimport.hxx | 2 +-
oox/source/core/filterbase.cxx | 5 -----
oox/source/ppt/dgmimport.cxx | 2 +-
oox/source/ppt/dgmlayout.cxx | 2 +-
oox/source/ppt/pptimport.cxx | 2 +-
oox/source/shape/ShapeFilterBase.cxx | 2 +-
oox/source/shape/ShapeFilterBase.hxx | 2 +-
sc/source/filter/excel/xestream.cxx | 2 +-
sc/source/filter/inc/excelfilter.hxx | 2 +-
sc/source/filter/inc/xestream.hxx | 2 +-
sc/source/filter/oox/excelfilter.cxx | 2 +-
sd/source/filter/eppt/epptooxml.hxx | 2 +-
sd/source/filter/eppt/pptx-epptooxml.cxx | 2 +-
sw/source/filter/ww8/docxexportfilter.cxx | 2 +-
sw/source/filter/ww8/docxexportfilter.hxx | 4 +---
18 files changed, 16 insertions(+), 29 deletions(-)
New commits:
commit 413f7c3642a6a237848e2c6d3b279bdf4d808c31
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Mar 17 21:45:30 2015 +0100
Remove oox::core::FilterBase::implGetImplementationName indirection
Change-Id: Ib275192452c6836cbaac2e517942ec5356dfd9ab
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 3d10c08..0273716 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 83ec960..3fd88b5 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 8cc4802..d0ec057 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 02f0f4b..860da2a 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;
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index bef0434..cfa2796 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 91a46bd..5b20196 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 9937b3f..681f5b5 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 fc29c1c..27d8317 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 c40131f..2d88674 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 0072c22..06d4722 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;
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index ba83118..36c4d79 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/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" );
}
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index 0d131e9..75d7864 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/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;
};
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index aad2d43..fd41b73 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/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, ... );
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index bf30b68..5771a90 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/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" );
}
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 9c977fe..f470066 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/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;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 98f80e3..1ff74f5 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/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();
}
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index aaa857e..ae28005 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/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();
}
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 1653cd6..0c79a06 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/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
{
More information about the Libreoffice-commits
mailing list