diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-08 20:23:21 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-03-08 20:23:21 +0100 |
| commit | 01b6944a3141759b20dc7307f0c4116335eed1c4 (patch) | |
| tree | a1f4cdd9b5edd92450df4c326b10cb855f53ad79 | |
| parent | cac114d1819bdc054170208ff99a514c6d5e1815 (diff) | |
Fix two remaining servicefactory workaroundsintegration/dev300_m98
Enable code again, replace getGlobalFactory with getServiceFactory
| -rw-r--r-- | oox/source/ppt/pptimport.cxx | 4 | ||||
| -rw-r--r-- | oox/source/xls/excelfilter.cxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 5918fc10b..07f23c5ea 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -147,9 +147,8 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe { if( XmlFilterBase::filter( rDescriptor ) ) return true; -#if 0 // FIXME if( isExportFilter() ) { - Reference< XExporter > xExporter( getGlobalFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.PowerPointExport" ) ), UNO_QUERY ); + Reference< XExporter > xExporter( getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.PowerPointExport" ) ), UNO_QUERY ); if( xExporter.is() ) { Reference< XComponent > xDocument( getModel(), UNO_QUERY ); @@ -162,7 +161,6 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe } } } -#endif return false; } diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx index 6efb7957e..5ac9b137f 100644 --- a/oox/source/xls/excelfilter.cxx +++ b/oox/source/xls/excelfilter.cxx @@ -164,10 +164,9 @@ sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< :: { if ( XmlFilterBase::filter( rDescriptor ) ) return true; -#if 0 /* FIXME */ if ( isExportFilter() ) { - Reference< XExporter > xExporter( getGlobalFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilterExport" ) ), UNO_QUERY ); + Reference< XExporter > xExporter( getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilterExport" ) ), UNO_QUERY ); if ( xExporter.is() ) { @@ -182,7 +181,6 @@ sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< :: } } } -#endif /* FIXME */ return false; } |