diff options
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 33 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.hxx | 6 |
2 files changed, 10 insertions, 29 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index b11dcf3a3153..0de3eff22bdc 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -26,7 +26,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> #include <comphelper/types.hxx> -#include <cppuhelper/supportsservice.hxx> #include "xmlEnums.hxx" #include <xmloff/txtprmap.hxx> #include <xmloff/numehelp.hxx> @@ -74,7 +73,7 @@ namespace rptxml //--------------------------------------------------------------------- Reference< XInterface > ORptExportHelper::create(Reference< XComponentContext > const & xContext) { - return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_SETTINGS )); + return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_SETTINGS )); } //--------------------------------------------------------------------- OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException) @@ -91,7 +90,7 @@ namespace rptxml //--------------------------------------------------------------------- Reference< XInterface > ORptContentExportHelper::create(Reference< XComponentContext > const & xContext) { - return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_CONTENT )); + return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_CONTENT )); } //--------------------------------------------------------------------- OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException) @@ -109,7 +108,7 @@ namespace rptxml //--------------------------------------------------------------------- Reference< XInterface > ORptStylesExportHelper::create(Reference< XComponentContext > const & xContext) { - return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | + return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS|EXPORT_OASIS )); } //--------------------------------------------------------------------- @@ -128,7 +127,7 @@ namespace rptxml //--------------------------------------------------------------------- Reference< XInterface > ORptMetaExportHelper::create(Reference< XComponentContext > const & xContext) { - return static_cast< XServiceInfo* >(new ORptExport(xContext, EXPORT_META )); + return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_META )); } //--------------------------------------------------------------------- OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) @@ -146,7 +145,7 @@ namespace rptxml //--------------------------------------------------------------------- Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { - return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_ALL)); + return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_ALL)); } //--------------------------------------------------------------------- OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) @@ -214,8 +213,8 @@ void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid) } } // ----------------------------------------------------------------------------- -ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt16 nExportFlag) -: SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, XML_REPORT, EXPORT_OASIS) +ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, sal_uInt16 nExportFlag) +: SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName, XML_REPORT, EXPORT_OASIS) ,m_bAllreadyFilled(sal_False) { setExportFlags( EXPORT_OASIS | nExportFlag); @@ -306,7 +305,7 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt // ----------------------------------------------------------------------------- Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext) { - return *(new ORptExport(xContext)); + return *(new ORptExport(xContext, getImplementationName_Static(), EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); } // ----------------------------------------------------------------------------- @@ -316,11 +315,6 @@ OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeExceptio } //-------------------------------------------------------------------------- -OUString SAL_CALL ORptExport::getImplementationName( ) throw(uno::RuntimeException) -{ - return getImplementationName_Static(); -} -//-------------------------------------------------------------------------- uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { uno::Sequence< OUString > aServices(1); @@ -328,16 +322,7 @@ uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw( return aServices; } -//-------------------------------------------------------------------------- -uno::Sequence< OUString > SAL_CALL ORptExport::getSupportedServiceNames( ) throw(uno::RuntimeException) -{ - return getSupportedServiceNames_Static(); -} -//------------------------------------------------------------------------------ -sal_Bool SAL_CALL ORptExport::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) -{ - return cppu::supportsService(this, ServiceName); -} + // ----------------------------------------------------------------------------- void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions) { diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index bf223184be30..8334c7ac58f0 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -184,11 +184,7 @@ protected: virtual ~ORptExport(){}; public: - ORptExport(const Reference< XComponentContext >& _rxContext, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); - // XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, sal_uInt16 nExportFlag); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); |