mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, convert some starmath code to XComponentContext

Browse Source 
Change-Id: I60f1d4a6ce0089f828428fa3ae6707a8c086a0ad
This commit is contained in:
Noel Grandin
2013-01-03 13:41:37 +02:00
parent 2e0d1719f2
commit b498ff10d2
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
starmath/source/mathmlexport.cxx
View File

@@ -95,9 +95,7 @@ using ::rtl::OUStringBuffer;
sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium) sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
{ {
sal_Bool bRet=sal_True; sal_Bool bRet=sal_True;
uno::Reference<lang::XMultiServiceFactory> uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
xServiceFactory(comphelper::getProcessServiceFactory());
OSL_ENSURE(xServiceFactory.is(),"got no service manager");
//Get model //Get model
uno::Reference< lang::XComponent > xModelComp(xModel, uno::UNO_QUERY ); uno::Reference< lang::XComponent > xModelComp(xModel, uno::UNO_QUERY );
@@ -207,7 +205,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
xStatusIndicator->setValue(nSteps++); xStatusIndicator->setValue(nSteps++);
bRet = WriteThroughComponent( bRet = WriteThroughComponent(
xStg, xModelComp, "meta.xml", xServiceFactory, xInfoSet, xStg, xModelComp, "meta.xml", xContext, xInfoSet,
(bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaExporter" (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaExporter"
: "com.sun.star.comp.Math.XMLMetaExporter")); : "com.sun.star.comp.Math.XMLMetaExporter"));
} }
@@ -217,7 +215,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
xStatusIndicator->setValue(nSteps++); xStatusIndicator->setValue(nSteps++);
bRet = WriteThroughComponent( bRet = WriteThroughComponent(
xStg, xModelComp, "content.xml", xServiceFactory, xInfoSet, xStg, xModelComp, "content.xml", xContext, xInfoSet,
"com.sun.star.comp.Math.XMLContentExporter"); "com.sun.star.comp.Math.XMLContentExporter");
} }
@@ -227,7 +225,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
xStatusIndicator->setValue(nSteps++); xStatusIndicator->setValue(nSteps++);
bRet = WriteThroughComponent( bRet = WriteThroughComponent(
xStg, xModelComp, "settings.xml", xServiceFactory, xInfoSet, xStg, xModelComp, "settings.xml", xContext, xInfoSet,
(bOASIS ? "com.sun.star.comp.Math.XMLOasisSettingsExporter" (bOASIS ? "com.sun.star.comp.Math.XMLOasisSettingsExporter"
: "com.sun.star.comp.Math.XMLSettingsExporter") ); : "com.sun.star.comp.Math.XMLSettingsExporter") );
} }
@@ -242,7 +240,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
xStatusIndicator->setValue(nSteps++); xStatusIndicator->setValue(nSteps++);
bRet = WriteThroughComponent( bRet = WriteThroughComponent(
xOut, xModelComp, xServiceFactory, xInfoSet, xOut, xModelComp, xContext, xInfoSet,
"com.sun.star.comp.Math.XMLContentExporter"); "com.sun.star.comp.Math.XMLContentExporter");
} }
@@ -257,7 +255,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
sal_Bool SmXMLExportWrapper::WriteThroughComponent( sal_Bool SmXMLExportWrapper::WriteThroughComponent(
Reference<io::XOutputStream> xOutputStream, Reference<io::XOutputStream> xOutputStream,
Reference<XComponent> xComponent, Reference<XComponent> xComponent,
Reference<lang::XMultiServiceFactory> & rFactory, Reference<uno::XComponentContext> & rxContext,
Reference<beans::XPropertySet> & rPropSet, Reference<beans::XPropertySet> & rPropSet,
const sal_Char* pComponentName ) const sal_Char* pComponentName )
{ {
@@ -266,11 +264,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
OSL_ENSURE(NULL != pComponentName, "Need component name!"); OSL_ENSURE(NULL != pComponentName, "Need component name!");
// get component // get component
Reference< xml::sax::XWriter > xSaxWriter = xml::sax::Writer::create( Reference< xml::sax::XWriter > xSaxWriter = xml::sax::Writer::create(rxContext );
comphelper::getComponentContext(rFactory) );
OSL_ENSURE( xSaxWriter.is(), "can't instantiate XML writer" );
if (!xSaxWriter.is())
return sal_False;
// connect XML writer to output stream // connect XML writer to output stream
xSaxWriter->setOutputStream( xOutputStream ); xSaxWriter->setOutputStream( xOutputStream );
@@ -284,8 +278,8 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
// get filter component // get filter component
Reference< document::XExporter > xExporter( Reference< document::XExporter > xExporter(
rFactory->createInstanceWithArguments( rxContext->getServiceManager()->createInstanceWithArgumentsAndContext(OUString::createFromAscii(pComponentName), aArgs, rxContext),
OUString::createFromAscii(pComponentName), aArgs), UNO_QUERY); UNO_QUERY);
OSL_ENSURE( xExporter.is(), OSL_ENSURE( xExporter.is(),
"can't instantiate export filter component" ); "can't instantiate export filter component" );
if ( !xExporter.is() ) if ( !xExporter.is() )
@@ -315,7 +309,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
const Reference < embed::XStorage >& xStorage, const Reference < embed::XStorage >& xStorage,
Reference<XComponent> xComponent, Reference<XComponent> xComponent,
const sal_Char* pStreamName, const sal_Char* pStreamName,
Reference<lang::XMultiServiceFactory> & rFactory, Reference<uno::XComponentContext> & rxContext,
Reference<beans::XPropertySet> & rPropSet, Reference<beans::XPropertySet> & rPropSet,
const sal_Char* pComponentName const sal_Char* pComponentName
) )
@@ -359,7 +353,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
} }
// write the stuff // write the stuff
sal_Bool bRet = WriteThroughComponent( xStream->getOutputStream(), xComponent, rFactory, sal_Bool bRet = WriteThroughComponent( xStream->getOutputStream(), xComponent, rxContext,
rPropSet, pComponentName ); rPropSet, pComponentName );
return bRet; return bRet;

7
starmath/source/mathmlexport.hxx
View File

@@ -56,18 +56,17 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
xComponent, xComponent,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & rFactory, ::com::sun::star::uno::XComponentContext > & rxContext,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet, ::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName ); const sal_Char* pComponentName );
sal_Bool WriteThroughComponent( sal_Bool WriteThroughComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent,
xComponent,
const sal_Char* pStreamName, const sal_Char* pStreamName,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & rFactory, ::com::sun::star::uno::XComponentContext > & rxContext,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet, ::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName ); const sal_Char* pComponentName );