summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-01-16 17:12:47 +0200
committerNoel Grandin <noel@peralex.com>2013-02-11 08:02:11 +0200
commite5fdaec54a54e42b487c37e6b01493bcdfc30b4c (patch)
tree26421d24cee78af24feb748fc52845f279dd299e /reportdesign
parentc4d051c5dbee532264e1bfc2ccdb337c6dcf83ed (diff)
fdo#46808, Adapt document::XML*BasicExporter UNO services to new style
The services are document::XMLBasicExporter document::XMLOasisBasicExporter Change-Id: Ifd93e5735cae94d34904d79769cdb3edf587fe43
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx2
2 files changed, 9 insertions, 9 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 9df73c0fef50..f6379026a3bb 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -75,7 +75,7 @@ namespace rptxml
//---------------------------------------------------------------------
Reference< XInterface > ORptExportHelper::create(Reference< XComponentContext > const & xContext)
{
- return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_SETTINGS ));
+ return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_SETTINGS ));
}
//---------------------------------------------------------------------
::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException)
@@ -92,7 +92,7 @@ namespace rptxml
//---------------------------------------------------------------------
Reference< XInterface > ORptContentExportHelper::create(Reference< XComponentContext > const & xContext)
{
- return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_CONTENT ));
+ return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_CONTENT ));
}
//---------------------------------------------------------------------
::rtl::OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException)
@@ -110,7 +110,7 @@ namespace rptxml
//---------------------------------------------------------------------
Reference< XInterface > ORptStylesExportHelper::create(Reference< XComponentContext > const & xContext)
{
- return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
+ return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
EXPORT_FONTDECLS|EXPORT_OASIS ));
}
//---------------------------------------------------------------------
@@ -129,7 +129,7 @@ namespace rptxml
//---------------------------------------------------------------------
Reference< XInterface > ORptMetaExportHelper::create(Reference< XComponentContext > const & xContext)
{
- return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_META ));
+ return static_cast< XServiceInfo* >(new ORptExport(xContext, EXPORT_META ));
}
//---------------------------------------------------------------------
::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException)
@@ -147,7 +147,7 @@ namespace rptxml
//---------------------------------------------------------------------
Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext)
{
- return static_cast< XServiceInfo* >(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),EXPORT_ALL));
+ return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_ALL));
}
//---------------------------------------------------------------------
::rtl::OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
@@ -215,8 +215,8 @@ void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
}
}
// -----------------------------------------------------------------------------
-ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nExportFlag)
-: SvXMLExport( util::MeasureUnit::MM_100TH, _rxMSF, XML_REPORT, EXPORT_OASIS)
+ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt16 nExportFlag)
+: SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, XML_REPORT, EXPORT_OASIS)
,m_bAllreadyFilled(sal_False)
{
setExportFlags( EXPORT_OASIS | nExportFlag);
@@ -307,7 +307,7 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1
// -----------------------------------------------------------------------------
Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext)
{
- return *(new ORptExport(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY)));
+ return *(new ORptExport(xContext));
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index b3d8bf2e5065..8e048cc5d94b 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -185,7 +185,7 @@ protected:
virtual ~ORptExport(){};
public:
- ORptExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS));
+ ORptExport(const Reference< XComponentContext >& _rxContext, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS));
// XServiceInfo
virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);