Skip to content

C
core
Kaydet (Commit) d4d16d8a authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

fdo#46808, Remove unnecessary XMultiServiceFactory member 

.. and associated methods

Change-Id: Iec01b4615decc1616e405166088d7d1d844ac0ae
üst 823377b7
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 29 deletions
include/oox/core/filterbase.hxx
Dosyayı görüntüle @ d4d16d8a
......@@ -117,10 +117,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
getComponentContext() const;
/** Returns the multi service factory of the component (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
getServiceFactory() const;
/** Returns the document model (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >&
getModel() const;
......
oox/source/core/filterbase.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -144,7 +144,6 @@ struct FilterBaseImpl
Reference< XComponentContext > mxComponentContext;
Reference< XMultiComponentFactory > mxComponentFactory;
Reference< XMultiServiceFactory > mxServiceFactory;
Reference< XModel > mxModel;
Reference< XMultiServiceFactory > mxModelFactory;
Reference< XFrame > mxTargetFrame;
......@@ -168,8 +167,7 @@ FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext
meDirection( FILTERDIRECTION_UNKNOWN ),
meVersion( ECMA_DIALECT ),
mxComponentContext( rxContext, UNO_SET_THROW ),
mxComponentFactory( rxContext->getServiceManager(), UNO_SET_THROW ),
mxServiceFactory( rxContext->getServiceManager(), UNO_QUERY_THROW )
mxComponentFactory( rxContext->getServiceManager(), UNO_SET_THROW )
{
}
......@@ -245,11 +243,6 @@ const Reference< XComponentContext >& FilterBase::getComponentContext() const
return mxImpl->mxComponentContext;
}
const Reference< XMultiServiceFactory >& FilterBase::getServiceFactory() const
{
return mxImpl->mxServiceFactory;
}
const Reference< XModel >& FilterBase::getModel() const
{
return mxImpl->mxModel;
......@@ -561,7 +554,7 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( "FilterName", OUString() );
try
{
Reference< XNameAccess > xFilters( getServiceFactory()->createInstance("com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW );
Reference< XNameAccess > xFilters( Reference<XMultiServiceFactory>(getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance("com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW );
Any aValues = xFilters->getByName( sFilterName );
Sequence<PropertyValue > aPropSeq;
aValues >>= aPropSeq;
......
oox/source/core/xmlfilterbase.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -47,14 +47,10 @@
#include <comphelper/processfactory.hxx>
#include <oox/core/filterdetect.hxx>
#include <comphelper/storagehelper.hxx>
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::document::XOOXMLDocumentPropertiesImporter;
using ::com::sun::star::document::XDocumentPropertiesSupplier;
using ::com::sun::star::xml::dom::DocumentBuilder;
using ::com::sun::star::xml::dom::XDocument;
using ::com::sun::star::xml::dom::XDocumentBuilder;
using ::com::sun::star::xml::sax::XFastSAXSerializable;
using ::com::sun::star::lang::XComponent;
namespace oox {
namespace core {
......@@ -204,10 +200,10 @@ XmlFilterBase::~XmlFilterBase()
void XmlFilterBase::importDocumentProperties()
{
Reference< XMultiServiceFactory > xFactory( getServiceFactory(), UNO_QUERY );
Reference< XMultiServiceFactory > xFactory( getComponentContext()->getServiceManager(), UNO_QUERY );
MediaDescriptor aMediaDesc( getMediaDescriptor() );
Reference< XInputStream > xInputStream;
Reference< XComponentContext > xContext = comphelper::getComponentContext(getServiceFactory());
Reference< XComponentContext > xContext = getComponentContext();
::oox::core::FilterDetect aDetector( xContext );
xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
Reference< XComponent > xModel( getModel(), UNO_QUERY );
......@@ -330,9 +326,7 @@ Reference<XDocument> XmlFilterBase::importFragment( const OUString& aFragmentPat
try
{
// create the dom parser
Reference< XComponentContext > xContext =
comphelper::getComponentContext(getServiceFactory());
Reference<XDocumentBuilder> xDomBuilder( DocumentBuilder::create(xContext) );
Reference<XDocumentBuilder> xDomBuilder( DocumentBuilder::create( getComponentContext() ) );
// create DOM from fragment
xRet = xDomBuilder->parse(xInStrm);
......
oox/source/drawingml/chart/converterbase.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -231,7 +231,9 @@ Reference< XInterface > ConverterRoot::createInstance( const OUString& rServiceN
Reference< XInterface > xInt;
try
{
xInt = mxData->mrFilter.getServiceFactory()->createInstance( rServiceName );
Reference<XMultiServiceFactory> xMSF = Reference<XMultiServiceFactory>(getComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW);
xInt = xMSF->createInstance( rServiceName );
}
catch( Exception& )
{
......@@ -242,7 +244,7 @@ Reference< XInterface > ConverterRoot::createInstance( const OUString& rServiceN
Reference< XComponentContext > ConverterRoot::getComponentContext() const
{
return comphelper::getComponentContext(mxData->mrFilter.getServiceFactory());
return mxData->mrFilter.getComponentContext();
}
XmlFilterBase& ConverterRoot::getFilter() const
......
oox/source/export/shapes.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -1312,7 +1312,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape )
if( xSheetDoc.is() && mpFB)
{
Reference< XComponent > xDocument( mAny, UNO_QUERY );
Reference< XExporter > xExporter( mpFB->getServiceFactory()->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY );
Reference< XExporter > xExporter( Reference<css::lang::XMultiServiceFactory>(mpFB->getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY );;
if( xDocument.is() && xExporter.is())
{
Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer()
......
oox/source/ppt/pptimport.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -140,7 +140,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe
return true;
if( isExportFilter() ) {
Reference< XExporter > xExporter( getServiceFactory()->createInstance( "com.sun.star.comp.Impress.oox.PowerPointExport" ), UNO_QUERY );
Reference< XExporter > xExporter( Reference<css::lang::XMultiServiceFactory>(getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance( "com.sun.star.comp.Impress.oox.PowerPointExport" ), UNO_QUERY );;
if( xExporter.is() ) {
Reference< XComponent > xDocument( getModel(), UNO_QUERY );
......
oox/source/ppt/timenode.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -578,7 +578,7 @@ namespace oox { namespace ppt {
const Reference< XAnimationNode >& rxNode )
{
try {
Reference< XAnimationNode > xNode ( rFilter.getServiceFactory()->createInstance( rServiceName ), UNO_QUERY_THROW );
Reference< XAnimationNode > xNode( Reference<css::lang::XMultiServiceFactory>(rFilter.getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance( rServiceName ), UNO_QUERY_THROW );;
Reference< XTimeContainer > xParentContainer( rxNode, UNO_QUERY_THROW );
xParentContainer->appendChild( xNode );
......
sc/source/filter/oox/excelfilter.cxx
Dosyayı görüntüle @ d4d16d8a
......@@ -175,7 +175,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::
if ( isExportFilter() )
{
Reference< XExporter > xExporter( getServiceFactory()->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY );
Reference< XExporter > xExporter( Reference<XMultiServiceFactory>(getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY );;
if ( xExporter.is() )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment