diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-08 15:29:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-15 09:56:03 +0200 |
| commit | abcbababca2ff10bb78d36cf1a625b9d615eaa9a (patch) | |
| tree | 1c95f7dc1e7f20c013f13c1f1fff637853e23256 /embeddedobj/source/commonembedding/miscobj.cxx | |
| parent | 251f1b0b38be7d1267339898e44e320f05849e22 (diff) | |
fdo#46808, Convert comphelper::MimeConfigurationHelper to XComponentContext
Change-Id: I74b4f0c4a84f02b218102405eaba24cf47f654ce
Diffstat (limited to 'embeddedobj/source/commonembedding/miscobj.cxx')
| -rw-r--r-- | embeddedobj/source/commonembedding/miscobj.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 508883d333f0..44a344d8b352 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -41,7 +41,7 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< sal_Bool bCanUseDocumentBaseURL ); //------------------------------------------------------ -OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, +OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::NamedValue >& aObjProps ) : m_pDocHolder( NULL ) , m_pInterfaceContainer( NULL ) @@ -51,7 +51,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti , m_nObjectState( -1 ) , m_nTargetState( -1 ) , m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) -, m_xFactory( xFactory ) +, m_xContext( rxContext ) , m_nMiscStatus( 0 ) , m_bEmbeddedScriptSupport( sal_True ) , m_bDocumentRecoverySupport( sal_True ) @@ -66,7 +66,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti //------------------------------------------------------ OCommonEmbeddedObject::OCommonEmbeddedObject( - const uno::Reference< lang::XMultiServiceFactory >& xFactory, + const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::NamedValue >& aObjProps, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& aObjectDescr ) @@ -78,7 +78,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( , m_nObjectState( embed::EmbedStates::LOADED ) , m_nTargetState( -1 ) , m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) -, m_xFactory( xFactory ) +, m_xContext( rxContext ) , m_nMiscStatus( 0 ) , m_bEmbeddedScriptSupport( sal_True ) , m_bDocumentRecoverySupport( sal_True ) @@ -95,11 +95,11 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( //------------------------------------------------------ void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedValue >& aObjectProps ) { - OSL_ENSURE( m_xFactory.is(), "No ServiceFactory is provided!\n" ); - if ( !m_xFactory.is() ) + OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!\n" ); + if ( !m_xContext.is() ) throw uno::RuntimeException(); - m_pDocHolder = new DocumentHolder( comphelper::getComponentContext(m_xFactory), this ); + m_pDocHolder = new DocumentHolder( m_xContext, this ); m_pDocHolder->acquire(); // parse configuration entries @@ -234,7 +234,7 @@ void OCommonEmbeddedObject::LinkInit_Impl( m_bReadOnly = sal_True; if ( m_aLinkFilterName.getLength() ) { - ::comphelper::MimeConfigurationHelper aHelper( m_xFactory ); + ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); ::rtl::OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName ); m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) ); } |