summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/source/filter/inc/excelfilter.hxx4
-rw-r--r--sc/source/filter/inc/ooxformulaparser.hxx4
-rw-r--r--sc/source/filter/oox/excelfilter.cxx15
-rw-r--r--sc/source/filter/oox/ooxformulaparser.cxx18
-rw-r--r--sc/util/scfilt.component2
5 files changed, 6 insertions, 37 deletions
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index fbeea5e24c71..0d131e99014b 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -58,10 +58,6 @@ private:
WorkbookGlobals* mpBookGlob;
};
-OUString SAL_CALL ExcelFilter_getImplementationName();
-
-css::uno::Sequence< OUString > SAL_CALL ExcelFilter_getSupportedServiceNames();
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index 8626476bacf8..e45bcb5cdeda 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -91,10 +91,6 @@ private:
ParserImplRef mxParserImpl; /// Implementation of import parser.
};
-OUString SAL_CALL OOXMLFormulaParser_getImplementationName();
-
-css::uno::Sequence< OUString > SAL_CALL OOXMLFormulaParser_getSupportedServiceNames();
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 00ff2bc643a4..bf30b6827e78 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -42,19 +42,6 @@ using namespace ::oox::core;
using ::oox::drawingml::table::TableStyleListPtr;
-OUString ExcelFilter_getImplementationName()
-{
- return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" );
-}
-
-Sequence< OUString > ExcelFilter_getSupportedServiceNames()
-{
- Sequence< OUString > aSeq( 2 );
- aSeq[ 0 ] = "com.sun.star.document.ImportFilter";
- aSeq[ 1 ] = "com.sun.star.document.ExportFilter";
- return aSeq;
-}
-
ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
XmlFilterBase( rxContext ),
mpBookGlob( 0 )
@@ -190,7 +177,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::
OUString ExcelFilter::implGetImplementationName() const
{
- return ExcelFilter_getImplementationName();
+ return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" );
}
} // namespace xls
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index a466a103f7eb..d681c9cefcd5 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -99,18 +99,6 @@ const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString&
return 0;
}
-Sequence< OUString > OOXMLFormulaParser_getSupportedServiceNames()
-{
- Sequence< OUString > aServiceNames( 1 );
- aServiceNames[ 0 ] = "com.sun.star.sheet.FilterFormulaParser";
- return aServiceNames;
-}
-
-OUString OOXMLFormulaParser_getImplementationName()
-{
- return OUString( "com.sun.star.comp.oox.xls.FormulaParser");
-}
-
OOXMLFormulaParser::OOXMLFormulaParser()
{
}
@@ -122,7 +110,7 @@ OOXMLFormulaParser::~OOXMLFormulaParser()
// com.sun.star.lang.XServiceInfo interface -----------------------------------
OUString SAL_CALL OOXMLFormulaParser::getImplementationName() throw( RuntimeException, std::exception )
{
- return OOXMLFormulaParser_getImplementationName();
+ return OUString( "com.sun.star.comp.oox.xls.FormulaParser");
}
sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService ) throw( RuntimeException, std::exception )
@@ -132,7 +120,9 @@ sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService
Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
- return OOXMLFormulaParser_getSupportedServiceNames();
+ Sequence< OUString > aServiceNames( 1 );
+ aServiceNames[ 0 ] = "com.sun.star.sheet.FilterFormulaParser";
+ return aServiceNames;
}
// com.sun.star.lang.XInitialization interface --------------------------------
diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component
index 3333e16e88cf..42227f49d293 100644
--- a/sc/util/scfilt.component
+++ b/sc/util/scfilt.component
@@ -18,7 +18,7 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- prefix="scfilt" xmlns="http://openoffice.org/2010/uno-components">
+ xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.oox.xls.ExcelFilter"
constructor="com_sun_star_comp_oox_xls_ExcelFilter_get_implementation">
<service name="com.sun.star.document.ImportFilter"/>